mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-03 10:02:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Jonathan Cavitt
2024-05-10 12:45:39 -07:00
committed by Matthew Brost
parent 1564d411e1
commit abdea2847a
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/gpu/drm/xe/xe_guc_submit.c
View File

@@ -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);
}
}
}