From: Christian König <christian.koenig@amd.com>
Date: Mon, 2 Nov 2015 15:25:10 +0000 (+0100)
Subject: drm/amdgpu: fix stoping the scheduler timeout
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=424839a6a913f2d2f473ce6d5b6465aeddf694db;p=openwrt%2Fstaging%2Fblogic.git

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>
---

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);