drm/i915/glk: Apply WaProgramL3SqcReg1DefaultForPerf for GLK too
Subsystems (2)
PATCH v4 1/1 drm/i915/glk: Apply WaProgramL3SqcReg1DefaultForPerf for GLK too
Testing the texture read performance shows that the same tuning for the SQ credits is needed on GLK as on BXT/APL. This has been also confirmed by Altug from the HW team.
V4: Rebase + fix
--- drivers/gpu/drm/i915/intel_engine_cs.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/intel_engine_cs.c +9 -7
@@ -1067,6 +1067,15 @@ static int gen9_init_workarounds(struct intel_engine_cs *engine)/* WaDisableSTUnitPowerOptimization:skl,bxt,kbl,glk,cfl */ WA_SET_BIT_MASKED (HALF_SLICE_CHICKEN2 ,GEN8_ST_PO_DISABLE ); +/* WaProgramL3SqcReg1DefaultForPerf:bxt,glk */ +if (IS_GEN9_LP (dev_priv)) { +u32 val =I915_READ (GEN8_L3SQCREG1 ); + + val &= ~L3_PRIO_CREDITS_MASK ; + val |=L3_GENERAL_PRIO_CREDITS (62 ) |L3_HIGH_PRIO_CREDITS (2 ); +I915_WRITE (GEN8_L3SQCREG1 , val); + } +/* WaOCLCoherentLineFlush:skl,bxt,kbl,cfl */ I915_WRITE (GEN8_L3SQCREG4 , (I915_READ (GEN8_L3SQCREG4 ) |GEN8_LQSC_FLUSH_COHERENT_LINES ));
@@ -1184,7 +1193,6 @@ static int skl_init_workarounds(struct intel_engine_cs *engine)static int bxt_init_workarounds (struct intel_engine_cs *engine) {struct drm_i915_private *dev_priv = engine->i915; -u32 val;int ret; ret =gen9_init_workarounds (engine);
@@ -1199,12 +1207,6 @@ static int bxt_init_workarounds(struct intel_engine_cs *engine)I915_WRITE (FF_SLICE_CS_CHICKEN2 ,_MASKED_BIT_ENABLE (GEN9_POOLED_EU_LOAD_BALANCING_FIX_DISABLE )); -/* WaProgramL3SqcReg1DefaultForPerf:bxt */ - val =I915_READ (GEN8_L3SQCREG1 ); - val &= ~L3_PRIO_CREDITS_MASK ; - val |=L3_GENERAL_PRIO_CREDITS (62 ) |L3_HIGH_PRIO_CREDITS (2 ); -I915_WRITE (GEN8_L3SQCREG1 , val); -/* WaToEnableHwFixForPushConstHWBug:bxt */ 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✓ Fi.CI.BAT: success for drm/i915/glk: Apply WaProgramL3SqcReg1DefaultForPerf for GLK too (rev4)
== Series Details ==
== Series Details ==
Series: drm/i915/glk: Apply WaProgramL3SqcReg1DefaultForPerf for GLK too (rev4)
URL : https://patchwork.freedesktop.org/series/33772/
State : success
== Summary ==
Series 33772v4 drm/i915/glk: Apply WaProgramL3SqcReg1DefaultForPerf for GLK too
https://patchwork.freedesktop.org/api/1.0/series/33772/revisions/4/mbox/
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-b:
pass -> INCOMPLETE (fi-snb-2520m) fdo#103713fdo#103713 https://bugs.freedesktop.org/show_bug.cgi?id=103713
fi-bdw-5557u total:288 pass:267 dwarn:0 dfail:0 fail:0 skip:21 time:436s fi-bdw-gvtdvm total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:444s fi-blb-e6850 total:288 pass:223 dwarn:1 dfail:0 fail:0 skip:64 time:385s fi-bsw-n3050 total:288 pass:242 dwarn:0 dfail:0 fail:0 skip:46 time:523s fi-bwr-2160 total:288 pass:183 dwarn:0 dfail:0 fail:0 skip:105 time:279s fi-bxt-dsi total:288 pass:258 dwarn:0 dfail:0 fail:0 skip:30 time:500s fi-bxt-j4205 total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:505s fi-byt-j1900 total:288 pass:253 dwarn:0 dfail:0 fail:0 skip:35 time:480s fi-byt-n2820 total:288 pass:249 dwarn:0 dfail:0 fail:0 skip:39 time:467s fi-elk-e7500 total:288 pass:229 dwarn:0 dfail:0 fail:0 skip:59 time:424s fi-gdg-551 total:288 pass:178 dwarn:1 dfail:0 fail:1 skip:108 time:268s fi-glk-1 total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:541s fi-hsw-4770 total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:421s fi-hsw-4770r total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:430s fi-ilk-650 total:288 pass:228 dwarn:0 dfail:0 fail:0 skip:60 time:379s fi-ivb-3520m total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:481s fi-ivb-3770 total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:454s fi-kbl-7500u total:288 pass:263 dwarn:1 dfail:0 fail:0 skip:24 time:481s fi-kbl-7560u total:288 pass:269 dwarn:0 dfail:0 fail:0 skip:19 time:533s fi-kbl-7567u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:477s fi-kbl-r total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:526s fi-pnv-d510 total:288 pass:222 dwarn:1 dfail:0 fail:0 skip:65 time:584s fi-skl-6260u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:452s fi-skl-6600u total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:541s fi-skl-6700hq total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:563s fi-skl-6700k total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:517s fi-skl-6770hq total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:507s fi-skl-gvtdvm total:288 pass:265 dwarn:0 dfail:0 fail:0 skip:23 time:449s fi-snb-2520m total:245 pass:211 dwarn:0 dfail:0 fail:0 skip:33 fi-snb-2600 total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:410s Blacklisted hosts: fi-cfl-s2 total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:602s fi-cnl-y total:288 pass:260 dwarn:0 dfail:0 fail:1 skip:27 time:556s fi-glk-dsi total:288 pass:258 dwarn:0 dfail:0 fail:0 skip:30 time:484s
73f135dccc60c8fa6e2a200286b00877209a9c29 drm-tip: 2017y-11m-28d-14h-52m-10s UTC integration manifest 94e6178bb669 drm/i915/glk: Apply WaProgramL3SqcReg1DefaultForPerf for GLK too
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7324/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for drm/i915/glk: Apply WaProgramL3SqcReg1DefaultForPerf for GLK too (rev4)
In reply to Valtteri Rantala== Series Details ==
== Series Details ==
Series: drm/i915/glk: Apply WaProgramL3SqcReg1DefaultForPerf for GLK too (rev4)
URL : https://patchwork.freedesktop.org/series/33772/
State : success
== Summary ==
Blacklisted hosts:
shard-hsw total:2626 pass:1506 dwarn:11 dfail:0 fail:11 skip:1097 time:9023s shard-snb total:2520 pass:1218 dwarn:13 dfail:6 fail:7 skip:1270 time:6556s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7324/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: ✓ Fi.CI.IGT: success for drm/i915/glk: Apply WaProgramL3SqcReg1DefaultForPerf for GLK too (rev4)
Quoted 5 lines · Patchwork
== Series Details ==
Series: drm/i915/glk: Apply WaProgramL3SqcReg1DefaultForPerf for GLK too (rev4)
URL : https://patchwork.freedesktop.org/series/33772/
State : success
Thanks for the patch and reviews, pushed to drm-tip.
For the future please keep the whole revision history in the commit log and any Cc: lines and earlier r-bs with version tags if needed (unless the patch changed substantially from the reviewed one). Also please use git format-patch --in-reply-to pointing to the previous version when submitting single patches.
Quoted 7 lines
== Summary ==
Blacklisted hosts:
shard-hsw total:2626 pass:1506 dwarn:11 dfail:0 fail:11 skip:1097 time:9023s shard-snb total:2520 pass:1218 dwarn:13 dfail:6 fail:7 skip:1270 time:6556s
Quoted 7 lines
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7324/shards.html
_______________________________________________
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
Quoted 6 lines · Valtteri Rantala
Testing the texture read performance shows that the same tuning for the SQ credits is needed on GLK as on BXT/APL. This has been also confirmed by Altug from the HW team.
V4: Rebase + fix
Signed-off-by Valtteri Rantala <[email protected]>
Quoted 52 lines
--- drivers/gpu/drm/i915/intel_engine_cs.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)drivers/gpu/drm/i915/intel_engine_cs.c +9
-7@@ -1067,6 +1067,15 @@ static int gen9_init_workarounds(struct intel_engine_cs *engine)/* WaDisableSTUnitPowerOptimization:skl,bxt,kbl,glk,cfl */ WA_SET_BIT_MASKED (HALF_SLICE_CHICKEN2 ,GEN8_ST_PO_DISABLE ); +/* WaProgramL3SqcReg1DefaultForPerf:bxt,glk */ +if (IS_GEN9_LP (dev_priv)) { +u32 val =I915_READ (GEN8_L3SQCREG1 ); + + val &= ~L3_PRIO_CREDITS_MASK ; + val |=L3_GENERAL_PRIO_CREDITS (62 ) |L3_HIGH_PRIO_CREDITS (2 ); +I915_WRITE (GEN8_L3SQCREG1 , val); + } +/* WaOCLCoherentLineFlush:skl,bxt,kbl,cfl */ I915_WRITE (GEN8_L3SQCREG4 , (I915_READ (GEN8_L3SQCREG4 ) |GEN8_LQSC_FLUSH_COHERENT_LINES ));@@ -1184,7 +1193,6 @@ static int skl_init_workarounds(struct intel_engine_cs *engine)static int bxt_init_workarounds (struct intel_engine_cs *engine) {struct drm_i915_private *dev_priv = engine->i915; -u32 val;int ret; ret =gen9_init_workarounds (engine);@@ -1199,12 +1207,6 @@ static int bxt_init_workarounds(struct intel_engine_cs *engine)I915_WRITE (FF_SLICE_CS_CHICKEN2 ,_MASKED_BIT_ENABLE (GEN9_POOLED_EU_LOAD_BALANCING_FIX_DISABLE )); -/* WaProgramL3SqcReg1DefaultForPerf:bxt */ - val =I915_READ (GEN8_L3SQCREG1 ); - val &= ~L3_PRIO_CREDITS_MASK ; - val |=L3_GENERAL_PRIO_CREDITS (62 ) |L3_HIGH_PRIO_CREDITS (2 ); -I915_WRITE (GEN8_L3SQCREG1 , val); -/* WaToEnableHwFixForPushConstHWBug:bxt */ 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
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx