aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu.h1
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c3
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c4
3 files changed, 7 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index 0703fbfd5130..4de114711951 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -80,6 +80,7 @@ extern int amdgpu_deep_color;
80extern int amdgpu_vm_size; 80extern int amdgpu_vm_size;
81extern int amdgpu_vm_block_size; 81extern int amdgpu_vm_block_size;
82extern int amdgpu_enable_scheduler; 82extern int amdgpu_enable_scheduler;
83extern int amdgpu_sched_jobs;
83 84
84#define AMDGPU_WAIT_IDLE_TIMEOUT_IN_MS 3000 85#define AMDGPU_WAIT_IDLE_TIMEOUT_IN_MS 3000
85#define AMDGPU_MAX_USEC_TIMEOUT 100000 /* 100 ms */ 86#define AMDGPU_MAX_USEC_TIMEOUT 100000 /* 100 ms */
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
index a5d8242ace95..58ce2655a8fd 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
@@ -105,7 +105,8 @@ int amdgpu_ctx_alloc(struct amdgpu_device *adev, struct amdgpu_fpriv *fpriv,
105 rq = &adev->rings[i]->scheduler->kernel_rq; 105 rq = &adev->rings[i]->scheduler->kernel_rq;
106 r = amd_context_entity_init(adev->rings[i]->scheduler, 106 r = amd_context_entity_init(adev->rings[i]->scheduler,
107 &ctx->rings[i].c_entity, 107 &ctx->rings[i].c_entity,
108 NULL, rq, *id); 108 NULL, rq, *id,
109 amdgpu_sched_jobs);
109 if (r) 110 if (r)
110 break; 111 break;
111 } 112 }
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
index 8f33cef9c828..319de441e907 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
@@ -76,6 +76,7 @@ int amdgpu_vm_size = 8;
76int amdgpu_vm_block_size = -1; 76int amdgpu_vm_block_size = -1;
77int amdgpu_exp_hw_support = 0; 77int amdgpu_exp_hw_support = 0;
78int amdgpu_enable_scheduler = 0; 78int amdgpu_enable_scheduler = 0;
79int amdgpu_sched_jobs = 16;
79 80
80MODULE_PARM_DESC(vramlimit, "Restrict VRAM for testing, in megabytes"); 81MODULE_PARM_DESC(vramlimit, "Restrict VRAM for testing, in megabytes");
81module_param_named(vramlimit, amdgpu_vram_limit, int, 0600); 82module_param_named(vramlimit, amdgpu_vram_limit, int, 0600);
@@ -143,6 +144,9 @@ module_param_named(exp_hw_support, amdgpu_exp_hw_support, int, 0444);
143MODULE_PARM_DESC(enable_scheduler, "enable SW GPU scheduler (1 = enable, 0 = disable ((default))"); 144MODULE_PARM_DESC(enable_scheduler, "enable SW GPU scheduler (1 = enable, 0 = disable ((default))");
144module_param_named(enable_scheduler, amdgpu_enable_scheduler, int, 0444); 145module_param_named(enable_scheduler, amdgpu_enable_scheduler, int, 0444);
145 146
147MODULE_PARM_DESC(sched_jobs, "the max number of jobs supported in the sw queue (default 16)");
148module_param_named(sched_jobs, amdgpu_sched_jobs, int, 0444);
149
146static struct pci_device_id pciidlist[] = { 150static struct pci_device_id pciidlist[] = {
147#ifdef CONFIG_DRM_AMDGPU_CIK 151#ifdef CONFIG_DRM_AMDGPU_CIK
148 /* Kaveri */ 152 /* Kaveri */