]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
drm/xe: Always kill exec queues in xe_guc_submit_pause_abort
authorMatthew Brost <matthew.brost@intel.com>
Tue, 10 Mar 2026 22:50:33 +0000 (18:50 -0400)
committerThomas Hellström <thomas.hellstrom@linux.intel.com>
Thu, 19 Mar 2026 13:22:22 +0000 (14:22 +0100)
xe_guc_submit_pause_abort is intended to be called after something
disastrous occurs (e.g., VF migration fails, device wedging, or driver
unload) and should immediately trigger the teardown of remaining
submission state. With that, kill any remaining queues in this function.

Fixes: 7c4b7e34c83b ("drm/xe/vf: Abort VF post migration recovery on failure")
Cc: stable@vger.kernel.org
Signed-off-by: Zhanjun Dong <zhanjun.dong@intel.com>
Reviewed-by: Stuart Summers <stuart.summers@intel.com>
Signed-off-by: Matthew Brost <matthew.brost@intel.com>
Link: https://patch.msgid.link/20260310225039.1320161-2-zhanjun.dong@intel.com
(cherry picked from commit 78f3bf00be4f15daead02ba32d4737129419c902)
Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
drivers/gpu/drm/xe/xe_guc_submit.c

index 799ef9f480036bd648b739015649e8587108e20f..2d68f531788759a7552a75d5054a5c84d83b405a 100644 (file)
@@ -2695,8 +2695,7 @@ void xe_guc_submit_pause_abort(struct xe_guc *guc)
                        continue;
 
                xe_sched_submission_start(sched);
-               if (exec_queue_killed_or_banned_or_wedged(q))
-                       xe_guc_exec_queue_trigger_cleanup(q);
+               guc_exec_queue_kill(q);
        }
        mutex_unlock(&guc->submission_state.lock);
 }