drm/xe/xe_guc_submit: Allow lr exec queues to be banned

LR queues currently don't get banned during a GT/GuC reset because they
lack a job.  Though they don't have a job to detect the reset status of,
it's still possible to tell when they should be banned by looking at the
LRC: if the LRC head and tail don't match, then the exec queue should be
banned and cleaned up.

This also requires swapping the usage of xe_sched_tdr_queue_imm with
xe_guc_exec_queue_trigger_cleanup, as the former is specific to non-lr
exec queues.

Suggested-by: Matthew Brost <matthew.brost@intel.com>
Signed-off-by: Jonathan Cavitt <jonathan.cavitt@intel.com>
Reviewed-by: Matthew Brost <matthew.brost@intel.com>
Reviewed-by: Stuart Summers <stuart.summers@intel.com>
Signed-off-by: Matthew Brost <matthew.brost@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240510194540.3246991-2-jonathan.cavitt@intel.com

diff --git a/drivers/gpu/drm/xe/xe_guc_submit.c b/drivers/gpu/drm/xe/xe_guc_submit.c
index 3a8e501..bd507a9 100644 (file)
--- a/drivers/gpu/drm/xe/xe_guc_submit.c
+++ b/drivers/gpu/drm/xe/xe_guc_submit.c
@@ -1485,15 +1485,23 @@ static void guc_exec_queue_stop(struct xe_guc *guc, struct xe_exec_queue *q)
         */
        if (!(q->flags & (EXEC_QUEUE_FLAG_KERNEL | EXEC_QUEUE_FLAG_VM))) {
                struct xe_sched_job *job = xe_sched_first_pending_job(sched);
+               bool ban = false;
 
                if (job) {
                        if ((xe_sched_job_started(job) &&
                            !xe_sched_job_completed(job)) ||
                            xe_sched_invalidate_job(job, 2)) {
                                trace_xe_sched_job_ban(job);
-                               set_exec_queue_banned(q);
-                               xe_sched_tdr_queue_imm(&q->guc->sched);
+                               ban = true;
                        }
+               } else if (xe_exec_queue_is_lr(q) &&
+                          (xe_lrc_ring_head(q->lrc) != xe_lrc_ring_tail(q->lrc))) {
+                       ban = true;
+               }
+
+               if (ban) {
+                       set_exec_queue_banned(q);
+                       xe_guc_exec_queue_trigger_cleanup(q);
                }
        }
 }