Skip to contentSkip to conversation

xe_guc_submit style cleanups

PATCH Superseded Matthew Brost 3 participants 12 messages Apr 25, 2024

Subsystems (2)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Matthew Brost

author maintainer
#0 lore raw

v2 cover xe_guc_submit style cleanups

Posted this a while ago, reposting to see if reviews can get traction.

Matt

Matthew Brost (5):
drm/xe: s/ENGINE_STATE_ENABLED/EXEC_QUEUE_STATE_ENABLED drm/xe: s/ENGINE_STATE_SUSPENDED/EXEC_QUEUE_STATE_SUSPENDED drm/xe: s/ENGINE_STATE_KILLED/EXEC_QUEUE_STATE_KILLED drm/xe: Fix alignment in GuC exec queue state defines drm/xe: Replace engine references with exec queue in xe_guc_submit.c

 drivers/gpu/drm/xe/xe_guc_submit.c | 46 +++++++++++++++---------------
 1 file changed, 23 insertions(+), 23 deletions(-)
Signature · 1 line
2.34.1
author maintainer
#1 lore raw

PATCH v2 1/5 drm/xe: s/ENGINE_STATE_ENABLED/EXEC_QUEUE_STATE_ENABLED

Exec queue has replaced engine nomenclature.

---
 drivers/gpu/drm/xe/xe_guc_submit.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/xe/xe_guc_submit.c +4 -4
index 4e78610d1591..689093259302 100644
@@ -52,7 +52,7 @@ exec_queue_to_guc(struct xe_exec_queue *q)
  * engine done being processed).
  */
 #define EXEC_QUEUE_STATE_REGISTERED		(1 << 0)
-#define ENGINE_STATE_ENABLED		(1 << 1)
+#define EXEC_QUEUE_STATE_ENABLED		(1 << 1)
 #define EXEC_QUEUE_STATE_PENDING_ENABLE	(1 << 2)
 #define EXEC_QUEUE_STATE_PENDING_DISABLE	(1 << 3)
 #define EXEC_QUEUE_STATE_DESTROYED		(1 << 4)
@@ -77,17 +77,17 @@ static void clear_exec_queue_registered(struct xe_exec_queue *q)
 
 static bool exec_queue_enabled(struct xe_exec_queue *q)
 {
-	return atomic_read(&q->guc->state) & ENGINE_STATE_ENABLED;
+	return atomic_read(&q->guc->state) & EXEC_QUEUE_STATE_ENABLED;
 }
 
 static void set_exec_queue_enabled(struct xe_exec_queue *q)
 {
-	atomic_or(ENGINE_STATE_ENABLED, &q->guc->state);
+	atomic_or(EXEC_QUEUE_STATE_ENABLED, &q->guc->state);
 }
 
 static void clear_exec_queue_enabled(struct xe_exec_queue *q)
 {
-	atomic_and(~ENGINE_STATE_ENABLED, &q->guc->state);
+	atomic_and(~EXEC_QUEUE_STATE_ENABLED, &q->guc->state);
 }
 
 static bool exec_queue_pending_enable(struct xe_exec_queue *q)
Signature · 1 line
2.34.1
Reviewed-by on v2 1/5
#2 lore raw

RE: [PATCH v2 1/5] drm/xe: s/ENGINE_STATE_ENABLED/EXEC_QUEUE_STATE_ENABLED

Quoted 40 lines

-----Original Message-----
From: Intel-xe <[email protected]> On Behalf Of Matthew Brost
Sent: 25 April 2024 11:25
To: [email protected]
Cc: Brost, Matthew <[email protected]>
Subject: [PATCH v2 1/5] drm/xe:
s/ENGINE_STATE_ENABLED/EXEC_QUEUE_STATE_ENABLED

Exec queue has replaced engine nomenclature.

---
 drivers/gpu/drm/xe/xe_guc_submit.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/xe/xe_guc_submit.c +2 -2
index 4e78610d1591..689093259302 100644
@@ -52,7 +52,7 @@ exec_queue_to_guc(struct xe_exec_queue *q)
  * engine done being processed).
  */
 #define EXEC_QUEUE_STATE_REGISTERED		(1 << 0)
