drm/i915: fix WaInsertDummyPushConstPs
Subsystems (2)
PATCH 1/1 drm/i915: fix WaInsertDummyPushConstPs
As pointed out by Chris Harris, we are using the wrong WA name, it should in fact be WaToEnableHwFixForPushConstHWBug, also it should be applied from C0 onwards for both BXT and KBL.
--- drivers/gpu/drm/i915/intel_ringbuffer.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/intel_ringbuffer.c +4 -4
@@ -1173,8 +1173,8 @@ static int bxt_init_workarounds(struct intel_engine_cs *engine)I915_WRITE (GEN8_L3SQCREG1 ,L3_GENERAL_PRIO_CREDITS (62 ) |L3_HIGH_PRIO_CREDITS (2 )); -/* WaInsertDummyPushConstPs:bxt */ -if (IS_BXT_REVID (dev_priv,0 ,BXT_REVID_B0 )) +/* WaToEnableHwFixForPushConstHWBug:bxt */ +if (IS_BXT_REVID (dev_priv,BXT_REVID_C0 ,REVID_FOREVER ))WA_SET_BIT_MASKED (COMMON_SLICE_CHICKEN2 ,GEN8_SBE_DISABLE_REPLAY_BUF_OPTIMIZATION );
@@ -1217,8 +1217,8 @@ static int kbl_init_workarounds(struct intel_engine_cs *engine)I915_WRITE (GEN8_L3SQCREG4 ,I915_READ (GEN8_L3SQCREG4 ) |GEN8_LQSC_RO_PERF_DIS ); -/* WaInsertDummyPushConstPs:kbl */ -if (IS_KBL_REVID (dev_priv,0 ,KBL_REVID_B0 )) +/* WaToEnableHwFixForPushConstHWBug:kbl */ +if (IS_KBL_REVID (dev_priv,KBL_REVID_C0 ,REVID_FOREVER ))WA_SET_BIT_MASKED (COMMON_SLICE_CHICKEN2 ,GEN8_SBE_DISABLE_REPLAY_BUF_OPTIMIZATION );
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Ro.CI.BAT: failure for drm/i915: fix WaInsertDummyPushConstPs
== Series Details ==
== Series Details ==
Series: drm/i915: fix WaInsertDummyPushConstPs
URL : https://patchwork.freedesktop.org/series/10492/
State : failure
== Summary ==
Series 10492v1 drm/i915: fix WaInsertDummyPushConstPs
http://patchwork.freedesktop.org/api/1.0/series/10492/revisions/1/mbox
Test kms_cursor_legacy:
Subgroup basic-cursor-vs-flip-legacy:
fail -> PASS (ro-ilk1-i5-650)
Subgroup basic-flip-vs-cursor-legacy:
fail -> PASS (fi-hsw-i7-4770k)
fail -> PASS (fi-skl-i7-6700k)
pass -> FAIL (ro-snb-i7-2620M)
pass -> FAIL (ro-bdw-i5-5250u)
Subgroup basic-flip-vs-cursor-varying-size:
fail -> PASS (ro-hsw-i7-4770r)
fail -> PASS (ro-bdw-i5-5250u)
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-a:
pass -> DMESG-WARN (ro-bdw-i7-5557U)fi-hsw-i7-4770k total:240 pass:218 dwarn:0 dfail:0 fail:0 skip:22 fi-kbl-qkkr total:240 pass:182 dwarn:29 dfail:0 fail:3 skip:26 fi-skl-i5-6260u total:240 pass:224 dwarn:0 dfail:0 fail:2 skip:14 fi-skl-i7-6700k total:240 pass:209 dwarn:0 dfail:0 fail:3 skip:28 fi-snb-i7-2600 total:240 pass:198 dwarn:0 dfail:0 fail:0 skip:42 ro-bdw-i5-5250u total:240 pass:219 dwarn:4 dfail:0 fail:1 skip:16 ro-bdw-i7-5557U total:240 pass:223 dwarn:1 dfail:0 fail:0 skip:16 ro-bdw-i7-5600u total:240 pass:207 dwarn:0 dfail:0 fail:1 skip:32 ro-bsw-n3050 total:240 pass:194 dwarn:0 dfail:0 fail:4 skip:42 ro-byt-n2820 total:240 pass:197 dwarn:0 dfail:0 fail:3 skip:40 ro-hsw-i3-4010u total:240 pass:214 dwarn:0 dfail:0 fail:0 skip:26 ro-hsw-i7-4770r total:240 pass:214 dwarn:0 dfail:0 fail:0 skip:26 ro-ilk-i7-620lm total:240 pass:172 dwarn:1 dfail:0 fail:2 skip:65 ro-ilk1-i5-650 total:235 pass:174 dwarn:0 dfail:0 fail:1 skip:60 ro-ivb-i7-3770 total:240 pass:205 dwarn:0 dfail:0 fail:0 skip:35 ro-ivb2-i7-3770 total:240 pass:209 dwarn:0 dfail:0 fail:0 skip:31 ro-skl3-i5-6260u total:240 pass:222 dwarn:0 dfail:0 fail:4 skip:14 ro-snb-i7-2620M total:240 pass:197 dwarn:0 dfail:0 fail:2 skip:41
Results at /archive/results/CI_IGT_test/RO_Patchwork_1664/
6f87e85 drm-intel-nightly: 2016y-08m-01d-14h-53m-17s UTC integration manifest f78fc40 drm/i915: fix WaInsertDummyPushConstPs
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 31 lines · Matthew Auld
As pointed out by Chris Harris, we are using the wrong WA name, it should in fact be WaToEnableHwFixForPushConstHWBug, also it should be applied from C0 onwards for both BXT and KBL.
Fixes 7b9005cd45f3 ("drm/i915: Add WaInsertDummyPushConstP for bxt and kbl")Cc Chris Harris <[email protected]>Cc Mika Kuoppala <[email protected]>Reported-by Chris Harris <[email protected]>Signed-off-by Matthew Auld <[email protected]>--- drivers/gpu/drm/i915/intel_ringbuffer.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)drivers/gpu/drm/i915/intel_ringbuffer.c +2
-2@@ -1173,8 +1173,8 @@ static int bxt_init_workarounds(struct intel_engine_cs *engine)I915_WRITE (GEN8_L3SQCREG1 ,L3_GENERAL_PRIO_CREDITS (62 ) |L3_HIGH_PRIO_CREDITS (2 )); -/* WaInsertDummyPushConstPs:bxt */ -if (IS_BXT_REVID (dev_priv,0 ,BXT_REVID_B0 )) +/* WaToEnableHwFixForPushConstHWBug:bxt */ +if (IS_BXT_REVID (dev_priv,BXT_REVID_C0 ,REVID_FOREVER ))WA_SET_BIT_MASKED (COMMON_SLICE_CHICKEN2 ,GEN8_SBE_DISABLE_REPLAY_BUF_OPTIMIZATION );
drivers/gpu/drm/i915/intel_ringbuffer.c static int kbl_init_workarounds(struct intel_engine_cs *engine) · line 1224
Quoted 10 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +2
-2@@ -1217,8 +1217,8 @@ static int kbl_init_workarounds(struct intel_engine_cs *engine)I915_WRITE (GEN8_L3SQCREG4 ,I915_READ (GEN8_L3SQCREG4 ) |GEN8_LQSC_RO_PERF_DIS ); -/* WaInsertDummyPushConstPs:kbl */ -if (IS_KBL_REVID (dev_priv,0 ,KBL_REVID_B0 )) +/* WaToEnableHwFixForPushConstHWBug:kbl */ +if (IS_KBL_REVID (dev_priv,KBL_REVID_C0 ,REVID_FOREVER ))WA_SET_BIT_MASKED (COMMON_SLICE_CHICKEN2 ,GEN8_SBE_DISABLE_REPLAY_BUF_OPTIMIZATION );
regards
Arun
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: ✗ Ro.CI.BAT: failure for drm/i915: fix WaInsertDummyPushConstPs
In reply to PatchworkQuoted 6 lines
Test
kms_cursor_legacy:Subgroup basic-cursor-vs-flip-legacy: fail -> PASS (ro-ilk1-i5-650) Subgroup basic-flip-vs-cursor-legacy: pass -> FAIL (ro-snb-i7-2620M) pass -> FAIL (ro-bdw-i5-5250u)
https://bugs.freedesktop.org/show_bug.cgi?id=97188
Quoted 3 lines
Test
kms_pipe_crc_basic:Subgroup suspend-read-crc-pipe-a: pass -> DMESG-WARN (ro-bdw-i7-5557U)
https://bugs.freedesktop.org/show_bug.cgi?id=96913
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Joonas Lahtinen
maintainerRe: ✗ Ro.CI.BAT: failure for drm/i915: fix WaInsertDummyPushConstPs
Quoted 7 lines · Matthew Auld
Quoted 7 lines
Test
kms_cursor_legacy:
Subgroup basic-cursor-vs-flip-legacy:
fail -> PASS (ro-ilk1-i5-650) Subgroup basic-flip-vs-cursor-legacy:
pass -> FAIL (ro-snb-i7-2620M) pass -> FAIL (ro-bdw-i5-5250u)
Quoted 7 lines
https://bugs.freedesktop.org/show_bug.cgi?id=97188
Quoted 4 lines
Test
kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-a:
pass -> DMESG-WARN (ro-bdw-i7-5557U)
Patch merged, thanks for the patch and review.
Regards, Joonas
Signature · 7 lines
Joonas Lahtinen Open Source Technology Center Intel Corporation _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx