diff options
| author | Christian König <christian.koenig@amd.com> | 2015-08-20 17:09:54 +0200 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2015-08-25 10:46:46 -0400 |
| commit | 1fca766b24d07e2daed1da0f224f5f395c73e32b (patch) | |
| tree | 3c1f717991099ac368d16bb3a6d1d7261a179894 | |
| parent | b034b572f2823122d56cd0d235158873f84c7c23 (diff) | |
| download | linux-1fca766b24d07e2daed1da0f224f5f395c73e32b.tar.bz2 | |
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>
| -rw-r--r-- | drivers/gpu/drm/amd/scheduler/gpu_scheduler.c | 3 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/scheduler/gpu_scheduler.h | 1 |
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) 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); 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 { uint32_t granularity; /* in ms unit */ uint32_t preemption; wait_queue_head_t wait_queue; - struct mutex sched_lock; uint32_t hw_submission_limit; }; |