diff options
author | Christian König <christian.koenig@amd.com> | 2015-11-02 10:25:10 -0500 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2015-11-04 12:29:21 -0500 |
commit | 424839a6a913f2d2f473ce6d5b6465aeddf694db (patch) | |
tree | 46b457ec02f419996fb3ba8383cfbd24afdc8aba /drivers | |
parent | 4cfdcd9cecc05646b08805ba449811a645b3f4a8 (diff) |
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')
-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) | |||
338 | atomic_dec(&sched->hw_rq_count); | 338 | atomic_dec(&sched->hw_rq_count); |
339 | amd_sched_fence_signal(s_fence); | 339 | amd_sched_fence_signal(s_fence); |
340 | if (sched->timeout != MAX_SCHEDULE_TIMEOUT) { | 340 | if (sched->timeout != MAX_SCHEDULE_TIMEOUT) { |
341 | cancel_delayed_work_sync(&s_fence->dwork); | 341 | cancel_delayed_work(&s_fence->dwork); |
342 | spin_lock_irqsave(&sched->fence_list_lock, flags); | 342 | spin_lock_irqsave(&sched->fence_list_lock, flags); |
343 | list_del_init(&s_fence->list); | 343 | list_del_init(&s_fence->list); |
344 | spin_unlock_irqrestore(&sched->fence_list_lock, flags); | 344 | spin_unlock_irqrestore(&sched->fence_list_lock, flags); |