[PATCH 1/2] drm/amdgpu: stop trying to schedule() with a spin held
Christian König
deathsimple at vodafone.de
Mon Jun 13 14:12:42 UTC 2016
From: Christian König <christian.koenig at amd.com>
Drop the lock before calling cancel_delayed_work_sync().
Signed-off-by: Christian König <christian.koenig at amd.com>
Tested-by: Nicolai Hähnle <nicolai.haehnle at amd.com>
---
drivers/gpu/drm/amd/scheduler/gpu_scheduler.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c b/drivers/gpu/drm/amd/scheduler/gpu_scheduler.c
index 74aa0b3..b1d49c5 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,
--
2.5.0
More information about the dri-devel
mailing list