Skip to contentSkip to conversation

drm/i915: Enable workaround for pixel shader dispatch hang

PATCH In review Mika Kuoppala 4 participants 11 messages Apr 15, 2019 – Apr 16, 2019

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

PATCH 1/1 drm/i915: Enable workaround for pixel shader dispatch hang

Set chicken bits to workaround a possible pixel shader dispatch hang.

Bspec: 14091, ID#0651

---
 drivers/gpu/drm/i915/i915_reg.h          | 4 ++++
 drivers/gpu/drm/i915/intel_workarounds.c | 9 +++++++++
 2 files changed, 13 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +4 -0
index c1c0f7ab03e9..499cc843443d 100644
@@ -8902,11 +8902,15 @@ enum {
 #define GEN7_ROW_CHICKEN2_GT2		_MMIO(0xf4f4)
 #define   DOP_CLOCK_GATING_DISABLE	(1 << 0)
 #define   PUSH_CONSTANT_DEREF_DISABLE	(1 << 8)
+#define   GEN8_DISABLE_RR_ARBITRATION	(1 << 1)
 #define   GEN11_TDL_CLOCK_GATING_FIX_DISABLE	(1 << 1)
 
 #define HSW_ROW_CHICKEN3		_MMIO(0xe49c)
 #define  HSW_ROW_CHICKEN3_L3_GLOBAL_ATOMICS_DISABLE    (1 << 6)
 
+#define GEN8_ROW_CHICKEN4		_MMIO(0xe48c)
+#define  GEN8_DISABLE_TDL_FIX		(1 << 3)
+
 #define HALF_SLICE_CHICKEN2		_MMIO(0xe180)
 #define   GEN8_ST_PO_DISABLE		(1 << 13)
 
drivers/gpu/drm/i915/intel_workarounds.c +9 -0
index ccaf63679435..4f1a7500ca07 100644
@@ -294,6 +294,15 @@ static void gen9_ctx_workarounds_init(struct intel_engine_cs *engine)
 			  FLOW_CONTROL_ENABLE |
 			  PARTIAL_INSTRUCTION_SHOOTDOWN_DISABLE);
 