-#define ENGINE_STATE_ENABLED		(1 << 1)
+#define EXEC_QUEUE_STATE_ENABLED		(1 << 1)
 #define EXEC_QUEUE_STATE_PENDING_ENABLE	(1 << 2)
 #define EXEC_QUEUE_STATE_PENDING_DISABLE	(1 << 3)
 #define EXEC_QUEUE_STATE_DESTROYED		(1 << 4)
@@ -77,17 +77,17 @@ static void clear_exec_queue_registered(struct
 xe_exec_queue *q)
 
 static bool exec_queue_enabled(struct xe_exec_queue *q)  {
-	return atomic_read(&q->guc->state) & ENGINE_STATE_ENABLED;
+	return atomic_read(&q->guc->state) &
 EXEC_QUEUE_STATE_ENABLED;
 }

drivers/gpu/drm/xe/xe_guc_submit.c static void clear_exec_queue_registered(struct · line 90

Quoted 10 lines
drivers/gpu/drm/xe/xe_guc_submit.c +2 -2
 
 static void set_exec_queue_enabled(struct xe_exec_queue *q)  {
-	atomic_or(ENGINE_STATE_ENABLED, &q->guc->state);
+	atomic_or(EXEC_QUEUE_STATE_ENABLED, &q->guc->state);
 }
 
 static void clear_exec_queue_enabled(struct xe_exec_queue *q)  {
-	atomic_and(~ENGINE_STATE_ENABLED, &q->guc->state);
+	atomic_and(~EXEC_QUEUE_STATE_ENABLED, &q->guc->state);
 }

LGTM

Quoted 4 lines
drivers/gpu/drm/xe/xe_guc_submit.c +0 -1
 static bool exec_queue_pending_enable(struct xe_exec_queue *q)
--

2.34.1

author maintainer
#3 lore raw

PATCH v2 2/5 drm/xe: s/ENGINE_STATE_SUSPENDED/EXEC_QUEUE_STATE_SUSPENDED

In reply to Matthew Brost

Exec queue has replaced engine nomenclature.

---
 drivers/gpu/drm/xe/xe_guc_submit.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/gpu/drm/xe/xe_guc_submit.c +5 -5
index 689093259302..b26f374ca20b 100644
@@ -56,7 +56,7 @@ exec_queue_to_guc(struct xe_exec_queue *q)
 #define EXEC_QUEUE_STATE_PENDING_ENABLE	(1 << 2)
 #define EXEC_QUEUE_STATE_PENDING_DISABLE	(1 << 3)
 #define EXEC_QUEUE_STATE_DESTROYED		(1 << 4)
-#define ENGINE_STATE_SUSPENDED		(1 << 5)
+#define EXEC_QUEUE_STATE_SUSPENDED		(1 << 5)
 #define EXEC_QUEUE_STATE_RESET		(1 << 6)
 #define ENGINE_STATE_KILLED		(1 << 7)
 
@@ -142,17 +142,17 @@ static void set_exec_queue_banned(struct xe_exec_queue *q)
 
 static bool exec_queue_suspended(struct xe_exec_queue *q)
 {
-	return atomic_read(&q->guc->state) & ENGINE_STATE_SUSPENDED;
+	return atomic_read(&q->guc->state) & EXEC_QUEUE_STATE_SUSPENDED;
 }
 
 static void set_exec_queue_suspended(struct xe_exec_queue *q)
 {
-	atomic_or(ENGINE_STATE_SUSPENDED, &q->guc->state);
+	atomic_or(EXEC_QUEUE_STATE_SUSPENDED, &q->guc->state);
 }
 
 static void clear_exec_queue_suspended(struct xe_exec_queue *q)
 {
-	atomic_and(~ENGINE_STATE_SUSPENDED, &q->guc->state);
+	atomic_and(~EXEC_QUEUE_STATE_SUSPENDED, &q->guc->state);
 }
 
 static bool exec_queue_reset(struct xe_exec_queue *q)
@@ -1406,7 +1406,7 @@ static void guc_exec_queue_stop(struct xe_guc *guc, struct xe_exec_queue *q)
 		set_exec_queue_suspended(q);
 		suspend_fence_signal(q);
 	}
