From: Christian König Date: Mon, 13 Jun 2016 14:12:42 +0000 (+0200) Subject: drm/amdgpu: stop trying to schedule() with a spin held X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a8bd3e1c71c342782b6597ac6bf4680d1f13254d;p=linux-beck.git drm/amdgpu: stop trying to schedule() with a spin held Drop the lock before calling cancel_delayed_work_sync(). Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=96445 Reviewed-by: Alex Deucher Signed-off-by: Christian König Tested-by: Nicolai Hähnle Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c index 74aa0b32f3e3..b1d49c5d8e44 100644 --- a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c +++ b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c @@ -339,7 +339,9 @@ static void amd_sched_job_finish(struct work_struct *work) if (sched->timeout != MAX_SCHEDULE_TIMEOUT) { struct amd_sched_job *next; + spin_unlock_irqrestore(&sched->job_list_lock, flags); cancel_delayed_work_sync(&s_job->work_tdr); + spin_lock_irqsave(&sched->job_list_lock, flags); /* queue TDR for next job */ next = list_first_entry_or_null(&sched->ring_mirror_list,