+	/* Bspec wa: 0651, skl G0 onwards */
+	if (!IS_SKL_REVID(i915, SKL_REVID_A0, SKL_REVID_F0)) {
+		WA_SET_BIT_MASKED(GEN7_ROW_CHICKEN2,
+				  GEN8_DISABLE_RR_ARBITRATION);
+
+		/* Make sure the default holds to enable TDL fix */
+		WA_CLR_BIT_MASKED(GEN8_ROW_CHICKEN4, GEN8_DISABLE_TDL_FIX);
+	}
+
 	/* Syncing dependencies between camera and graphics:skl,bxt,kbl */
 	if (!IS_COFFEELAKE(i915))
 		WA_SET_BIT_MASKED(HALF_SLICE_CHICKEN3,
Signature · 6 lines
2.17.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

Quoting Mika Kuoppala (2019-04-15 15:21:22)

Quoted 35 lines

Set chicken bits to workaround a possible pixel shader dispatch hang.

Bspec: 14091, ID#0651

---
 drivers/gpu/drm/i915/i915_reg.h          | 4 ++++
 drivers/gpu/drm/i915/intel_workarounds.c | 9 +++++++++
 2 files changed, 13 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +4 -0
index c1c0f7ab03e9..499cc843443d 100644
@@ -8902,11 +8902,15 @@ enum {
 #define GEN7_ROW_CHICKEN2_GT2          _MMIO(0xf4f4)
 #define   DOP_CLOCK_GATING_DISABLE     (1 << 0)
 #define   PUSH_CONSTANT_DEREF_DISABLE  (1 << 8)
+#define   GEN8_DISABLE_RR_ARBITRATION  (1 << 1)
 #define   GEN11_TDL_CLOCK_GATING_FIX_DISABLE   (1 << 1)
 
 #define HSW_ROW_CHICKEN3               _MMIO(0xe49c)
 #define  HSW_ROW_CHICKEN3_L3_GLOBAL_ATOMICS_DISABLE    (1 << 6)
 
+#define GEN8_ROW_CHICKEN4              _MMIO(0xe48c)
+#define  GEN8_DISABLE_TDL_FIX          (1 << 3)
+
 #define HALF_SLICE_CHICKEN2            _MMIO(0xe180)
 #define   GEN8_ST_PO_DISABLE           (1 << 13)
 
drivers/gpu/drm/i915/intel_workarounds.c +0 -0
index ccaf63679435..4f1a7500ca07 100644

drivers/gpu/drm/i915/intel_workarounds.c static void gen9_ctx_workarounds_init(struct intel_engine_cs *engine) · line 298

Quoted 5 lines
drivers/gpu/drm/i915/intel_workarounds.c +2 -0
@@ -294,6 +294,15 @@ static void gen9_ctx_workarounds_init(struct intel_engine_cs *engine)
                          FLOW_CONTROL_ENABLE |
                          PARTIAL_INSTRUCTION_SHOOTDOWN_DISABLE);
 
+       /* Bspec wa: 0651, skl G0 onwards */
+       if (!IS_SKL_REVID(i915, SKL_REVID_A0, SKL_REVID_F0)) {

IS_SKL_REVID(i915, SKL_REVID_G0, REVID_FOREVER) ?
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#2 lore raw
In reply to Mika Kuoppala
Quoted 35 lines · Mika Kuoppala

Set chicken bits to workaround a possible pixel shader dispatch hang.

Bspec: 14091, ID#0651

---
 drivers/gpu/drm/i915/i915_reg.h          | 4 ++++
 drivers/gpu/drm/i915/intel_workarounds.c | 9 +++++++++
 2 files changed, 13 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +4 -0
index c1c0f7ab03e9..499cc843443d 100644
@@ -8902,11 +8902,15 @@ enum {
 #define GEN7_ROW_CHICKEN2_GT2		_MMIO(0xf4f4)
 #define   DOP_CLOCK_GATING_DISABLE	(1 << 0)
 #define   PUSH_CONSTANT_DEREF_DISABLE	(1 << 8)
+#define   GEN8_DISABLE_RR_ARBITRATION	(1 << 1)
 #define   GEN11_TDL_CLOCK_GATING_FIX_DISABLE	(1 << 1)
 
 #define HSW_ROW_CHICKEN3		_MMIO(0xe49c)
 #define  HSW_ROW_CHICKEN3_L3_GLOBAL_ATOMICS_DISABLE    (1 << 6)
 
+#define GEN8_ROW_CHICKEN4		_MMIO(0xe48c)
+#define  GEN8_DISABLE_TDL_FIX		(1 << 3)
+
 #define HALF_SLICE_CHICKEN2		_MMIO(0xe180)
 #define   GEN8_ST_PO_DISABLE		(1 << 13)
 
drivers/gpu/drm/i915/intel_workarounds.c +0 -0
index ccaf63679435..4f1a7500ca07 100644

drivers/gpu/drm/i915/intel_workarounds.c static void gen9_ctx_workarounds_init(struct intel_engine_cs *engine) · line 298

Quoted 5 lines
drivers/gpu/drm/i915/intel_workarounds.c +2 -0
@@ -294,6 +294,15 @@ static void gen9_ctx_workarounds_init(struct intel_engine_cs *engine)
 			  FLOW_CONTROL_ENABLE |
 			  PARTIAL_INSTRUCTION_SHOOTDOWN_DISABLE);
 
+	/* Bspec wa: 0651, skl G0 onwards */
+	if (!IS_SKL_REVID(i915, SKL_REVID_A0, SKL_REVID_F0)) {

Aren't all those pre-production?

Quoted 17 lines
drivers/gpu/drm/i915/intel_workarounds.c +7 -0
+		WA_SET_BIT_MASKED(GEN7_ROW_CHICKEN2,
+				  GEN8_DISABLE_RR_ARBITRATION);
+
+		/* Make sure the default holds to enable TDL fix */
+		WA_CLR_BIT_MASKED(GEN8_ROW_CHICKEN4, GEN8_DISABLE_TDL_FIX);
+	}
+
 	/* Syncing dependencies between camera and graphics:skl,bxt,kbl */
 	if (!IS_COFFEELAKE(i915))
 		WA_SET_BIT_MASKED(HALF_SLICE_CHICKEN3,
Signature · 6 lines
2.17.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#3 lore raw

Quoting Ville Syrjälä (2019-04-15 15:25:11)

Quoted 9 lines · Mika Kuoppala
Quoted 8 lines
drivers/gpu/drm/i915/intel_workarounds.c +0 -0
index ccaf63679435..4f1a7500ca07 100644
@@ -294,6 +294,15 @@ static void gen9_ctx_workarounds_init(struct intel_engine_cs *engine)
                        FLOW_CONTROL_ENABLE |
                        PARTIAL_INSTRUCTION_SHOOTDOWN_DISABLE);
 
Quoted 4 lines

drivers/gpu/drm/i915/intel_workarounds.c static void gen9_ctx_workarounds_init(struct intel_engine_cs *engine) · line 298

Quoted 2 lines
drivers/gpu/drm/i915/intel_workarounds.c +2 -0
+     /* Bspec wa: 0651, skl G0 onwards */
+     if (!IS_SKL_REVID(i915, SKL_REVID_A0, SKL_REVID_F0)) {

Aren't all those pre-production?

intel_detect_preproduction_hw() says yes.
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#4 lore raw
Quoted 10 lines · Chris Wilson

Quoting Ville Syrjälä (2019-04-15 15:25:11)

Quoted 9 lines · Mika Kuoppala
Quoted 8 lines
drivers/gpu/drm/i915/intel_workarounds.c +0 -0
index ccaf63679435..4f1a7500ca07 100644
@@ -294,6 +294,15 @@ static void gen9_ctx_workarounds_init(struct intel_engine_cs *engine)
                        FLOW_CONTROL_ENABLE |
                        PARTIAL_INSTRUCTION_SHOOTDOWN_DISABLE);
 
Quoted 6 lines
Quoted 4 lines

drivers/gpu/drm/i915/intel_workarounds.c static void gen9_ctx_workarounds_init(struct intel_engine_cs *engine) · line 298

Quoted 2 lines
drivers/gpu/drm/i915/intel_workarounds.c +2 -0
+     /* Bspec wa: 0651, skl G0 onwards */
+     if (!IS_SKL_REVID(i915, SKL_REVID_A0, SKL_REVID_F0)) {

Aren't all those pre-production?

intel_detect_preproduction_hw() says yes.

v2 coming up. The inverse check got left there as I needed to filter out bxt ones. which turned out to be preprod. The bell should have rung at that point, but didn't. -Mika
_______________________________________________
Intel-gfx mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#5 lore raw

PATCH 1/1 drm/i915: Enable workaround for pixel shader dispatch hang

In reply to Mika Kuoppala

Set chicken bits to workaround a possible pixel shader dispatch hang.

v2: no need to filter out preprod skl (Ville, Chris)

Bspec: 14091, ID#0651

Cc Chris Wilson <[email protected]>
Cc Ville Syrjälä <[email protected]>
---
 drivers/gpu/drm/i915/i915_reg.h          | 4 ++++
 drivers/gpu/drm/i915/intel_workarounds.c | 5 +++++
 2 files changed, 9 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +4 -0
index c1c0f7ab03e9..499cc843443d 100644
@@ -8902,11 +8902,15 @@ enum {
 #define GEN7_ROW_CHICKEN2_GT2		_MMIO(0xf4f4)
 #define   DOP_CLOCK_GATING_DISABLE	(1 << 0)
 #define   PUSH_CONSTANT_DEREF_DISABLE	(1 << 8)
+#define   GEN8_DISABLE_RR_ARBITRATION	(1 << 1)
 #define   GEN11_TDL_CLOCK_GATING_FIX_DISABLE	(1 << 1)
 
 #define HSW_ROW_CHICKEN3		_MMIO(0xe49c)
 #define  HSW_ROW_CHICKEN3_L3_GLOBAL_ATOMICS_DISABLE    (1 << 6)
 
+#define GEN8_ROW_CHICKEN4		_MMIO(0xe48c)
+#define  GEN8_DISABLE_TDL_FIX		(1 << 3)
+
 #define HALF_SLICE_CHICKEN2		_MMIO(0xe180)
 #define   GEN8_ST_PO_DISABLE		(1 << 13)
 
drivers/gpu/drm/i915/intel_workarounds.c +5 -0
index ccaf63679435..89d8797c91be 100644
@@ -294,6 +294,11 @@ static void gen9_ctx_workarounds_init(struct intel_engine_cs *engine)
 			  FLOW_CONTROL_ENABLE |
 			  PARTIAL_INSTRUCTION_SHOOTDOWN_DISABLE);
 
+	/* Bspec wa: 0651, disable rr arb and enable tdl fix */
+	WA_SET_BIT_MASKED(GEN7_ROW_CHICKEN2,
+			  GEN8_DISABLE_RR_ARBITRATION);
+	WA_CLR_BIT_MASKED(GEN8_ROW_CHICKEN4, GEN8_DISABLE_TDL_FIX);
+
 	/* Syncing dependencies between camera and graphics:skl,bxt,kbl */
 	if (!IS_COFFEELAKE(i915))
 		WA_SET_BIT_MASKED(HALF_SLICE_CHICKEN3,
Signature · 6 lines
2.17.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#6 lore raw

PATCH 1/1 drm/i915: Enable workaround for pixel shader dispatch hang

In reply to Mika Kuoppala

Set chicken bits to workaround a possible pixel shader dispatch hang.

v2: no need to filter out preprod skl (Ville, Chris)
v3: formatting

Bspec: 14091, ID#0651

Cc Chris Wilson <[email protected]>
Cc Ville Syrjälä <[email protected]>
---
 drivers/gpu/drm/i915/i915_reg.h          | 4 ++++
 drivers/gpu/drm/i915/intel_workarounds.c | 4 ++++
 2 files changed, 8 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +4 -0
index c1c0f7ab03e9..499cc843443d 100644
@@ -8902,11 +8902,15 @@ enum {
 #define GEN7_ROW_CHICKEN2_GT2		_MMIO(0xf4f4)
 #define   DOP_CLOCK_GATING_DISABLE	(1 << 0)
 #define   PUSH_CONSTANT_DEREF_DISABLE	(1 << 8)
+#define   GEN8_DISABLE_RR_ARBITRATION	(1 << 1)
 #define   GEN11_TDL_CLOCK_GATING_FIX_DISABLE	(1 << 1)
 
 #define HSW_ROW_CHICKEN3		_MMIO(0xe49c)
 #define  HSW_ROW_CHICKEN3_L3_GLOBAL_ATOMICS_DISABLE    (1 << 6)
 
+#define GEN8_ROW_CHICKEN4		_MMIO(0xe48c)
+#define  GEN8_DISABLE_TDL_FIX		(1 << 3)
+
 #define HALF_SLICE_CHICKEN2		_MMIO(0xe180)
 #define   GEN8_ST_PO_DISABLE		(1 << 13)
 
drivers/gpu/drm/i915/intel_workarounds.c +4 -0
index ccaf63679435..b4709de49552 100644
@@ -294,6 +294,10 @@ static void gen9_ctx_workarounds_init(struct intel_engine_cs *engine)
 			  FLOW_CONTROL_ENABLE |
 			  PARTIAL_INSTRUCTION_SHOOTDOWN_DISABLE);
 
+	/* Bspec wa: 0651, disable rr arb and enable tdl fix */
+	WA_SET_BIT_MASKED(GEN7_ROW_CHICKEN2, GEN8_DISABLE_RR_ARBITRATION);
+	WA_CLR_BIT_MASKED(GEN8_ROW_CHICKEN4, GEN8_DISABLE_TDL_FIX);
+
 	/* Syncing dependencies between camera and graphics:skl,bxt,kbl */
 	if (!IS_COFFEELAKE(i915))
 		WA_SET_BIT_MASKED(HALF_SLICE_CHICKEN3,
Signature · 6 lines
2.17.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#7 lore raw

Quoting Mika Kuoppala (2019-04-15 15:45:29)

Quoted 40 lines

Set chicken bits to workaround a possible pixel shader dispatch hang.

v2: no need to filter out preprod skl (Ville, Chris)
v3: formatting

Bspec: 14091, ID#0651

Cc Chris Wilson <[email protected]>
Cc Ville Syrjälä <[email protected]>
---
 drivers/gpu/drm/i915/i915_reg.h          | 4 ++++
 drivers/gpu/drm/i915/intel_workarounds.c | 4 ++++
 2 files changed, 8 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +4 -0
index c1c0f7ab03e9..499cc843443d 100644
@@ -8902,11 +8902,15 @@ enum {
 #define GEN7_ROW_CHICKEN2_GT2          _MMIO(0xf4f4)
 #define   DOP_CLOCK_GATING_DISABLE     (1 << 0)
 #define   PUSH_CONSTANT_DEREF_DISABLE  (1 << 8)
+#define   GEN8_DISABLE_RR_ARBITRATION  (1 << 1)
 #define   GEN11_TDL_CLOCK_GATING_FIX_DISABLE   (1 << 1)
 
 #define HSW_ROW_CHICKEN3               _MMIO(0xe49c)
 #define  HSW_ROW_CHICKEN3_L3_GLOBAL_ATOMICS_DISABLE    (1 << 6)
 
+#define GEN8_ROW_CHICKEN4              _MMIO(0xe48c)
+#define  GEN8_DISABLE_TDL_FIX          (1 << 3)
+
 #define HALF_SLICE_CHICKEN2            _MMIO(0xe180)
 #define   GEN8_ST_PO_DISABLE           (1 << 13)
 
drivers/gpu/drm/i915/intel_workarounds.c +0 -0
index ccaf63679435..b4709de49552 100644

drivers/gpu/drm/i915/intel_workarounds.c static void gen9_ctx_workarounds_init(struct intel_engine_cs *engine) · line 299

Quoted 6 lines
drivers/gpu/drm/i915/intel_workarounds.c +3 -0
@@ -294,6 +294,10 @@ static void gen9_ctx_workarounds_init(struct intel_engine_cs *engine)
                          FLOW_CONTROL_ENABLE |
                          PARTIAL_INSTRUCTION_SHOOTDOWN_DISABLE);
 
+       /* Bspec wa: 0651, disable rr arb and enable tdl fix */
+       WA_SET_BIT_MASKED(GEN7_ROW_CHICKEN2, GEN8_DISABLE_RR_ARBITRATION);
+       WA_CLR_BIT_MASKED(GEN8_ROW_CHICKEN4, GEN8_DISABLE_TDL_FIX);

In your first patch, you had this only applying to Skylake. Is that still the case? i.e. do we need if (IS_SKYLAKE()) { ... } -Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#8 lore raw
Quoted 44 lines · Chris Wilson

Quoting Mika Kuoppala (2019-04-15 15:45:29)

Quoted 43 lines

Set chicken bits to workaround a possible pixel shader dispatch hang.

v2: no need to filter out preprod skl (Ville, Chris)
v3: formatting

Bspec: 14091, ID#0651

Cc Chris Wilson <[email protected]>
Cc Ville Syrjälä <[email protected]>
---
 drivers/gpu/drm/i915/i915_reg.h          | 4 ++++
 drivers/gpu/drm/i915/intel_workarounds.c | 4 ++++
 2 files changed, 8 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +4 -0
index c1c0f7ab03e9..499cc843443d 100644
@@ -8902,11 +8902,15 @@ enum {
 #define GEN7_ROW_CHICKEN2_GT2          _MMIO(0xf4f4)
 #define   DOP_CLOCK_GATING_DISABLE     (1 << 0)
 #define   PUSH_CONSTANT_DEREF_DISABLE  (1 << 8)
+#define   GEN8_DISABLE_RR_ARBITRATION  (1 << 1)
 #define   GEN11_TDL_CLOCK_GATING_FIX_DISABLE   (1 << 1)
 
 #define HSW_ROW_CHICKEN3               _MMIO(0xe49c)
 #define  HSW_ROW_CHICKEN3_L3_GLOBAL_ATOMICS_DISABLE    (1 << 6)
 
+#define GEN8_ROW_CHICKEN4              _MMIO(0xe48c)
+#define  GEN8_DISABLE_TDL_FIX          (1 << 3)
+
 #define HALF_SLICE_CHICKEN2            _MMIO(0xe180)
 #define   GEN8_ST_PO_DISABLE           (1 << 13)
 
drivers/gpu/drm/i915/intel_workarounds.c +0 -0
index ccaf63679435..b4709de49552 100644
@@ -294,6 +294,10 @@ static void gen9_ctx_workarounds_init(struct intel_engine_cs *engine)
                          FLOW_CONTROL_ENABLE |
                          PARTIAL_INSTRUCTION_SHOOTDOWN_DISABLE);
 
Quoted 6 lines

drivers/gpu/drm/i915/intel_workarounds.c static void gen9_ctx_workarounds_init(struct intel_engine_cs *engine) · line 299

Quoted 3 lines
drivers/gpu/drm/i915/intel_workarounds.c +3 -0
+       /* Bspec wa: 0651, disable rr arb and enable tdl fix */
+       WA_SET_BIT_MASKED(GEN7_ROW_CHICKEN2, GEN8_DISABLE_RR_ARBITRATION);
+       WA_CLR_BIT_MASKED(GEN8_ROW_CHICKEN4, GEN8_DISABLE_TDL_FIX);

In your first patch, you had this only applying to Skylake. Is that still the case? i.e. do we need if (IS_SKYLAKE()) { ... }

I had !SKL_REVID() so I only wanted to exclude everything up to G0.

Bspec on row chicken 2 says that we want this from skl G0 onwards and bxt b0 onwards up to ICL. So with preprods out, I think it holds.

-Mika
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Acked-by
#9 lore raw

Quoting Mika Kuoppala (2019-04-16 14:26:19)

Quoted 53 lines
Quoted 44 lines · Chris Wilson

Quoting Mika Kuoppala (2019-04-15 15:45:29)

Quoted 43 lines

Set chicken bits to workaround a possible pixel shader dispatch hang.

v2: no need to filter out preprod skl (Ville, Chris)
v3: formatting

Bspec: 14091, ID#0651

Cc Chris Wilson <[email protected]>
Cc Ville Syrjälä <[email protected]>
---
 drivers/gpu/drm/i915/i915_reg.h          | 4 ++++
 drivers/gpu/drm/i915/intel_workarounds.c | 4 ++++
 2 files changed, 8 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +4 -0
index c1c0f7ab03e9..499cc843443d 100644
@@ -8902,11 +8902,15 @@ enum {
 #define GEN7_ROW_CHICKEN2_GT2          _MMIO(0xf4f4)
 #define   DOP_CLOCK_GATING_DISABLE     (1 << 0)
 #define   PUSH_CONSTANT_DEREF_DISABLE  (1 << 8)
+#define   GEN8_DISABLE_RR_ARBITRATION  (1 << 1)
 #define   GEN11_TDL_CLOCK_GATING_FIX_DISABLE   (1 << 1)
 
 #define HSW_ROW_CHICKEN3               _MMIO(0xe49c)
 #define  HSW_ROW_CHICKEN3_L3_GLOBAL_ATOMICS_DISABLE    (1 << 6)
 
+#define GEN8_ROW_CHICKEN4              _MMIO(0xe48c)
+#define  GEN8_DISABLE_TDL_FIX          (1 << 3)
+
 #define HALF_SLICE_CHICKEN2            _MMIO(0xe180)
 #define   GEN8_ST_PO_DISABLE           (1 << 13)
 
drivers/gpu/drm/i915/intel_workarounds.c +0 -0
index ccaf63679435..b4709de49552 100644
@@ -294,6 +294,10 @@ static void gen9_ctx_workarounds_init(struct intel_engine_cs *engine)
                          FLOW_CONTROL_ENABLE |
                          PARTIAL_INSTRUCTION_SHOOTDOWN_DISABLE);
 
Quoted 6 lines

drivers/gpu/drm/i915/intel_workarounds.c static void gen9_ctx_workarounds_init(struct intel_engine_cs *engine) · line 299

Quoted 3 lines
drivers/gpu/drm/i915/intel_workarounds.c +3 -0
+       /* Bspec wa: 0651, disable rr arb and enable tdl fix */
+       WA_SET_BIT_MASKED(GEN7_ROW_CHICKEN2, GEN8_DISABLE_RR_ARBITRATION);
+       WA_CLR_BIT_MASKED(GEN8_ROW_CHICKEN4, GEN8_DISABLE_TDL_FIX);

In your first patch, you had this only applying to Skylake. Is that still the case? i.e. do we need if (IS_SKYLAKE()) { ... }

Quoted 4 lines

I had !SKL_REVID() so I only wanted to exclude everything up to G0.

Bspec on row chicken 2 says that we want this from skl G0 onwards and bxt b0 onwards up to ICL. So with preprods out, I think it holds.

Ok, I'm easily convinced.

-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#10 lore raw

✗ Fi.CI.BAT: failure for drm/i915: Enable workaround for pixel shader dispatch hang (rev3)

In reply to Mika Kuoppala
== Series Details ==

== Series Details ==

Series: drm/i915: Enable workaround for pixel shader dispatch hang (rev3)
URL : https://patchwork.freedesktop.org/series/59504/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_5934 -> Patchwork_12800
====================================================

Summary
-------

**FAILURE**

Serious unknown changes coming with Patchwork_12800 absolutely need to be verified manually.

If you think the reported changes have nothing to do with the changes introduced in Patchwork_12800, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.

External URL: https://patchwork.freedesktop.org/api/1.0/series/59504/revisions/3/mbox/

Possible new issues
-------------------

Here are the unknown changes that may have been introduced in Patchwork_12800:

### IGT changes ###

#### Possible regressions ####

* igt@gem_exec_basic@gtt-bsd:
- fi-icl-y: PASS -> INCOMPLETE

Known issues
------------

Here are the changes found in Patchwork_12800 that come from known issues:

### IGT changes ###

#### Issues hit ####

* igt@gem_ctx_exec@basic:
- fi-icl-u3: PASS -> INCOMPLETE [fdo#107713]

* igt@kms_busy@basic-flip-a:
- fi-bsw-n3050: NOTRUN -> SKIP [fdo#109271] / [fdo#109278] +1

* igt@kms_chamelium@hdmi-crc-fast:
- fi-bsw-n3050: NOTRUN -> SKIP [fdo#109271] +57

#### Possible fixes ####

* igt@i915_selftest@live_contexts:
- fi-bdw-gvtdvm: DMESG-FAIL [fdo#110235 ] -> PASS

* igt@i915_selftest@live_hangcheck:
- fi-skl-iommu: INCOMPLETE [fdo#108602] / [fdo#108744] -> PASS

* igt@kms_pipe_crc_basic@nonblocking-crc-pipe-a:
- fi-byt-clapper: FAIL [fdo#103191] -> PASS

[fdo#103191]: https://bugs.freedesktop.org/show_bug.cgi?id=103191
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#108602]: https://bugs.freedesktop.org/show_bug.cgi?id=108602
[fdo#108744]: https://bugs.freedesktop.org/show_bug.cgi?id=108744
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#110235 ]: https://bugs.freedesktop.org/show_bug.cgi?id=110235

Participating hosts (50 -> 40)
------------------------------

Additional (1): fi-bsw-n3050
Missing (11): fi-kbl-soraka fi-ilk-m540 fi-skl-6770hq fi-byt-squawks fi-icl-u2 fi-bwr-2160 fi-bsw-cyan fi-ctg-p8600 fi-bdw-samus fi-skl-6700k2 fi-snb-2600

Build changes
-------------

* Linux: CI_DRM_5934 -> Patchwork_12800

CI_DRM_5934: cc5334c0e706ec423c5f1a139cf3da7bd3287db6 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4946: 56bdc68638cec64c6b02cd6b220b52b76059b51a @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_12800: e2e492f915bfab74f7d8aaa6dc7bcb23d2605759 @ git://anongit.freedesktop.org/gfx-ci/linux

== Linux commits ==

e2e492f915bf drm/i915: Enable workaround for pixel shader dispatch hang

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12800/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx