aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2015-08-20 11:09:54 -0400
committerAlex Deucher <alexander.deucher@amd.com>2015-08-25 10:46:46 -0400
commit1fca766b24d07e2daed1da0f224f5f395c73e32b (patch)
tree3c1f717991099ac368d16bb3a6d1d7261a179894 /drivers/gpu/drm
parentb034b572f2823122d56cd0d235158873f84c7c23 (diff)
drm/amdgpu: remove sched_lock
It isn't protecting anything. Signed-off-by: Christian König <christian.koenig@amd.com> Reviewed-by: Chunming Zhou <david1.zhou@amd.com>
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r--drivers/gpu/drm/amd/scheduler/gpu_scheduler.c3
-rw-r--r--drivers/gpu/drm/amd/scheduler/gpu_scheduler.h1
2 files changed, 0 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c
index 2ab63d223891..b13642f1e00b 100644
--- a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c
+++ b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c
@@ -302,7 +302,6 @@ static int amd_sched_main(void *param)
302 continue; 302 continue;
303 atomic_inc(&sched->hw_rq_count); 303 atomic_inc(&sched->hw_rq_count);
304 304
305 mutex_lock(&sched->sched_lock);
306 fence = sched->ops->run_job(sched, c_entity, job); 305 fence = sched->ops->run_job(sched, c_entity, job);
307 if (fence) { 306 if (fence) {
308 r = fence_add_callback(fence, &job->cb, 307 r = fence_add_callback(fence, &job->cb,
@@ -313,7 +312,6 @@ static int amd_sched_main(void *param)
313 DRM_ERROR("fence add callback failed (%d)\n", r); 312 DRM_ERROR("fence add callback failed (%d)\n", r);
314 fence_put(fence); 313 fence_put(fence);
315 } 314 }
316 mutex_unlock(&sched->sched_lock);
317 315
318 if (c_entity->need_wakeup) { 316 if (c_entity->need_wakeup) {
319 c_entity->need_wakeup = false; 317 c_entity->need_wakeup = false;
@@ -356,7 +354,6 @@ struct amd_gpu_scheduler *amd_sched_create(void *device,
356 sched->preemption = preemption; 354 sched->preemption = preemption;
357 sched->hw_submission_limit = hw_submission; 355 sched->hw_submission_limit = hw_submission;
358 snprintf(name, sizeof(name), "gpu_sched[%d]", ring); 356 snprintf(name, sizeof(name), "gpu_sched[%d]", ring);
359 mutex_init(&sched->sched_lock);
360 amd_sched_rq_init(&sched->sched_rq); 357 amd_sched_rq_init(&sched->sched_rq);
361 amd_sched_rq_init(&sched->kernel_rq); 358 amd_sched_rq_init(&sched->kernel_rq);
362 359
diff --git a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h
index 5913c5cd1c48..123b8f15d3fb 100644
--- a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h
+++ b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h
@@ -114,7 +114,6 @@ struct amd_gpu_scheduler {
114 uint32_t granularity; /* in ms unit */ 114 uint32_t granularity; /* in ms unit */
115 uint32_t preemption; 115 uint32_t preemption;
116 wait_queue_head_t wait_queue; 116 wait_queue_head_t wait_queue;
117 struct mutex sched_lock;
118 uint32_t hw_submission_limit; 117 uint32_t hw_submission_limit;
119}; 118};
120 119