From: Matthew Brost <matthew.brost@intel.com>
To: intel-xe@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org
Subject: [PATCH v5 5/8] drm/xe: Only toggle scheduling in TDR if GuC is running
Date: Wed, 26 Nov 2025 12:19:13 -0800 [thread overview]
Message-ID: <20251126201916.618996-6-matthew.brost@intel.com> (raw)
In-Reply-To: <20251126201916.618996-1-matthew.brost@intel.com>
If the firmware is not running during TDR (e.g., when the driver is
unloading), there's no need to toggle scheduling in the GuC. In such
cases, skip this step.
v4:
- Bail on wait UC not running (Niranjana)
Signed-off-by: Matthew Brost <matthew.brost@intel.com>
Reviewed-by: Niranjana Vishwanathapura <niranjana.vishwanathapura@intel.com>
---
drivers/gpu/drm/xe/xe_guc_submit.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/xe/xe_guc_submit.c b/drivers/gpu/drm/xe/xe_guc_submit.c
index 4166b4ec6a67..693e3a892639 100644
--- a/drivers/gpu/drm/xe/xe_guc_submit.c
+++ b/drivers/gpu/drm/xe/xe_guc_submit.c
@@ -1274,7 +1274,7 @@ guc_exec_queue_timedout_job(struct drm_sched_job *drm_job)
if (exec_queue_reset(q))
err = -EIO;
- if (!exec_queue_destroyed(q)) {
+ if (!exec_queue_destroyed(q) && xe_uc_fw_is_running(&guc->fw)) {
/*
* Wait for any pending G2H to flush out before
* modifying state
@@ -1309,6 +1309,7 @@ guc_exec_queue_timedout_job(struct drm_sched_job *drm_job)
*/
smp_rmb();
ret = wait_event_timeout(guc->ct.wq,
+ !xe_uc_fw_is_running(&guc->fw) ||
!exec_queue_pending_disable(q) ||
xe_guc_read_stopped(guc) ||
vf_recovery(guc), HZ * 5);
--
2.34.1
next prev parent reply other threads:[~2025-11-26 20:19 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-26 20:19 [PATCH v5 0/8] Fix DRM scheduler layering violations in Xe Matthew Brost
2025-11-26 20:19 ` [PATCH v5 1/8] drm/sched: Add several job helpers to avoid drivers touching scheduler state Matthew Brost
2025-11-26 20:19 ` [PATCH v5 2/8] drm/sched: Add pending job list iterator Matthew Brost
2025-11-26 20:19 ` [PATCH v5 3/8] drm/xe: Add dedicated message lock Matthew Brost
2025-11-26 20:19 ` [PATCH v5 4/8] drm/xe: Stop abusing DRM scheduler internals Matthew Brost
2025-11-26 20:19 ` Matthew Brost [this message]
2025-11-26 20:19 ` [PATCH v5 6/8] drm/xe: Do not deregister queues in TDR Matthew Brost
2025-11-26 20:19 ` [PATCH v5 7/8] drm/xe: Remove special casing for LR queues in submission Matthew Brost
2025-11-26 20:19 ` [PATCH v5 8/8] drm/xe: Avoid toggling schedule state to check LRC timestamp in TDR Matthew Brost
2025-11-26 21:21 ` Matthew Brost
2025-11-26 20:25 ` ✗ CI.checkpatch: warning for Fix DRM scheduler layering violations in Xe (rev5) Patchwork
2025-11-26 20:26 ` ✓ CI.KUnit: success " Patchwork
2025-11-26 21:40 ` ✓ Xe.CI.BAT: " Patchwork
2025-11-26 22:18 ` ✗ Xe.CI.Full: failure " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251126201916.618996-6-matthew.brost@intel.com \
--to=matthew.brost@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-xe@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox