diff options
| author | Christian König <[email protected]> | 2015-08-25 19:39:31 +0000 |
|---|---|---|
| committer | Alex Deucher <[email protected]> | 2015-08-26 21:55:07 +0000 |
| commit | c2b6bd7e91aad8440a2f55bdbde6f5a8ae19fac5 (patch) | |
| tree | a37deed40cd232edcdcb942bb3ffbe76048a1857 /drivers/gpu/drm/amd/scheduler/gpu_scheduler.h | |
| parent | drm/amdgpu: remove extra parameters from scheduler callbacks (diff) | |
| download | kernel-c2b6bd7e91aad8440a2f55bdbde6f5a8ae19fac5.tar.gz kernel-c2b6bd7e91aad8440a2f55bdbde6f5a8ae19fac5.zip | |
drm/amdgpu: fix wait queue handling in the scheduler
Freeing up a queue after signalling it isn't race free.
Signed-off-by: Christian König <[email protected]>
Reviewed-by: Jammy Zhou <[email protected]>
Reviewed-by: Chunming Zhou <[email protected]>
Diffstat (limited to 'drivers/gpu/drm/amd/scheduler/gpu_scheduler.h')
| -rw-r--r-- | drivers/gpu/drm/amd/scheduler/gpu_scheduler.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h index 13349a6a00af..e797796dcad7 100644 --- a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h +++ b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.h @@ -44,7 +44,6 @@ struct amd_sched_entity { struct kfifo job_queue; spinlock_t queue_lock; struct amd_gpu_scheduler *scheduler; - wait_queue_head_t wait_queue; uint64_t fence_context; }; @@ -104,7 +103,8 @@ struct amd_gpu_scheduler { atomic_t hw_rq_count; struct amd_sched_backend_ops *ops; uint32_t ring_id; - wait_queue_head_t wait_queue; + wait_queue_head_t wake_up_worker; + wait_queue_head_t job_scheduled; uint32_t hw_submission_limit; char name[20]; void *priv; |