Commit abdea284 authored by Jonathan Cavitt's avatar Jonathan Cavitt Committed by Matthew Brost

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: default avatarMatthew Brost <matthew.brost@intel.com>
Signed-off-by: default avatarJonathan Cavitt <jonathan.cavitt@intel.com>
Reviewed-by: default avatarMatthew Brost <matthew.brost@intel.com>
Reviewed-by: default avatarStuart Summers <stuart.summers@intel.com>
Signed-off-by: default avatarMatthew Brost <matthew.brost@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240510194540.3246991-2-jonathan.cavitt@intel.com
parent 1564d411
...@@ -1485,15 +1485,23 @@ static void guc_exec_queue_stop(struct xe_guc *guc, struct xe_exec_queue *q) ...@@ -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))) { if (!(q->flags & (EXEC_QUEUE_FLAG_KERNEL | EXEC_QUEUE_FLAG_VM))) {
struct xe_sched_job *job = xe_sched_first_pending_job(sched); struct xe_sched_job *job = xe_sched_first_pending_job(sched);
bool ban = false;
if (job) { if (job) {
if ((xe_sched_job_started(job) && if ((xe_sched_job_started(job) &&
!xe_sched_job_completed(job)) || !xe_sched_job_completed(job)) ||
xe_sched_invalidate_job(job, 2)) { xe_sched_invalidate_job(job, 2)) {
trace_xe_sched_job_ban(job); trace_xe_sched_job_ban(job);
set_exec_queue_banned(q); ban = true;
xe_sched_tdr_queue_imm(&q->guc->sched);
} }
} 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);
} }
} }
} }
......
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