From: Matthew Brost <matthew.brost@intel.com>
To: <intel-xe@lists.freedesktop.org>
Cc: Matthew Brost <matthew.brost@intel.com>,
Himal Prasad Ghimiray <himal.prasad.ghimiray@intel.com>
Subject: [PATCH v3 3/5] drm/xe: s/ENGINE_STATE_KILLED/EXEC_QUEUE_STATE_KILLED
Date: Thu, 25 Apr 2024 16:25:42 -0700 [thread overview]
Message-ID: <20240425232544.1935578-4-matthew.brost@intel.com> (raw)
In-Reply-To: <20240425232544.1935578-1-matthew.brost@intel.com>
Exec queue has replaced engine nomenclature.
Signed-off-by: Matthew Brost <matthew.brost@intel.com>
Reviewed-by: Himal Prasad Ghimiray <himal.prasad.ghimiray@intel.com>
---
drivers/gpu/drm/xe/xe_guc_submit.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/xe/xe_guc_submit.c b/drivers/gpu/drm/xe/xe_guc_submit.c
index 5dab20fa6d74..d4aa3823410c 100644
--- a/drivers/gpu/drm/xe/xe_guc_submit.c
+++ b/drivers/gpu/drm/xe/xe_guc_submit.c
@@ -58,7 +58,7 @@ exec_queue_to_guc(struct xe_exec_queue *q)
#define EXEC_QUEUE_STATE_DESTROYED (1 << 4)
#define EXEC_QUEUE_STATE_SUSPENDED (1 << 5)
#define EXEC_QUEUE_STATE_RESET (1 << 6)
-#define ENGINE_STATE_KILLED (1 << 7)
+#define EXEC_QUEUE_STATE_KILLED (1 << 7)
#define EXEC_QUEUE_STATE_WEDGED (1 << 8)
static bool exec_queue_registered(struct xe_exec_queue *q)
@@ -168,12 +168,12 @@ static void set_exec_queue_reset(struct xe_exec_queue *q)
static bool exec_queue_killed(struct xe_exec_queue *q)
{
- return atomic_read(&q->guc->state) & ENGINE_STATE_KILLED;
+ return atomic_read(&q->guc->state) & EXEC_QUEUE_STATE_KILLED;
}
static void set_exec_queue_killed(struct xe_exec_queue *q)
{
- atomic_or(ENGINE_STATE_KILLED, &q->guc->state);
+ atomic_or(EXEC_QUEUE_STATE_KILLED, &q->guc->state);
}
static bool exec_queue_wedged(struct xe_exec_queue *q)
@@ -189,7 +189,7 @@ static void set_exec_queue_wedged(struct xe_exec_queue *q)
static bool exec_queue_killed_or_banned_or_wedged(struct xe_exec_queue *q)
{
return exec_queue_banned(q) || (atomic_read(&q->guc->state) &
- (EXEC_QUEUE_STATE_WEDGED | ENGINE_STATE_KILLED));
+ (EXEC_QUEUE_STATE_WEDGED | EXEC_QUEUE_STATE_KILLED));
}
#ifdef CONFIG_PROVE_LOCKING
--
2.34.1
next prev parent reply other threads:[~2024-04-25 23:25 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-25 23:25 [PATCH v3 0/5] xe_guc_submit style cleanups Matthew Brost
2024-04-25 23:25 ` [PATCH v3 1/5] drm/xe: s/ENGINE_STATE_ENABLED/EXEC_QUEUE_STATE_ENABLED Matthew Brost
2024-04-25 23:25 ` [PATCH v3 2/5] drm/xe: s/ENGINE_STATE_SUSPENDED/EXEC_QUEUE_STATE_SUSPENDED Matthew Brost
2024-04-25 23:25 ` Matthew Brost [this message]
2024-04-25 23:25 ` [PATCH v3 4/5] drm/xe: Fix alignment in GuC exec queue state defines Matthew Brost
2024-04-25 23:25 ` [PATCH v3 5/5] drm/xe: Replace engine references with exec queue in xe_guc_submit.c Matthew Brost
2024-04-25 23:34 ` ✓ CI.Patch_applied: success for xe_guc_submit style cleanups (rev3) Patchwork
2024-04-25 23:35 ` ✓ CI.checkpatch: " Patchwork
2024-04-25 23:36 ` ✓ CI.KUnit: " Patchwork
2024-04-25 23:50 ` ✓ CI.Build: " Patchwork
2024-04-25 23:53 ` ✗ CI.Hooks: failure " Patchwork
2024-04-25 23:55 ` ✗ CI.checksparse: warning " Patchwork
2024-04-26 0:40 ` ✓ CI.BAT: success " 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=20240425232544.1935578-4-matthew.brost@intel.com \
--to=matthew.brost@intel.com \
--cc=himal.prasad.ghimiray@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