diff options
| author | Christian König | 2015-11-02 16:25:10 +0100 |
|---|---|---|
| committer | Alex Deucher | 2015-11-04 18:29:21 +0100 |
| commit | 424839a6a913f2d2f473ce6d5b6465aeddf694db (patch) | |
| tree | 46b457ec02f419996fb3ba8383cfbd24afdc8aba /drivers/gpu/drm/amd/scheduler | |
| parent | drm/amdgpu: cleanup on error in amdgpu_cs_ioctl() (diff) | |
| download | kernel-qcow2-linux-424839a6a913f2d2f473ce6d5b6465aeddf694db.tar.gz kernel-qcow2-linux-424839a6a913f2d2f473ce6d5b6465aeddf694db.tar.xz kernel-qcow2-linux-424839a6a913f2d2f473ce6d5b6465aeddf694db.zip | |
drm/amdgpu: fix stoping the scheduler timeout
cancel_delayed_work_sync is forbidden in interrupt context.
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Chunming Zhou <david1.zhou@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/scheduler')
| -rw-r--r-- | drivers/gpu/drm/amd/scheduler/gpu_scheduler.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c index b3e84d0f4ace..89619a5a4289 100644 --- a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c +++ b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c @@ -338,7 +338,7 @@ static void amd_sched_process_job(struct fence *f, struct fence_cb *cb) atomic_dec(&sched->hw_rq_count); amd_sched_fence_signal(s_fence); if (sched->timeout != MAX_SCHEDULE_TIMEOUT) { - cancel_delayed_work_sync(&s_fence->dwork); + cancel_delayed_work(&s_fence->dwork); spin_lock_irqsave(&sched->fence_list_lock, flags); list_del_init(&s_fence->list); spin_unlock_irqrestore(&sched->fence_list_lock, flags); |