瀏覽代碼

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>
Christian König 10 年之前
父節點
當前提交
1fca766b24
共有 2 個文件被更改,包括 0 次插入4 次删除
  1. 0 3
      drivers/gpu/drm/amd/scheduler/gpu_scheduler.c
  2. 0 1
      drivers/gpu/drm/amd/scheduler/gpu_scheduler.h

+ 0 - 3
drivers/gpu/drm/amd/scheduler/gpu_scheduler.c

@@ -302,7 +302,6 @@ static int amd_sched_main(void *param)
 			continue;
 		atomic_inc(&sched->hw_rq_count);
 
-		mutex_lock(&sched->sched_lock);
 		fence = sched->ops->run_job(sched, c_entity, job);
 		if (fence) {
 			r = fence_add_callback(fence, &job->cb,
@@ -313,7 +312,6 @@ static int amd_sched_main(void *param)
 				DRM_ERROR("fence add callback failed (%d)\n", r);
 			fence_put(fence);
 		}
-		mutex_unlock(&sched->sched_lock);
 
 		if (c_entity->need_wakeup) {
 			c_entity->need_wakeup = false;
@@ -356,7 +354,6 @@ struct amd_gpu_scheduler *amd_sched_create(void *device,
 	sched->preemption = preemption;
 	sched->hw_submission_limit = hw_submission;
 	snprintf(name, sizeof(name), "gpu_sched[%d]", ring);
-	mutex_init(&sched->sched_lock);
 	amd_sched_rq_init(&sched->sched_rq);
 	amd_sched_rq_init(&sched->kernel_rq);
 

+ 0 - 1
drivers/gpu/drm/amd/scheduler/gpu_scheduler.h

@@ -114,7 +114,6 @@ struct amd_gpu_scheduler {
 	uint32_t			granularity; /* in ms unit */
 	uint32_t			preemption;
 	wait_queue_head_t		wait_queue;
-	struct mutex			sched_lock;
 	uint32_t                        hw_submission_limit;
 };