From: Jonathan Cavitt <jonathan.cavitt@intel.com>
To: intel-xe@lists.freedesktop.org
Cc: saurabhg.gupta@intel.com, jonathan.cavitt@intel.com,
matthew.brost@intel.com, lucas.demarchi@intel.com,
john.c.harrison@intel.com
Subject: [PATCH 3/3] drm/xe/xe_guc_submit: Declare reset if banned or killed
Date: Fri, 29 Mar 2024 11:49:29 -0700 [thread overview]
Message-ID: <20240329184929.3675256-3-jonathan.cavitt@intel.com> (raw)
In-Reply-To: <20240329184929.3675256-1-jonathan.cavitt@intel.com>
Add an additional condition to the reset_status guc_exec_queue_op that
returns true if the exec queue has been banned or killed. The
reset_status op is only used for exiting any xe_wait_user_fence_ioctl
that waits on an exec queue without timing out, so doing this will exit
the ioctl early in cases where the exec queue can no longer function,
such as after a GuC stop during a reset.
Suggested-by: Matthew Brost <matthew.brost@intel.com>
Signed-off-by: Jonathan Cavitt <jonathan.cavitt@intel.com>
---
drivers/gpu/drm/xe/xe_guc_submit.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/xe/xe_guc_submit.c b/drivers/gpu/drm/xe/xe_guc_submit.c
index bc0b5ec0b2ebd..ac3958c56943a 100644
--- a/drivers/gpu/drm/xe/xe_guc_submit.c
+++ b/drivers/gpu/drm/xe/xe_guc_submit.c
@@ -1371,7 +1371,7 @@ static void guc_exec_queue_resume(struct xe_exec_queue *q)
static bool guc_exec_queue_reset_status(struct xe_exec_queue *q)
{
- return exec_queue_reset(q);
+ return exec_queue_reset(q) || exec_queue_killed_or_banned(q);
}
/*
--
2.25.1
next prev parent reply other threads:[~2024-03-29 19:04 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-29 18:49 [PATCH 1/3] drm/xe/xe_guc_submit: Fix exec queue stop race condition Jonathan Cavitt
2024-03-29 18:49 ` [PATCH 2/3] drm/xe/xe_guc_status: Allow lr exec queues to be banned Jonathan Cavitt
2024-04-03 3:27 ` Matthew Brost
2024-03-29 18:49 ` Jonathan Cavitt [this message]
2024-04-03 3:28 ` [PATCH 3/3] drm/xe/xe_guc_submit: Declare reset if banned or killed Matthew Brost
2024-03-29 19:11 ` ✓ CI.Patch_applied: success for series starting with [1/3] drm/xe/xe_guc_submit: Fix exec queue stop race condition Patchwork
2024-03-29 19:11 ` ✓ CI.checkpatch: " Patchwork
2024-03-29 19:12 ` ✓ CI.KUnit: " Patchwork
2024-03-29 19:23 ` ✓ CI.Build: " Patchwork
2024-03-29 19:26 ` ✓ CI.Hooks: " Patchwork
2024-03-29 19:27 ` ✓ CI.checksparse: " Patchwork
2024-03-29 20:00 ` ✓ CI.BAT: " Patchwork
2024-04-03 3:19 ` [PATCH 1/3] " Matthew Brost
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=20240329184929.3675256-3-jonathan.cavitt@intel.com \
--to=jonathan.cavitt@intel.com \
--cc=intel-xe@lists.freedesktop.org \
--cc=john.c.harrison@intel.com \
--cc=lucas.demarchi@intel.com \
--cc=matthew.brost@intel.com \
--cc=saurabhg.gupta@intel.com \
/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