From: Matthew Brost Date: Fri, 11 Aug 2023 13:27:34 +0000 (-0700) Subject: drm/xe: Call __guc_exec_queue_fini_async direct for KERNEL exec_queues X-Git-Tag: v6.8-rc1~21^2~13^2~446 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=a20c75dba192;p=linux-block.git drm/xe: Call __guc_exec_queue_fini_async direct for KERNEL exec_queues Usually we call __guc_exec_queue_fini_async via a worker as the exec_queue fini can be done from within the GPU scheduler which creates a circular dependency without a worker. Kernel exec_queues are fini'd at driver unload (not from within the GPU scheduler) so it is safe to directly call __guc_exec_queue_fini_async. Suggested-by: Oded Gabbay Signed-off-by: Matthew Brost Reviewed-by: Rodrigo Vivi Signed-off-by: Rodrigo Vivi --- diff --git a/drivers/gpu/drm/xe/xe_guc_submit.c b/drivers/gpu/drm/xe/xe_guc_submit.c index b3d765ee47f1..8ecfe2b15e28 100644 --- a/drivers/gpu/drm/xe/xe_guc_submit.c +++ b/drivers/gpu/drm/xe/xe_guc_submit.c @@ -956,27 +956,19 @@ static void __guc_exec_queue_fini_async(struct work_struct *w) xe_sched_entity_fini(&ge->entity); xe_sched_fini(&ge->sched); - if (!(q->flags & EXEC_QUEUE_FLAG_KERNEL)) { - kfree(ge); - xe_exec_queue_fini(q); - } + kfree(ge); + xe_exec_queue_fini(q); } static void guc_exec_queue_fini_async(struct xe_exec_queue *q) { - bool kernel = q->flags & EXEC_QUEUE_FLAG_KERNEL; - INIT_WORK(&q->guc->fini_async, __guc_exec_queue_fini_async); - queue_work(system_wq, &q->guc->fini_async); /* We must block on kernel engines so slabs are empty on driver unload */ - if (kernel) { - struct xe_guc_exec_queue *ge = q->guc; - - flush_work(&ge->fini_async); - kfree(ge); - xe_exec_queue_fini(q); - } + if (q->flags & EXEC_QUEUE_FLAG_KERNEL) + __guc_exec_queue_fini_async(&q->guc->fini_async); + else + queue_work(system_wq, &q->guc->fini_async); } static void __guc_exec_queue_fini(struct xe_guc *guc, struct xe_exec_queue *q)