Intel-XE Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Zhanjun Dong <zhanjun.dong@intel.com>
To: intel-xe@lists.freedesktop.org
Cc: daniele.ceraolospurio@intel.com, Zhanjun Dong <zhanjun.dong@intel.com>
Subject: [PATCH v1] drm/xe/guc: Change outstanding assertion to error
Date: Thu, 16 Oct 2025 20:46:54 -0400	[thread overview]
Message-ID: <20251017004654.1490644-1-zhanjun.dong@intel.com> (raw)

GuC CT layer will check GuC to host outstanding counter when changing
state, trigger assertion if the counter is not 0. However, the failed
assertion is expected on fault injection test, change it to error to
make it works with CI system.

Closes: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/5466
Closes: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/5530
Signed-off-by: Zhanjun Dong <zhanjun.dong@intel.com>
---
 drivers/gpu/drm/xe/xe_guc_ct.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/xe/xe_guc_ct.c b/drivers/gpu/drm/xe/xe_guc_ct.c
index 18f6327bf552..85416db1563c 100644
--- a/drivers/gpu/drm/xe/xe_guc_ct.c
+++ b/drivers/gpu/drm/xe/xe_guc_ct.c
@@ -436,8 +436,9 @@ static void guc_ct_change_state(struct xe_guc_ct *ct,
 	mutex_lock(&ct->lock);		/* Serialise dequeue_one_g2h() */
 	spin_lock_irq(&ct->fast_lock);	/* Serialise CT fast-path */
 
-	xe_gt_assert(ct_to_gt(ct), ct->g2h_outstanding == 0 ||
-		     state == XE_GUC_CT_STATE_STOPPED);
+	if (ct->g2h_outstanding != 0 && state != XE_GUC_CT_STATE_STOPPED)
+		xe_gt_err(ct_to_gt(ct), "Unexpected outsanding counter:%d on switch state:%d\n",
+			  ct->g2h_outstanding, state);
 
 	if (ct->g2h_outstanding)
 		xe_pm_runtime_put(ct_to_xe(ct));
-- 
2.34.1


             reply	other threads:[~2025-10-17  0:46 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-10-17  0:46 Zhanjun Dong [this message]
2025-10-17  0:53 ` ✓ CI.KUnit: success for drm/xe/guc: Change outstanding assertion to error Patchwork
2025-10-17  1:38 ` ✓ Xe.CI.BAT: " Patchwork
2025-10-17  5:45 ` [PATCH v1] " Matthew Brost
2025-10-17 22:27 ` ✗ Xe.CI.Full: failure for " 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=20251017004654.1490644-1-zhanjun.dong@intel.com \
    --to=zhanjun.dong@intel.com \
    --cc=daniele.ceraolospurio@intel.com \
    --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