Commit 2fcef6ec authored by Junwei Zhang's avatar Junwei Zhang Committed by Alex Deucher

drm/amdgpu: fix lockup when clean pending fences

The first lockup fence will lock the fence list of scheduler.
Then cancel the delayed workqueues for all clean pending fences
without waiting the workqueues to finish.

Change-Id: I9bec826de1aa49d587b0662f3fb4a95333979429
Signed-off-by: default avatarJunwei Zhang <Jerry.Zhang@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
parent 2440ff2c
...@@ -352,14 +352,14 @@ static void amd_sched_fence_work_func(struct work_struct *work) ...@@ -352,14 +352,14 @@ static void amd_sched_fence_work_func(struct work_struct *work)
DRM_ERROR("[%s] scheduler is timeout!\n", sched->name); DRM_ERROR("[%s] scheduler is timeout!\n", sched->name);
/* Clean all pending fences */ /* Clean all pending fences */
spin_lock_irqsave(&sched->fence_list_lock, flags);
list_for_each_entry_safe(entity, tmp, &sched->fence_list, list) { list_for_each_entry_safe(entity, tmp, &sched->fence_list, list) {
DRM_ERROR(" fence no %d\n", entity->base.seqno); DRM_ERROR(" fence no %d\n", entity->base.seqno);
cancel_delayed_work_sync(&entity->dwork); cancel_delayed_work(&entity->dwork);
spin_lock_irqsave(&sched->fence_list_lock, flags);
list_del_init(&entity->list); list_del_init(&entity->list);
spin_unlock_irqrestore(&sched->fence_list_lock, flags);
fence_put(&entity->base); fence_put(&entity->base);
} }
spin_unlock_irqrestore(&sched->fence_list_lock, flags);
} }
static int amd_sched_main(void *param) static int amd_sched_main(void *param)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment