Skip to contentSkip to conversation

drm/i915/cnl: WA FtrEnableFastAnisoL1BankingFix

PATCH In review Rodrigo Vivi 4 participants 7 messages Aug 29, 2017 – Sep 5, 2017

Subsystems (2)
lore
Share & tools
lore

Rodrigo Vivi

author maintainer
#0 lore raw

PATCH 1/1 drm/i915/cnl: WA FtrEnableFastAnisoL1BankingFix

WA to enable HW L1 Banking fix that allows aniso to operate at full sample rate.

Cc Mika Kuoppala <[email protected]>
Cc Oscar Mateo <[email protected]>
Cc Ben Widawsky <[email protected]>
Cc Anuj Phogat <[email protected]>
---
 drivers/gpu/drm/i915/i915_reg.h        | 1 +
 drivers/gpu/drm/i915/intel_engine_cs.c | 3 +++
 2 files changed, 4 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +1 -0
index e2908ae34004..1ad22a824921 100644
@@ -8072,6 +8072,7 @@ enum {
 #define   HSW_SAMPLE_C_PERFORMANCE	(1<<9)
 #define   GEN8_CENTROID_PIXEL_OPT_DIS	(1<<8)
 #define   GEN9_DISABLE_OCL_OOB_SUPPRESS_LOGIC	(1<<5)
+#define   CNL_FAST_ANISO_L1_BANKING_FIX	(1<<4)
 #define   GEN8_SAMPLER_POWER_BYPASS_DIS	(1<<1)
 
 #define GEN9_HALF_SLICE_CHICKEN7	_MMIO(0xe194)
drivers/gpu/drm/i915/intel_engine_cs.c +3 -0
index a6ac9d0a4156..4b9b7828802d 100644
@@ -1090,6 +1090,9 @@ static int cnl_init_workarounds(struct intel_engine_cs *engine)
 	/* WaPushConstantDereferenceHoldDisable:cnl */
 	WA_SET_BIT(GEN7_ROW_CHICKEN2, PUSH_CONSTANT_DEREF_DISABLE);
 
+	/* FtrEnableFastAnisoL1BankingFix: cnl */
+	WA_SET_BIT_MASKED(HALF_SLICE_CHICKEN3, CNL_FAST_ANISO_L1_BANKING_FIX);
+
 	/* WaEnablePreemptionGranularityControlByUMD:cnl */
 	ret= wa_ring_whitelist_reg(engine, GEN8_CS_CHICKEN1);
 	if (ret)
Signature · 6 lines
2.13.2

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

✓ Fi.CI.BAT: success for drm/i915/cnl: WA FtrEnableFastAnisoL1BankingFix

== Series Details ==

== Series Details ==

Series: drm/i915/cnl: WA FtrEnableFastAnisoL1BankingFix
URL : https://patchwork.freedesktop.org/series/29505/
State : success

== Summary ==

Series 29505v1 drm/i915/cnl: WA FtrEnableFastAnisoL1BankingFix
https://patchwork.freedesktop.org/api/1.0/series/29505/revisions/1/mbox/

Test gem_ringfill:

        Subgroup basic-default-hang:
                incomplete -> DMESG-WARN (fi-pnv-d510) fdo#101600
Test kms_cursor_legacy:
        Subgroup basic-busy-flip-before-cursor-legacy:
                pass       -> FAIL       (fi-snb-2600) fdo#100215
Test kms_flip:
        Subgroup basic-flip-vs-modeset:
                pass       -> SKIP       (fi-skl-x1585l) fdo#101781
Test kms_frontbuffer_tracking:
        Subgroup basic:
                dmesg-warn -> PASS       (fi-bdw-5557u)

fdo#101600 https://bugs.freedesktop.org/show_bug.cgi?id=101600
fdo#100215 https://bugs.freedesktop.org/show_bug.cgi?id=100215
fdo#101781 https://bugs.freedesktop.org/show_bug.cgi?id=101781

fi-bdw-5557u     total:279  pass:268  dwarn:0   dfail:0   fail:0   skip:11  time:460s
fi-bdw-gvtdvm    total:279  pass:265  dwarn:0   dfail:0   fail:0   skip:14  time:445s
fi-blb-e6850     total:279  pass:224  dwarn:1   dfail:0   fail:0   skip:54  time:363s
fi-bsw-n3050     total:279  pass:243  dwarn:0   dfail:0   fail:0   skip:36  time:561s
fi-bwr-2160      total:279  pass:184  dwarn:0   dfail:0   fail:0   skip:95  time:252s
fi-bxt-j4205     total:279  pass:260  dwarn:0   dfail:0   fail:0   skip:19  time:521s
fi-byt-j1900     total:279  pass:254  dwarn:1   dfail:0   fail:0   skip:24  time:521s
fi-byt-n2820     total:279  pass:250  dwarn:1   dfail:0   fail:0   skip:28  time:523s
fi-elk-e7500     total:279  pass:230  dwarn:0   dfail:0   fail:0   skip:49  time:443s
fi-glk-2a        total:279  pass:260  dwarn:0   dfail:0   fail:0   skip:19  time:615s
fi-hsw-4770      total:279  pass:263  dwarn:0   dfail:0   fail:0   skip:16  time:444s
fi-hsw-4770r     total:279  pass:263  dwarn:0   dfail:0   fail:0   skip:16  time:426s
fi-ilk-650       total:279  pass:229  dwarn:0   dfail:0   fail:0   skip:50  time:422s
fi-ivb-3520m     total:279  pass:261  dwarn:0   dfail:0   fail:0   skip:18  time:511s
fi-ivb-3770      total:279  pass:261  dwarn:0   dfail:0   fail:0   skip:18  time:481s
fi-kbl-7500u     total:279  pass:261  dwarn:0   dfail:0   fail:0   skip:18  time:475s
fi-kbl-7560u     total:279  pass:269  dwarn:0   dfail:0   fail:0   skip:10  time:599s
fi-kbl-r         total:279  pass:261  dwarn:0   dfail:0   fail:0   skip:18  time:600s
fi-pnv-d510      total:279  pass:223  dwarn:1   dfail:0   fail:0   skip:55  time:528s
fi-skl-6260u     total:279  pass:269  dwarn:0   dfail:0   fail:0   skip:10  time:480s
fi-skl-6770hq    total:279  pass:269  dwarn:0   dfail:0   fail:0   skip:10  time:495s
fi-skl-gvtdvm    total:279  pass:266  dwarn:0   dfail:0   fail:0   skip:13  time:452s
fi-skl-x1585l    total:279  pass:268  dwarn:0   dfail:0   fail:0   skip:11  time:493s
fi-snb-2520m     total:279  pass:251  dwarn:0   dfail:0   fail:0   skip:28  time:547s
fi-snb-2600      total:279  pass:249  dwarn:0   dfail:0   fail:1   skip:29  time:405s

fi-skl-6700k failed to connect after reboot

428ed27345fbf9be530d01ca6dc862eb5895db81 drm-tip: 2017y-08m-29d-17h-43m-11s UTC integration manifest 7f164562d87a drm/i915/cnl: WA FtrEnableFastAnisoL1BankingFix

== Logs ==

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

#2 lore raw

✓ Fi.CI.IGT: success for drm/i915/cnl: WA FtrEnableFastAnisoL1BankingFix

In reply to Rodrigo Vivi
== Series Details ==

== Series Details ==

Series: drm/i915/cnl: WA FtrEnableFastAnisoL1BankingFix
URL : https://patchwork.freedesktop.org/series/29505/
State : success

== Summary ==

Test kms_cursor_legacy:

        Subgroup short-flip-before-cursor-atomic-transitions-varying-size:
                skip       -> PASS       (shard-hsw)
Test kms_setmode:
        Subgroup basic:
                fail       -> PASS       (shard-hsw) fdo#99912
Test perf:
        Subgroup blocking:
                fail       -> PASS       (shard-hsw) fdo#102252

fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
fdo#102252 https://bugs.freedesktop.org/show_bug.cgi?id=102252

shard-hsw total:2230 pass:1232 dwarn:0 dfail:0 fail:16 skip:982 time:9675s

== Logs ==

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

Reviewed-by on v1 1/1
#3 lore raw
In reply to Rodrigo Vivi
Quoted 3 lines · Rodrigo Vivi

WA to enable HW L1 Banking fix that allows aniso to operate at full sample rate.

References: HSD#1937670

Quoted 5 lines
Cc Mika Kuoppala <[email protected]>
Cc Oscar Mateo <[email protected]>
Cc Ben Widawsky <[email protected]>
Cc Anuj Phogat <[email protected]>
Quoted 38 lines
---
 drivers/gpu/drm/i915/i915_reg.h        | 1 +
 drivers/gpu/drm/i915/intel_engine_cs.c | 3 +++
 2 files changed, 4 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +1 -0
index e2908ae34004..1ad22a824921 100644
@@ -8072,6 +8072,7 @@ enum {
 #define   HSW_SAMPLE_C_PERFORMANCE	(1<<9)
 #define   GEN8_CENTROID_PIXEL_OPT_DIS	(1<<8)
 #define   GEN9_DISABLE_OCL_OOB_SUPPRESS_LOGIC	(1<<5)
+#define   CNL_FAST_ANISO_L1_BANKING_FIX	(1<<4)
 #define   GEN8_SAMPLER_POWER_BYPASS_DIS	(1<<1)
 
 #define GEN9_HALF_SLICE_CHICKEN7	_MMIO(0xe194)
drivers/gpu/drm/i915/intel_engine_cs.c +3 -0
index a6ac9d0a4156..4b9b7828802d 100644
@@ -1090,6 +1090,9 @@ static int cnl_init_workarounds(struct intel_engine_cs *engine)
 	/* WaPushConstantDereferenceHoldDisable:cnl */
 	WA_SET_BIT(GEN7_ROW_CHICKEN2, PUSH_CONSTANT_DEREF_DISABLE);
 
+	/* FtrEnableFastAnisoL1BankingFix: cnl */
+	WA_SET_BIT_MASKED(HALF_SLICE_CHICKEN3, CNL_FAST_ANISO_L1_BANKING_FIX);
+
 	/* WaEnablePreemptionGranularityControlByUMD:cnl */
 	ret= wa_ring_whitelist_reg(engine, GEN8_CS_CHICKEN1);
 	if (ret)
Signature · 6 lines
2.13.2

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

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

author maintainer Applied
#4 lore raw

merged to dinq. thanks for the review

Quoted 50 lines · Mika Kuoppala
Quoted 3 lines · Rodrigo Vivi

WA to enable HW L1 Banking fix that allows aniso to operate at full sample rate.

References: HSD#1937670

Quoted 5 lines
Cc Mika Kuoppala <[email protected]>
Cc Oscar Mateo <[email protected]>
Cc Ben Widawsky <[email protected]>
Cc Anuj Phogat <[email protected]>
Quoted 34 lines
---
 drivers/gpu/drm/i915/i915_reg.h        | 1 +
 drivers/gpu/drm/i915/intel_engine_cs.c | 3 +++
 2 files changed, 4 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +1 -0
index e2908ae34004..1ad22a824921 100644
@@ -8072,6 +8072,7 @@ enum {
 #define   HSW_SAMPLE_C_PERFORMANCE	(1<<9)
 #define   GEN8_CENTROID_PIXEL_OPT_DIS	(1<<8)
 #define   GEN9_DISABLE_OCL_OOB_SUPPRESS_LOGIC	(1<<5)
+#define   CNL_FAST_ANISO_L1_BANKING_FIX	(1<<4)
 #define   GEN8_SAMPLER_POWER_BYPASS_DIS	(1<<1)
 
 #define GEN9_HALF_SLICE_CHICKEN7	_MMIO(0xe194)
drivers/gpu/drm/i915/intel_engine_cs.c +3 -0
index a6ac9d0a4156..4b9b7828802d 100644
@@ -1090,6 +1090,9 @@ static int cnl_init_workarounds(struct intel_engine_cs *engine)
 	/* WaPushConstantDereferenceHoldDisable:cnl */
 	WA_SET_BIT(GEN7_ROW_CHICKEN2, PUSH_CONSTANT_DEREF_DISABLE);
 
+	/* FtrEnableFastAnisoL1BankingFix: cnl */
+	WA_SET_BIT_MASKED(HALF_SLICE_CHICKEN3, CNL_FAST_ANISO_L1_BANKING_FIX);
+
 	/* WaEnablePreemptionGranularityControlByUMD:cnl */
 	ret= wa_ring_whitelist_reg(engine, GEN8_CS_CHICKEN1);
 	if (ret)
Signature · 1 line
2.13.2
Quoted 4 lines
Quoted 4 lines

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

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

#5 lore raw
In reply to Rodrigo Vivi
Quoted 18 lines · Rodrigo Vivi

WA to enable HW L1 Banking fix that allows aniso to operate at full sample rate.

Cc Mika Kuoppala <[email protected]>
Cc Oscar Mateo <[email protected]>
Cc Ben Widawsky <[email protected]>
Cc Anuj Phogat <[email protected]>
---
  drivers/gpu/drm/i915/i915_reg.h        | 1 +
  drivers/gpu/drm/i915/intel_engine_cs.c | 3 +++
  2 files changed, 4 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +0 -0
index e2908ae34004..1ad22a824921 100644

drivers/gpu/drm/i915/i915_reg.h enum { · line 8075

Quoted 4 lines
drivers/gpu/drm/i915/i915_reg.h +1 -0
@@ -8072,6 +8072,7 @@ enum {
  #define   HSW_SAMPLE_C_PERFORMANCE	(1<<9)
  #define   GEN8_CENTROID_PIXEL_OPT_DIS	(1<<8)
  #define   GEN9_DISABLE_OCL_OOB_SUPPRESS_LOGIC	(1<<5)
+#define   CNL_FAST_ANISO_L1_BANKING_FIX	(1<<4)

Why CNL_ instead of GEN10_ prefix? (out of curiosity)

Quoted 8 lines
drivers/gpu/drm/i915/i915_reg.h +0 -0
  #define   GEN8_SAMPLER_POWER_BYPASS_DIS	(1<<1)
 
  #define GEN9_HALF_SLICE_CHICKEN7	_MMIO(0xe194)
drivers/gpu/drm/i915/intel_engine_cs.c +0 -0
index a6ac9d0a4156..4b9b7828802d 100644

drivers/gpu/drm/i915/intel_engine_cs.c static int cnl_init_workarounds(struct intel_engine_cs *engine) · line 1095

Quoted 6 lines
drivers/gpu/drm/i915/intel_engine_cs.c +3 -0
@@ -1090,6 +1090,9 @@ static int cnl_init_workarounds(struct intel_engine_cs *engine)
  	/* WaPushConstantDereferenceHoldDisable:cnl */
  	WA_SET_BIT(GEN7_ROW_CHICKEN2, PUSH_CONSTANT_DEREF_DISABLE);
 
+	/* FtrEnableFastAnisoL1BankingFix: cnl */
+	WA_SET_BIT_MASKED(HALF_SLICE_CHICKEN3, CNL_FAST_ANISO_L1_BANKING_FIX);
+

I have this only for B0 onwards, but I guess you glossed over this because you know more than me about which CNL stepping is the production one, so:

drivers/gpu/drm/i915/intel_engine_cs.c static int cnl_init_workarounds(struct intel_engine_cs *engine) · line 1098

Quoted 3 lines
drivers/gpu/drm/i915/intel_engine_cs.c +0 -0
  	/* WaEnablePreemptionGranularityControlByUMD:cnl */
  	ret= wa_ring_whitelist_reg(engine, GEN8_CS_CHICKEN1);
  	if (ret)

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

author maintainer
#6 lore raw
Quoted 15 lines · Oscar Mateo
Quoted 13 lines · Rodrigo Vivi

WA to enable HW L1 Banking fix that allows aniso to operate at full sample rate.

Cc Mika Kuoppala <[email protected]>
Cc Oscar Mateo <[email protected]>
Cc Ben Widawsky <[email protected]>
Cc Anuj Phogat <[email protected]>
---
  drivers/gpu/drm/i915/i915_reg.h        | 1 +
  drivers/gpu/drm/i915/intel_engine_cs.c | 3 +++
  2 files changed, 4 insertions(+)
Quoted 11 lines

drivers/gpu/drm/i915/i915_reg.h enum { · line 8075

Quoted 9 lines
drivers/gpu/drm/i915/i915_reg.h +1 -0
index e2908ae34004..1ad22a824921 100644
@@ -8072,6 +8072,7 @@ enum {
  #define   HSW_SAMPLE_C_PERFORMANCE	(1<<9)
  #define   GEN8_CENTROID_PIXEL_OPT_DIS	(1<<8)
  #define   GEN9_DISABLE_OCL_OOB_SUPPRESS_LOGIC	(1<<5)
+#define   CNL_FAST_ANISO_L1_BANKING_FIX	(1<<4)

Why CNL_ instead of GEN10_ prefix? (out of curiosity)

hmm... I guess I should have used gen10 for compatibility with other bits around this... :/

But I pick CNL instead because it is easier to match the spec that has bit started for CNL as:

GEN:BUG:1937670 [CNL...

if it had started with GEN10:etc I would have picked the GEN10 I guess...

Quoted 12 lines
Quoted 12 lines
drivers/gpu/drm/i915/i915_reg.h +0 -0
  #define   GEN8_SAMPLER_POWER_BYPASS_DIS	(1<<1)
 
  #define GEN9_HALF_SLICE_CHICKEN7	_MMIO(0xe194)
drivers/gpu/drm/i915/intel_engine_cs.c +0 -0
index a6ac9d0a4156..4b9b7828802d 100644
@@ -1090,6 +1090,9 @@ static int cnl_init_workarounds(struct intel_engine_cs *engine)
  	/* WaPushConstantDereferenceHoldDisable:cnl */
  	WA_SET_BIT(GEN7_ROW_CHICKEN2, PUSH_CONSTANT_DEREF_DISABLE);
 
Quoted 7 lines

drivers/gpu/drm/i915/intel_engine_cs.c static int cnl_init_workarounds(struct intel_engine_cs *engine) · line 1095

Quoted 3 lines
drivers/gpu/drm/i915/intel_engine_cs.c +3 -0
+	/* FtrEnableFastAnisoL1BankingFix: cnl */
+	WA_SET_BIT_MASKED(HALF_SLICE_CHICKEN3, CNL_FAST_ANISO_L1_BANKING_FIX);
+

I have this only for B0 onwards, but I guess you glossed over this because you know more than me about which CNL stepping is the production one, so:

yeap, we don't have A0 available anyways...
And with no A0 related wa implemented, so our support is B0+...

Quoted 1 line

Thanks, although it is merged already...

Quoted 5 lines

drivers/gpu/drm/i915/intel_engine_cs.c static int cnl_init_workarounds(struct intel_engine_cs *engine) · line 1098

Quoted 4 lines
drivers/gpu/drm/i915/intel_engine_cs.c +0 -0
  	/* WaEnablePreemptionGranularityControlByUMD:cnl */
  	ret= wa_ring_whitelist_reg(engine, GEN8_CS_CHICKEN1);
  	if (ret)

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