-	atomic_and(EXEC_QUEUE_STATE_DESTROYED | ENGINE_STATE_SUSPENDED,
+	atomic_and(EXEC_QUEUE_STATE_DESTROYED | EXEC_QUEUE_STATE_SUSPENDED,
 		   &q->guc->state);
 	q->guc->resume_time = 0;
 	trace_xe_exec_queue_stop(q);
Signature · 1 line
2.34.1
Reviewed-by on v2 2/5
#4 lore raw

RE: [PATCH v2 2/5] drm/xe: s/ENGINE_STATE_SUSPENDED/EXEC_QUEUE_STATE_SUSPENDED

Quoted 60 lines

-----Original Message-----
From: Intel-xe <[email protected]> On Behalf Of Matthew Brost
Sent: 25 April 2024 11:25
To: [email protected]
Cc: Brost, Matthew <[email protected]>
Subject: [PATCH v2 2/5] drm/xe:
s/ENGINE_STATE_SUSPENDED/EXEC_QUEUE_STATE_SUSPENDED

Exec queue has replaced engine nomenclature.

---
 drivers/gpu/drm/xe/xe_guc_submit.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/gpu/drm/xe/xe_guc_submit.c +5 -4
index 689093259302..b26f374ca20b 100644
@@ -56,7 +56,7 @@ exec_queue_to_guc(struct xe_exec_queue *q)
 #define EXEC_QUEUE_STATE_PENDING_ENABLE	(1 << 2)
 #define EXEC_QUEUE_STATE_PENDING_DISABLE	(1 << 3)
 #define EXEC_QUEUE_STATE_DESTROYED		(1 << 4)
-#define ENGINE_STATE_SUSPENDED		(1 << 5)
+#define EXEC_QUEUE_STATE_SUSPENDED		(1 << 5)
 #define EXEC_QUEUE_STATE_RESET		(1 << 6)
 #define ENGINE_STATE_KILLED		(1 << 7)
 
@@ -142,17 +142,17 @@ static void set_exec_queue_banned(struct
 xe_exec_queue *q)
 
 static bool exec_queue_suspended(struct xe_exec_queue *q)  {
-	return atomic_read(&q->guc->state) & ENGINE_STATE_SUSPENDED;
+	return atomic_read(&q->guc->state) &
 EXEC_QUEUE_STATE_SUSPENDED;
 }
 
 static void set_exec_queue_suspended(struct xe_exec_queue *q)  {
-	atomic_or(ENGINE_STATE_SUSPENDED, &q->guc->state);
+	atomic_or(EXEC_QUEUE_STATE_SUSPENDED, &q->guc->state);
 }
 
 static void clear_exec_queue_suspended(struct xe_exec_queue *q)  {
-	atomic_and(~ENGINE_STATE_SUSPENDED, &q->guc->state);
+	atomic_and(~EXEC_QUEUE_STATE_SUSPENDED, &q->guc->state);
 }
 
 static bool exec_queue_reset(struct xe_exec_queue *q) @@ -1406,7
+1406,7 @@ static void guc_exec_queue_stop(struct xe_guc *guc, struct

xe_exec_queue *q)

drivers/gpu/drm/xe/xe_guc_submit.c +0 -1
 		set_exec_queue_suspended(q);
 		suspend_fence_signal(q);
 	}
-	atomic_and(EXEC_QUEUE_STATE_DESTROYED |

ENGINE_STATE_SUSPENDED,

drivers/gpu/drm/xe/xe_guc_submit.c +1 -0
+	atomic_and(EXEC_QUEUE_STATE_DESTROYED |
Quoted 1 line

EXEC_QUEUE_STATE_SUSPENDED,

LGTM

Quoted 5 lines
drivers/gpu/drm/xe/xe_guc_submit.c +0 -1
 		   &q->guc->state);
 	q->guc->resume_time = 0;
 	trace_xe_exec_queue_stop(q);
--

2.34.1

author maintainer
#5 lore raw

PATCH v2 3/5 drm/xe: s/ENGINE_STATE_KILLED/EXEC_QUEUE_STATE_KILLED

In reply to Matthew Brost

Exec queue has replaced engine nomenclature.

---
 drivers/gpu/drm/xe/xe_guc_submit.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/xe/xe_guc_submit.c +3 -3
index b26f374ca20b..19f92a107342 100644
@@ -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)
 
 static bool exec_queue_registered(struct xe_exec_queue *q)
 {
@@ -167,12 +167,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_killed_or_banned(struct xe_exec_queue *q)
Signature · 1 line
2.34.1
Reviewed-by on v2 3/5
#6 lore raw

RE: [PATCH v2 3/5] drm/xe: s/ENGINE_STATE_KILLED/EXEC_QUEUE_STATE_KILLED

Quoted 31 lines

-----Original Message-----
From: Intel-xe <[email protected]> On Behalf Of Matthew Brost
Sent: 25 April 2024 11:25
To: [email protected]
Cc: Brost, Matthew <[email protected]>
Subject: [PATCH v2 3/5] drm/xe:
s/ENGINE_STATE_KILLED/EXEC_QUEUE_STATE_KILLED

Exec queue has replaced engine nomenclature.

---
 drivers/gpu/drm/xe/xe_guc_submit.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/xe/xe_guc_submit.c +1 -1
index b26f374ca20b..19f92a107342 100644
@@ -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)
 
 static bool exec_queue_registered(struct xe_exec_queue *q)  { @@ -167,12

drivers/gpu/drm/xe/xe_guc_submit.c exec_queue_to_guc(struct xe_exec_queue *q)

Quoted 10 lines
drivers/gpu/drm/xe/xe_guc_submit.c +3 -2
+167,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);

LGTM

Quoted 5 lines

}

static bool exec_queue_killed_or_banned(struct xe_exec_queue *q)
--
2.34.1

author maintainer
#7 lore raw

PATCH v2 4/5 drm/xe: Fix alignment in GuC exec queue state defines

In reply to Matthew Brost

Normalize the aligment for readability.

---
 drivers/gpu/drm/xe/xe_guc_submit.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/xe/xe_guc_submit.c +2 -2
index 19f92a107342..28c1b9b46251 100644
@@ -53,11 +53,11 @@ exec_queue_to_guc(struct xe_exec_queue *q)
  */
 #define EXEC_QUEUE_STATE_REGISTERED		(1 << 0)
 #define EXEC_QUEUE_STATE_ENABLED		(1 << 1)
-#define EXEC_QUEUE_STATE_PENDING_ENABLE	(1 << 2)
+#define EXEC_QUEUE_STATE_PENDING_ENABLE		(1 << 2)
 #define EXEC_QUEUE_STATE_PENDING_DISABLE	(1 << 3)
 #define EXEC_QUEUE_STATE_DESTROYED		(1 << 4)
 #define EXEC_QUEUE_STATE_SUSPENDED		(1 << 5)
-#define EXEC_QUEUE_STATE_RESET		(1 << 6)
+#define EXEC_QUEUE_STATE_RESET			(1 << 6)
 #define EXEC_QUEUE_STATE_KILLED			(1 << 7)
 
 static bool exec_queue_registered(struct xe_exec_queue *q)
Signature · 1 line
2.34.1
Reviewed-by on v2 4/5
#8 lore raw

RE: [PATCH v2 4/5] drm/xe: Fix alignment in GuC exec queue state defines

Quoted 11 lines

-----Original Message-----
From: Intel-xe <[email protected]> On Behalf Of Matthew Brost
Sent: 25 April 2024 11:25
To: [email protected]
Cc: Brost, Matthew <[email protected]>
Subject: [PATCH v2 4/5] drm/xe: Fix alignment in GuC exec queue state defines

Quoted 1 line

Normalize the aligment for readability.

Typo
s/alignment/alignment

Can be fixed for EXEC_QUEUE_STATE_WEDGED too.

With above addressed.

Quoted 27 lines
---
 drivers/gpu/drm/xe/xe_guc_submit.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/xe/xe_guc_submit.c +2 -3
index 19f92a107342..28c1b9b46251 100644
@@ -53,11 +53,11 @@ exec_queue_to_guc(struct xe_exec_queue *q)
  */
 #define EXEC_QUEUE_STATE_REGISTERED		(1 << 0)
 #define EXEC_QUEUE_STATE_ENABLED		(1 << 1)
-#define EXEC_QUEUE_STATE_PENDING_ENABLE	(1 << 2)
+#define EXEC_QUEUE_STATE_PENDING_ENABLE		(1 << 2)
 #define EXEC_QUEUE_STATE_PENDING_DISABLE	(1 << 3)
 #define EXEC_QUEUE_STATE_DESTROYED		(1 << 4)
 #define EXEC_QUEUE_STATE_SUSPENDED		(1 << 5)
-#define EXEC_QUEUE_STATE_RESET		(1 << 6)
+#define EXEC_QUEUE_STATE_RESET			(1 << 6)
 #define EXEC_QUEUE_STATE_KILLED			(1 << 7)
 
 static bool exec_queue_registered(struct xe_exec_queue *q)
--

2.34.1

author maintainer
#9 lore raw

PATCH v2 5/5 drm/xe: Replace engine references with exec queue in xe_guc_submit.c

In reply to Matthew Brost

Exec queue has replaced engine nomenclature.

---
 drivers/gpu/drm/xe/xe_guc_submit.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
drivers/gpu/drm/xe/xe_guc_submit.c +9 -9
index 28c1b9b46251..5aa6ad540ef5 100644
@@ -426,9 +426,9 @@ static void set_min_preemption_timeout(struct xe_guc *guc, struct xe_exec_queue
 	xe_map_wr_field(xe_, &map_, 0, struct guc_submit_parallel_scratch, \
 			field_, val_)
 
-static void __register_mlrc_engine(struct xe_guc *guc,
-				   struct xe_exec_queue *q,
-				   struct guc_ctxt_registration_info *info)
+static void __register_mlrc_exec_queue(struct xe_guc *guc,
+				       struct xe_exec_queue *q,
+				       struct guc_ctxt_registration_info *info)
 {
 #define MAX_MLRC_REG_SIZE      (13 + XE_HW_ENGINE_MAX_INSTANCE * 2)
 	struct xe_device *xe = guc_to_xe(guc);
@@ -465,8 +465,8 @@ static void __register_mlrc_engine(struct xe_guc *guc,
 	xe_guc_ct_send(&guc->ct, action, len, 0, 0);
 }
 
-static void __register_engine(struct xe_guc *guc,
-			      struct guc_ctxt_registration_info *info)
+static void __register_exec_queue(struct xe_guc *guc,
+				  struct guc_ctxt_registration_info *info)
 {
 	u32 action[] = {
 		XE_GUC_ACTION_REGISTER_CONTEXT,
@@ -486,7 +486,7 @@ static void __register_engine(struct xe_guc *guc,
 	xe_guc_ct_send(&guc->ct, action, ARRAY_SIZE(action), 0, 0);
 }
 
-static void register_engine(struct xe_exec_queue *q)
+static void register_exec_queue(struct xe_exec_queue *q)
 {
 	struct xe_guc *guc = exec_queue_to_guc(q);
 	struct xe_device *xe = guc_to_xe(guc);
@@ -534,9 +534,9 @@ static void register_engine(struct xe_exec_queue *q)
 	set_exec_queue_registered(q);
 	trace_xe_exec_queue_register(q);
 	if (xe_exec_queue_is_parallel(q))
-		__register_mlrc_engine(guc, q, &info);
+		__register_mlrc_exec_queue(guc, q, &info);
 	else
-		__register_engine(guc, &info);
+		__register_exec_queue(guc, &info);
 	init_policies(guc, q);
 }
 
@@ -706,7 +706,7 @@ guc_exec_queue_run_job(struct drm_sched_job *drm_job)
 
 	if (!exec_queue_killed_or_banned(q) && !xe_sched_job_is_error(job)) {
 		if (!exec_queue_registered(q))
-			register_engine(q);
+			register_exec_queue(q);
 		if (!lr)	/* LR jobs are emitted in the exec IOCTL */
 			q->ring_ops->emit_job(job);
 		submit_exec_queue(q);
Signature · 1 line
2.34.1
Reviewed-by on v2 5/5
#10 lore raw

RE: [PATCH v2 5/5] drm/xe: Replace engine references with exec queue in xe_guc_submit.c

Quoted 69 lines

-----Original Message-----
From: Intel-xe <[email protected]> On Behalf Of Matthew Brost
Sent: 25 April 2024 11:25
To: [email protected]
Cc: Brost, Matthew <[email protected]>
Subject: [PATCH v2 5/5] drm/xe: Replace engine references with exec queue in xe_guc_submit.c

Exec queue has replaced engine nomenclature.

---
 drivers/gpu/drm/xe/xe_guc_submit.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
drivers/gpu/drm/xe/xe_guc_submit.c +0 -0
index 28c1b9b46251..5aa6ad540ef5 100644
@@ -426,9 +426,9 @@ static void set_min_preemption_timeout(struct

xe_guc *guc, struct xe_exec_queue
xe_map_wr_field(xe_, &map_, 0, struct guc_submit_parallel_scratch,
\

drivers/gpu/drm/xe/xe_guc_submit.c +3 -3
 			field_, val_)
 
-static void __register_mlrc_engine(struct xe_guc *guc,
-				   struct xe_exec_queue *q,
-				   struct guc_ctxt_registration_info *info)
+static void __register_mlrc_exec_queue(struct xe_guc *guc,
+				       struct xe_exec_queue *q,
+				       struct guc_ctxt_registration_info *info)
 {
 #define MAX_MLRC_REG_SIZE      (13 + XE_HW_ENGINE_MAX_INSTANCE * 2)
 	struct xe_device *xe = guc_to_xe(guc); @@ -465,8 +465,8 @@ static

void __register_mlrc_engine(struct xe_guc *guc,

drivers/gpu/drm/xe/xe_guc_submit.c +3 -3
 	xe_guc_ct_send(&guc->ct, action, len, 0, 0);  }
 
-static void __register_engine(struct xe_guc *guc,
-			      struct guc_ctxt_registration_info *info)
+static void __register_exec_queue(struct xe_guc *guc,
+				  struct guc_ctxt_registration_info *info)
 {
 	u32 action[] = {
 		XE_GUC_ACTION_REGISTER_CONTEXT,
@@ -486,7 +486,7 @@ static void __register_engine(struct xe_guc *guc,
 	xe_guc_ct_send(&guc->ct, action, ARRAY_SIZE(action), 0, 0);  }
 
-static void register_engine(struct xe_exec_queue *q)
+static void register_exec_queue(struct xe_exec_queue *q)
 {
 	struct xe_guc *guc = exec_queue_to_guc(q);
 	struct xe_device *xe = guc_to_xe(guc); @@ -534,9 +534,9 @@ static
 void register_engine(struct xe_exec_queue *q)
drivers/gpu/drm/xe/xe_guc_submit.c +2 -2
 	set_exec_queue_registered(q);
 	trace_xe_exec_queue_register(q);
 	if (xe_exec_queue_is_parallel(q))
-		__register_mlrc_engine(guc, q, &info);
+		__register_mlrc_exec_queue(guc, q, &info);
 	else
-		__register_engine(guc, &info);
+		__register_exec_queue(guc, &info);
 	init_policies(guc, q);
 }

drivers/gpu/drm/xe/xe_guc_submit.c guc_exec_queue_run_job(struct drm_sched_job · line 711

Quoted 7 lines
drivers/gpu/drm/xe/xe_guc_submit.c +1 -1
@@ -706,7 +706,7 @@ guc_exec_queue_run_job(struct drm_sched_job
 *drm_job)
 
 	if (!exec_queue_killed_or_banned(q) &&
 !xe_sched_job_is_error(job)) {
 		if (!exec_queue_registered(q))
-			register_engine(q);
+			register_exec_queue(q);

LGTM

Quoted 5 lines
drivers/gpu/drm/xe/xe_guc_submit.c +0 -0
 		if (!lr)	/* LR jobs are emitted in the exec IOCTL */
drivers/gpu/drm/xe/xe_guc_submit.c +0 -1
 			q->ring_ops->emit_job(job);
 		submit_exec_queue(q);
--

2.34.1

#11 lore raw

✗ CI.Patch_applied: failure for xe_guc_submit style cleanups (rev2)

In reply to Matthew Brost
== Series Details ==

== Series Details ==

Series: xe_guc_submit style cleanups (rev2)
URL : https://patchwork.freedesktop.org/series/126081/
State : failure

== Summary ==

=== Applying kernel patches on branch 'drm-tip' with base: ===
Base commit: 326b58ce533b drm-tip: 2024y-04m-24d-22h-39m-42s UTC integration manifest === git am output follows ===
error: patch failed: drivers/gpu/drm/xe/xe_guc_submit.c:56
error: drivers/gpu/drm/xe/xe_guc_submit.c: patch does not apply
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Applying: drm/xe: s/ENGINE_STATE_ENABLED/EXEC_QUEUE_STATE_ENABLED
Applying: drm/xe: s/ENGINE_STATE_SUSPENDED/EXEC_QUEUE_STATE_SUSPENDED Patch failed at 0002 drm/xe: s/ENGINE_STATE_SUSPENDED/EXEC_QUEUE_STATE_SUSPENDED When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".