drm/i915/glk: Apply WaProgramL3SqcReg1DefaultForPerf for GLK too
Subsystems (2)
PATCH v3 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.
V3: Rebase + fix
--- drivers/gpu/drm/i915/intel_engine_cs.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/intel_engine_cs.c +9 -6
@@ -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 ));
@@ -1199,12 +1208,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: failure for drm/i915/glk: Apply WaProgramL3SqcReg1DefaultForPerf for GLK too (rev3)
== Series Details ==
== Series Details ==
Series: drm/i915/glk: Apply WaProgramL3SqcReg1DefaultForPerf for GLK too (rev3)
URL : https://patchwork.freedesktop.org/series/33772/
State : failure
== Summary ==
CHK include/config/kernel.release
CHK include/generated/uapi/linux/version.h
CHK include/generated/utsrelease.h
CHK include/generated/bounds.h
CHK include/generated/timeconst.h
CHK include/generated/asm-offsets.h
CALL scripts/checksyscalls.sh
DESCEND objtool
CHK scripts/mod/devicetable-offsets.h
CHK include/generated/compile.h
CHK kernel/config_data.h
CC [M] drivers/gpu/drm/i915/intel_engine_cs.o
drivers/gpu/drm/i915/intel_engine_cs.c: In function ‘bxt_init_workarounds’:
drivers/gpu/drm/i915/intel_engine_cs.c:1196:6: error: unused variable ‘val’ [-Werror=unused-variable]
u32 val;
^~~cc1: all warnings being treated as errorsscripts/Makefile.build:314: recipe for target 'drivers/gpu/drm/i915/intel_engine_cs.o' failed make[4]: *** [drivers/gpu/drm/i915/intel_engine_cs.o] Error 1 scripts/Makefile.build:573: recipe for target 'drivers/gpu/drm/i915' failed make[3]: *** [drivers/gpu/drm/i915] Error 2scripts/Makefile.build:573: recipe for target 'drivers/gpu/drm' failed make[2]: *** [drivers/gpu/drm] Error 2scripts/Makefile.build:573: recipe for target 'drivers/gpu' failed
make[1]: *** [drivers/gpu] Error 2
Makefile:1024: recipe for target 'drivers' failed
make: *** [drivers] Error 2
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Rodrigo Vivi
maintainerRe: ✗ Fi.CI.BAT: failure for drm/i915/glk: Apply WaProgramL3SqcReg1DefaultForPerf for GLK too (rev3)
Quoted 20 lines · Patchwork
== Series Details ==
Series: drm/i915/glk: Apply WaProgramL3SqcReg1DefaultForPerf for GLK too (rev3)
URL : https://patchwork.freedesktop.org/series/33772/
State : failure== Summary ==
CHK include/config/kernel.release CHK include/generated/uapi/linux/version.h CHK include/generated/utsrelease.h CHK include/generated/bounds.h CHK include/generated/timeconst.h CHK include/generated/asm-offsets.h CALL scripts/checksyscalls.sh DESCEND objtool CHK scripts/mod/devicetable-offsets.h CHK include/generated/compile.h CHK kernel/config_data.h CC [M] drivers/gpu/drm/i915/intel_engine_cs.o
Quoted 3 lines
drivers/gpu/drm/i915/intel_engine_cs.c: In function ‘bxt_init_workarounds’:drivers/gpu/drm/i915/intel_engine_cs.c:1196:6: error: unused variable ‘val’ [-Werror=unused-variable]
u32 val;
ops... rv-b after removing "val"...
Quoted 13 lines
^~~cc1: all warnings being treated as errors
scripts/Makefile.build:314: recipe for target 'drivers/gpu/drm/i915/intel_engine_cs.o' failed make[4]: *** [drivers/gpu/drm/i915/intel_engine_cs.o] Error 1scripts/Makefile.build:573: recipe for target 'drivers/gpu/drm/i915' failed make[3]: *** [drivers/gpu/drm/i915] Error 2scripts/Makefile.build:573: recipe for target 'drivers/gpu/drm' failed make[2]: *** [drivers/gpu/drm] Error 2scripts/Makefile.build:573: recipe for target 'drivers/gpu' failed
make[1]: *** [drivers/gpu] Error 2
Makefile:1024: recipe for target 'drivers' failed
make: *** [drivers] Error 2
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
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.
V3: Rebase + fix
Signed-off-by Valtteri Rantala <[email protected]>
It also matches wa_database, so:
Quoted 44 lines
--- drivers/gpu/drm/i915/intel_engine_cs.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)drivers/gpu/drm/i915/intel_engine_cs.c +9
-6@@ -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 ));@@ -1199,12 +1208,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