Skip to contentSkip to conversation

drm/i915/guc: Change wa and EU_PERF_CNTL registers to MCR type

PATCH In review Shuicheng Lin 3 participants 6 messages Dec 20, 2023 – Jan 4, 2024

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/i915/guc: Change wa and EU_PERF_CNTL registers to MCR type

Some of the wa registers are MCR register, and EU_PERF_CNTL registers are MCR register.
MCR register needs extra process for read/write.
As normal MMIO register also could work with the MCR register process, change all wa registers to MCR type for code simplicity.

Cc Matt Roper <[email protected]>
Cc Umesh Nerlige Ramappa <[email protected]>
---
 drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c +8 -8
index 63724e17829a..61ff4c7e31a6 100644
@@ -378,7 +378,7 @@ static int guc_mmio_regset_init(struct temp_regset *regset,
 		ret |= GUC_MMIO_REG_ADD(gt, regset, GEN12_RCU_MODE, true);
 
 	for (i = 0, wa = wal->list; i < wal->count; i++, wa++)
-		ret |= GUC_MMIO_REG_ADD(gt, regset, wa->reg, wa->masked_reg);
+		ret |= GUC_MCR_REG_ADD(gt, regset, wa->mcr_reg, wa->masked_reg);
 
 	/* Be extra paranoid and include all whitelist registers. */
 	for (i = 0; i < RING_MAX_NONPRIV_SLOTS; i++)
@@ -394,13 +394,13 @@ static int guc_mmio_regset_init(struct temp_regset *regset,
 			ret |= GUC_MMIO_REG_ADD(gt, regset, GEN9_LNCFCMOCS(i), false);
 
 	if (GRAPHICS_VER(engine->i915) >= 12) {
-		ret |= GUC_MMIO_REG_ADD(gt, regset, EU_PERF_CNTL0, false);
-		ret |= GUC_MMIO_REG_ADD(gt, regset, EU_PERF_CNTL1, false);
-		ret |= GUC_MMIO_REG_ADD(gt, regset, EU_PERF_CNTL2, false);
-		ret |= GUC_MMIO_REG_ADD(gt, regset, EU_PERF_CNTL3, false);
-		ret |= GUC_MMIO_REG_ADD(gt, regset, EU_PERF_CNTL4, false);
-		ret |= GUC_MMIO_REG_ADD(gt, regset, EU_PERF_CNTL5, false);
-		ret |= GUC_MMIO_REG_ADD(gt, regset, EU_PERF_CNTL6, false);
+		ret |= GUC_MCR_REG_ADD(gt, regset, MCR_REG(i915_mmio_reg_offset(EU_PERF_CNTL0)), false);
+		ret |= GUC_MCR_REG_ADD(gt, regset, MCR_REG(i915_mmio_reg_offset(EU_PERF_CNTL1)), false);
+		ret |= GUC_MCR_REG_ADD(gt, regset, MCR_REG(i915_mmio_reg_offset(EU_PERF_CNTL2)), false);
+		ret |= GUC_MCR_REG_ADD(gt, regset, MCR_REG(i915_mmio_reg_offset(EU_PERF_CNTL3)), false);
+		ret |= GUC_MCR_REG_ADD(gt, regset, MCR_REG(i915_mmio_reg_offset(EU_PERF_CNTL4)), false);
+		ret |= GUC_MCR_REG_ADD(gt, regset, MCR_REG(i915_mmio_reg_offset(EU_PERF_CNTL5)), false);
+		ret |= GUC_MCR_REG_ADD(gt, regset, MCR_REG(i915_mmio_reg_offset(EU_PERF_CNTL6)), false);
 	}
 
 	return ret ? -1 : 0;
Signature · 1 line
2.25.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 18 lines · Shuicheng Lin

Some of the wa registers are MCR register, and EU_PERF_CNTL registers are MCR register.
MCR register needs extra process for read/write.
As normal MMIO register also could work with the MCR register process, change all wa registers to MCR type for code simplicity.

Cc Matt Roper <[email protected]>
Cc Umesh Nerlige Ramappa <[email protected]>
---
 drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c +0 -0
index 63724e17829a..61ff4c7e31a6 100644

drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c static int guc_mmio_regset_init(struct temp_regset *regset, · line 381

Quoted 5 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c +1 -1
@@ -378,7 +378,7 @@ static int guc_mmio_regset_init(struct temp_regset *regset,
 		ret |= GUC_MMIO_REG_ADD(gt, regset, GEN12_RCU_MODE, true);
 
 	for (i = 0, wa = wal->list; i < wal->count; i++, wa++)
-		ret |= GUC_MMIO_REG_ADD(gt, regset, wa->reg, wa->masked_reg);
+		ret |= GUC_MCR_REG_ADD(gt, regset, wa->mcr_reg, wa->masked_reg);

I'd add some kind of a comment here, explaining that it's safe to always use the MCR form here, even though some of the workarounds are touching non-MCR registers. With a clarifying code comment added,

Matt

Quoted 27 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c +7 -7
 	/* Be extra paranoid and include all whitelist registers. */
 	for (i = 0; i < RING_MAX_NONPRIV_SLOTS; i++)
@@ -394,13 +394,13 @@ static int guc_mmio_regset_init(struct temp_regset *regset,
 			ret |= GUC_MMIO_REG_ADD(gt, regset, GEN9_LNCFCMOCS(i), false);
 
 	if (GRAPHICS_VER(engine->i915) >= 12) {
-		ret |= GUC_MMIO_REG_ADD(gt, regset, EU_PERF_CNTL0, false);
-		ret |= GUC_MMIO_REG_ADD(gt, regset, EU_PERF_CNTL1, false);
-		ret |= GUC_MMIO_REG_ADD(gt, regset, EU_PERF_CNTL2, false);
-		ret |= GUC_MMIO_REG_ADD(gt, regset, EU_PERF_CNTL3, false);
-		ret |= GUC_MMIO_REG_ADD(gt, regset, EU_PERF_CNTL4, false);
-		ret |= GUC_MMIO_REG_ADD(gt, regset, EU_PERF_CNTL5, false);
-		ret |= GUC_MMIO_REG_ADD(gt, regset, EU_PERF_CNTL6, false);
+		ret |= GUC_MCR_REG_ADD(gt, regset, MCR_REG(i915_mmio_reg_offset(EU_PERF_CNTL0)), false);
+		ret |= GUC_MCR_REG_ADD(gt, regset, MCR_REG(i915_mmio_reg_offset(EU_PERF_CNTL1)), false);
+		ret |= GUC_MCR_REG_ADD(gt, regset, MCR_REG(i915_mmio_reg_offset(EU_PERF_CNTL2)), false);
+		ret |= GUC_MCR_REG_ADD(gt, regset, MCR_REG(i915_mmio_reg_offset(EU_PERF_CNTL3)), false);
+		ret |= GUC_MCR_REG_ADD(gt, regset, MCR_REG(i915_mmio_reg_offset(EU_PERF_CNTL4)), false);
+		ret |= GUC_MCR_REG_ADD(gt, regset, MCR_REG(i915_mmio_reg_offset(EU_PERF_CNTL5)), false);
+		ret |= GUC_MCR_REG_ADD(gt, regset, MCR_REG(i915_mmio_reg_offset(EU_PERF_CNTL6)), false);
 	}
 
 	return ret ? -1 : 0;
Signature · 1 line
2.25.1
Signature · 4 lines
Matt Roper
Graphics Software Engineer
Linux GPU Platform Enablement
Intel Corporation
#2 lore raw

PATCH 1/1 drm/i915/guc: Change wa and EU_PERF_CNTL registers to MCR type

Some of the wa registers are MCR register, and EU_PERF_CNTL registers are MCR register.
MCR register needs extra process for read/write.
As normal MMIO register also could work with the MCR register process, change all wa registers to MCR type for code simplicity.

Cc Matt Roper <[email protected]>
Cc Umesh Nerlige Ramappa <[email protected]>
---
 drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c +12 -8
index 63724e17829a..5cbcbe9a4e93 100644
@@ -377,8 +377,12 @@ static int guc_mmio_regset_init(struct temp_regset *regset,
 	    CCS_MASK(engine->gt))
 		ret |= GUC_MMIO_REG_ADD(gt, regset, GEN12_RCU_MODE, true);
 
+	/* some of the WA registers are MCR registers. As it is safe to
+	 * use MCR form for non-MCR registers, for code simplicity, all
+	 * WA registers are added with MCR form.
+	 */
 	for (i = 0, wa = wal->list; i < wal->count; i++, wa++)
-		ret |= GUC_MMIO_REG_ADD(gt, regset, wa->reg, wa->masked_reg);
+		ret |= GUC_MCR_REG_ADD(gt, regset, wa->mcr_reg, wa->masked_reg);
 
 	/* Be extra paranoid and include all whitelist registers. */
 	for (i = 0; i < RING_MAX_NONPRIV_SLOTS; i++)
@@ -394,13 +398,13 @@ static int guc_mmio_regset_init(struct temp_regset *regset,
 			ret |= GUC_MMIO_REG_ADD(gt, regset, GEN9_LNCFCMOCS(i), false);
 
 	if (GRAPHICS_VER(engine->i915) >= 12) {
-		ret |= GUC_MMIO_REG_ADD(gt, regset, EU_PERF_CNTL0, false);
-		ret |= GUC_MMIO_REG_ADD(gt, regset, EU_PERF_CNTL1, false);
-		ret |= GUC_MMIO_REG_ADD(gt, regset, EU_PERF_CNTL2, false);
-		ret |= GUC_MMIO_REG_ADD(gt, regset, EU_PERF_CNTL3, false);
-		ret |= GUC_MMIO_REG_ADD(gt, regset, EU_PERF_CNTL4, false);
-		ret |= GUC_MMIO_REG_ADD(gt, regset, EU_PERF_CNTL5, false);
-		ret |= GUC_MMIO_REG_ADD(gt, regset, EU_PERF_CNTL6, false);
+		ret |= GUC_MCR_REG_ADD(gt, regset, MCR_REG(i915_mmio_reg_offset(EU_PERF_CNTL0)), false);
+		ret |= GUC_MCR_REG_ADD(gt, regset, MCR_REG(i915_mmio_reg_offset(EU_PERF_CNTL1)), false);
+		ret |= GUC_MCR_REG_ADD(gt, regset, MCR_REG(i915_mmio_reg_offset(EU_PERF_CNTL2)), false);
+		ret |= GUC_MCR_REG_ADD(gt, regset, MCR_REG(i915_mmio_reg_offset(EU_PERF_CNTL3)), false);
+		ret |= GUC_MCR_REG_ADD(gt, regset, MCR_REG(i915_mmio_reg_offset(EU_PERF_CNTL4)), false);
+		ret |= GUC_MCR_REG_ADD(gt, regset, MCR_REG(i915_mmio_reg_offset(EU_PERF_CNTL5)), false);
+		ret |= GUC_MCR_REG_ADD(gt, regset, MCR_REG(i915_mmio_reg_offset(EU_PERF_CNTL6)), false);
 	}
 
 	return ret ? -1 : 0;
Signature · 1 line
2.25.1
Reviewed-by on v1 1/1
#3 lore raw
Quoted 9 lines · Shuicheng Lin

Some of the wa registers are MCR register, and EU_PERF_CNTL registers are MCR register.
MCR register needs extra process for read/write.
As normal MMIO register also could work with the MCR register process, change all wa registers to MCR type for code simplicity.

Cc Matt Roper <[email protected]>
Cc Umesh Nerlige Ramappa <[email protected]>

Tweaked the comment to conform to Linux kernel coding standards, and applied to drm-intel-gt-next. Thanks for the patch.

At some point we'll need to rework the OA/perf code to use proper register types for a bunch of their registers (so that we don't need ugly casts like this), but we can take care of that separately.

Matt

Quoted 46 lines
---
 drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c +12 -8
index 63724e17829a..5cbcbe9a4e93 100644
@@ -377,8 +377,12 @@ static int guc_mmio_regset_init(struct temp_regset *regset,
 	    CCS_MASK(engine->gt))
 		ret |= GUC_MMIO_REG_ADD(gt, regset, GEN12_RCU_MODE, true);
 
+	/* some of the WA registers are MCR registers. As it is safe to
+	 * use MCR form for non-MCR registers, for code simplicity, all
+	 * WA registers are added with MCR form.
+	 */
 	for (i = 0, wa = wal->list; i < wal->count; i++, wa++)
-		ret |= GUC_MMIO_REG_ADD(gt, regset, wa->reg, wa->masked_reg);
+		ret |= GUC_MCR_REG_ADD(gt, regset, wa->mcr_reg, wa->masked_reg);
 
 	/* Be extra paranoid and include all whitelist registers. */
 	for (i = 0; i < RING_MAX_NONPRIV_SLOTS; i++)
@@ -394,13 +398,13 @@ static int guc_mmio_regset_init(struct temp_regset *regset,
 			ret |= GUC_MMIO_REG_ADD(gt, regset, GEN9_LNCFCMOCS(i), false);
 
 	if (GRAPHICS_VER(engine->i915) >= 12) {
-		ret |= GUC_MMIO_REG_ADD(gt, regset, EU_PERF_CNTL0, false);
-		ret |= GUC_MMIO_REG_ADD(gt, regset, EU_PERF_CNTL1, false);
-		ret |= GUC_MMIO_REG_ADD(gt, regset, EU_PERF_CNTL2, false);
-		ret |= GUC_MMIO_REG_ADD(gt, regset, EU_PERF_CNTL3, false);
-		ret |= GUC_MMIO_REG_ADD(gt, regset, EU_PERF_CNTL4, false);
-		ret |= GUC_MMIO_REG_ADD(gt, regset, EU_PERF_CNTL5, false);
-		ret |= GUC_MMIO_REG_ADD(gt, regset, EU_PERF_CNTL6, false);
+		ret |= GUC_MCR_REG_ADD(gt, regset, MCR_REG(i915_mmio_reg_offset(EU_PERF_CNTL0)), false);
+		ret |= GUC_MCR_REG_ADD(gt, regset, MCR_REG(i915_mmio_reg_offset(EU_PERF_CNTL1)), false);
+		ret |= GUC_MCR_REG_ADD(gt, regset, MCR_REG(i915_mmio_reg_offset(EU_PERF_CNTL2)), false);
+		ret |= GUC_MCR_REG_ADD(gt, regset, MCR_REG(i915_mmio_reg_offset(EU_PERF_CNTL3)), false);
+		ret |= GUC_MCR_REG_ADD(gt, regset, MCR_REG(i915_mmio_reg_offset(EU_PERF_CNTL4)), false);
+		ret |= GUC_MCR_REG_ADD(gt, regset, MCR_REG(i915_mmio_reg_offset(EU_PERF_CNTL5)), false);
+		ret |= GUC_MCR_REG_ADD(gt, regset, MCR_REG(i915_mmio_reg_offset(EU_PERF_CNTL6)), false);
 	}
 
 	return ret ? -1 : 0;
Signature · 1 line
2.25.1
Signature · 4 lines
Matt Roper
Graphics Software Engineer
Linux GPU Platform Enablement
Intel Corporation
#4 lore raw
In reply to Matt Roper

Best Regards
Shuicheng

Quoted 43 lines

-----Original Message-----
From: Roper, Matthew D <[email protected]>
Sent: Thursday, December 21, 2023 7:46 AM
To: Lin, Shuicheng <[email protected]>
Cc: [email protected]; Nerlige Ramappa, Umesh <[email protected]>
Subject: Re: [PATCH] drm/i915/guc: Change wa and EU_PERF_CNTL registers to MCR type

drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c static int guc_mmio_regset_init(struct temp_regset

Quoted 19 lines · Shuicheng Lin

Some of the wa registers are MCR register, and EU_PERF_CNTL registers are MCR register.
MCR register needs extra process for read/write.
As normal MMIO register also could work with the MCR register process, change all wa registers to MCR type for code simplicity.

Cc Matt Roper <[email protected]>
Cc Umesh Nerlige Ramappa <[email protected]>
---
 drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c +0 -0
index 63724e17829a..61ff4c7e31a6 100644
@@ -378,7 +378,7 @@ static int guc_mmio_regset_init(struct temp_regset

*regset,

drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c static int guc_mmio_regset_init(struct temp_regset · line 378

Quoted 1 line
drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c +0 -0
 		ret |= GUC_MMIO_REG_ADD(gt, regset, GEN12_RCU_MODE,

true);

drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c static int guc_mmio_regset_init(struct temp_regset · line 382

Quoted 6 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c +1 -1
 	for (i = 0, wa = wal->list; i < wal->count; i++, wa++)
-		ret |= GUC_MMIO_REG_ADD(gt, regset, wa->reg, wa-
 masked_reg);
+		ret |= GUC_MCR_REG_ADD(gt, regset, wa->mcr_reg, wa-
 masked_reg);

I'd add some kind of a comment here, explaining that it's safe to always use the MCR form here, even though some of the workarounds are touching non- MCR registers. With a clarifying code comment added,

Quoted 4 lines

Matt

Hi Matt, thanks for the review. I have updated patch to add the code comment. Please let me know if you have any questions.
Thanks.

Quoted 50 lines

drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c static int guc_mmio_regset_init(struct temp_regset · line 384

Quoted 4 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c +0 -0
 	/* Be extra paranoid and include all whitelist registers. */
 	for (i = 0; i < RING_MAX_NONPRIV_SLOTS; i++) @@ -394,13 +394,13

@@

Quoted 2 lines

static int guc_mmio_regset_init(struct temp_regset *regset,
ret |= GUC_MMIO_REG_ADD(gt, regset,

GEN9_LNCFCMOCS(i), false);

drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c

Quoted 3 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c +0 -1
 	if (GRAPHICS_VER(engine->i915) >= 12) {
-		ret |= GUC_MMIO_REG_ADD(gt, regset, EU_PERF_CNTL0,

false);

drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c

Quoted 1 line
drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c +0 -1
-		ret |= GUC_MMIO_REG_ADD(gt, regset, EU_PERF_CNTL1,

false);

drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c

Quoted 1 line
drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c +0 -1
-		ret |= GUC_MMIO_REG_ADD(gt, regset, EU_PERF_CNTL2,

false);

drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c

Quoted 1 line
drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c +0 -1
-		ret |= GUC_MMIO_REG_ADD(gt, regset, EU_PERF_CNTL3,

false);

drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c

Quoted 1 line
drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c +0 -1
-		ret |= GUC_MMIO_REG_ADD(gt, regset, EU_PERF_CNTL4,

false);

drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c

Quoted 1 line
drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c +0 -1
-		ret |= GUC_MMIO_REG_ADD(gt, regset, EU_PERF_CNTL5,

false);

drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c

Quoted 1 line
drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c +0 -1
-		ret |= GUC_MMIO_REG_ADD(gt, regset, EU_PERF_CNTL6,

false);

drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c

Quoted 1 line
drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c +1 -0
+		ret |= GUC_MCR_REG_ADD(gt, regset,

MCR_REG(i915_mmio_reg_offset(EU_PERF_CNTL0)), false);

drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c

Quoted 1 line
drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c +1 -0
+		ret |= GUC_MCR_REG_ADD(gt, regset,

MCR_REG(i915_mmio_reg_offset(EU_PERF_CNTL1)), false);

drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c

Quoted 1 line
drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c +1 -0
+		ret |= GUC_MCR_REG_ADD(gt, regset,

MCR_REG(i915_mmio_reg_offset(EU_PERF_CNTL2)), false);

drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c

Quoted 1 line
drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c +1 -0
+		ret |= GUC_MCR_REG_ADD(gt, regset,

MCR_REG(i915_mmio_reg_offset(EU_PERF_CNTL3)), false);

drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c

Quoted 1 line
drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c +1 -0
+		ret |= GUC_MCR_REG_ADD(gt, regset,

MCR_REG(i915_mmio_reg_offset(EU_PERF_CNTL4)), false);

drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c

Quoted 1 line
drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c +1 -0
+		ret |= GUC_MCR_REG_ADD(gt, regset,

MCR_REG(i915_mmio_reg_offset(EU_PERF_CNTL5)), false);

Quoted 8 lines
drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c +2 -1
+		ret |= GUC_MCR_REG_ADD(gt, regset,
+MCR_REG(i915_mmio_reg_offset(EU_PERF_CNTL6)), false);
 	}
 
 	return ret ? -1 : 0;
--

2.25.1

--
Matt Roper
Graphics Software Engineer
Linux GPU Platform Enablement
Intel Corporation

#5 lore raw

✗ Fi.CI.BUILD: failure for drm/i915/guc: Change wa and EU_PERF_CNTL registers to MCR type (rev2)

In reply to Matt Roper
== Series Details ==

== Series Details ==

Series: drm/i915/guc: Change wa and EU_PERF_CNTL registers to MCR type (rev2)
URL : https://patchwork.freedesktop.org/series/128095/
State : failure

== Summary ==

Error: patch https://patchwork.freedesktop.org/api/1.0/series/128095/revisions/2/mbox/ not applied
Applying: drm/i915/guc: Change wa and EU_PERF_CNTL registers to MCR type
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 drm/i915/guc: Change wa and EU_PERF_CNTL registers to MCR type 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".
Build failed, no error log produced