drm/xe: Add killed, banned, or wedged as stick bit during GuC reset

These bits should be persistent across reset, treat them as such.

Signed-off-by: Matthew Brost <matthew.brost@intel.com>
Reviewed-by: Jonathan Cavitt <jonathan.cavitt@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240611144053.2805091-11-matthew.brost@intel.com

diff --git a/drivers/gpu/drm/xe/xe_guc_submit.c b/drivers/gpu/drm/xe/xe_guc_submit.c
index 25240b5..671c72c 100644 (file)
--- a/drivers/gpu/drm/xe/xe_guc_submit.c
+++ b/drivers/gpu/drm/xe/xe_guc_submit.c
@@ -1444,7 +1444,9 @@ static void guc_exec_queue_stop(struct xe_guc *guc, struct xe_exec_queue *q)
                set_exec_queue_suspended(q);
                suspend_fence_signal(q);
        }
-       atomic_and(EXEC_QUEUE_STATE_DESTROYED | EXEC_QUEUE_STATE_SUSPENDED,
+       atomic_and(EXEC_QUEUE_STATE_WEDGED | EXEC_QUEUE_STATE_BANNED |
+                  EXEC_QUEUE_STATE_KILLED | EXEC_QUEUE_STATE_DESTROYED |
+                  EXEC_QUEUE_STATE_SUSPENDED,
                   &q->guc->state);
        q->guc->resume_time = 0;
        trace_xe_exec_queue_stop(q);