drm/i915/chv: Add additional workarounds for CHV
Subsystems (2)
PATCH 1/1 drm/i915/chv: Add additional workarounds for CHV
These w/a were recently identified while debugging another issue, +WaClearFlowControlGpgpuContextSave:chv +Wa4x4STCOptimizationDisable:chv
For: VIZ-4090
--- drivers/gpu/drm/i915/i915_reg.h | 1 + drivers/gpu/drm/i915/intel_ringbuffer.c | 5 +++++ 2 files changed, 6 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +1 -0
@@ -6131,6 +6131,7 @@ enum punit_power_well {#define GEN9_DG_MIRROR_FIX_ENABLE (1<<5)#define GEN8_ROW_CHICKEN 0xe4f0 +#define FLOW_CONTROL_ENABLE (1<<15)#define PARTIAL_INSTRUCTION_SHOOTDOWN_DISABLE (1<<8)#define STALL_DOP_GATING_DISABLE (1<<5)
drivers/gpu/drm/i915/intel_ringbuffer.c +5 -0
@@ -796,8 +796,10 @@ static int chv_init_workarounds(struct intel_engine_cs *ring)/* WaDisablePartialInstShootdown:chv */ /* WaDisableThreadStallDopClockGating:chv */ +/* WaClearFlowControlGpgpuContextSave:chv */ WA_SET_BIT_MASKED (GEN8_ROW_CHICKEN ,PARTIAL_INSTRUCTION_SHOOTDOWN_DISABLE | +FLOW_CONTROL_ENABLE |STALL_DOP_GATING_DISABLE );/* Use Force Non-Coherent whenever executing a 3D context. This is a
@@ -810,6 +812,9 @@ static int chv_init_workarounds(struct intel_engine_cs *ring)HDC_FORCE_NON_COHERENT | HDC_DONOT_FETCH_MEM_WHEN_MASKED); +/* Wa4x4STCOptimizationDisable:chv */ +WA_SET_BIT_MASKED (CACHE_MODE_1 , GEN8_4x4_STC_OPTIMIZATION_DISABLE); +return 0 ; }
Signature · 6 lines
2.1.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 29 lines · Arun Siluvery
These w/a were recently identified while debugging another issue,
(quoted diff) +2
-0+WaClearFlowControlGpgpuContextSave:chv +Wa4x4STCOptimizationDisable:chvFor: VIZ-4090
Change-Id I08d2176dec609396c3a7c2e48b2413e233799fc4Signed-off-by Arun Siluvery <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 1 + drivers/gpu/drm/i915/intel_ringbuffer.c | 5 +++++ 2 files changed, 6 insertions(+)drivers/gpu/drm/i915/i915_reg.h +1
-0@@ -6131,6 +6131,7 @@ enum punit_power_well {#define GEN9_DG_MIRROR_FIX_ENABLE (1<<5)#define GEN8_ROW_CHICKEN 0xe4f0 +#define FLOW_CONTROL_ENABLE (1<<15)#define PARTIAL_INSTRUCTION_SHOOTDOWN_DISABLE (1<<8)#define STALL_DOP_GATING_DISABLE (1<<5)drivers/gpu/drm/i915/intel_ringbuffer.c +0
-0
drivers/gpu/drm/i915/intel_ringbuffer.c static int chv_init_workarounds(struct intel_engine_cs *ring) · line 802
Quoted 7 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +2
-0@@ -796,8 +796,10 @@ static int chv_init_workarounds(struct intel_engine_cs *ring)/* WaDisablePartialInstShootdown:chv */ /* WaDisableThreadStallDopClockGating:chv */ +/* WaClearFlowControlGpgpuContextSave:chv */ WA_SET_BIT_MASKED(GEN8_ROW_CHICKEN, PARTIAL_INSTRUCTION_SHOOTDOWN_DISABLE | + FLOW_CONTROL_ENABLE |
This seems to be the default value already. I suppose there's no real harm in setting it though, but then we should also do the same for BDW.
Would be nice if we actually did a GPU reset on driver load to guarantee a more consistent initial state...
Quoted 20 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +3
-0STALL_DOP_GATING_DISABLE);/* Use Force Non-Coherent whenever executing a 3D context. This is a @@ -810,6 +812,9 @@ static int chv_init_workarounds(struct intel_engine_cs *ring)HDC_FORCE_NON_COHERENT | HDC_DONOT_FETCH_MEM_WHEN_MASKED); +/* Wa4x4STCOptimizationDisable:chv */ +WA_SET_BIT_MASKED (CACHE_MODE_1 , GEN8_4x4_STC_OPTIMIZATION_DISABLE); +return 0 ; }Signature · 6 lines
2.1.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 41 lines · Ville Syrjälä
Quoted 29 lines · Arun Siluvery
These w/a were recently identified while debugging another issue,
(quoted diff) +2
-0+WaClearFlowControlGpgpuContextSave:chv +Wa4x4STCOptimizationDisable:chvFor: VIZ-4090
Change-Id I08d2176dec609396c3a7c2e48b2413e233799fc4Signed-off-by Arun Siluvery <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 1 + drivers/gpu/drm/i915/intel_ringbuffer.c | 5 +++++ 2 files changed, 6 insertions(+)drivers/gpu/drm/i915/i915_reg.h +1
-0@@ -6131,6 +6131,7 @@ enum punit_power_well {#define GEN9_DG_MIRROR_FIX_ENABLE (1<<5)#define GEN8_ROW_CHICKEN 0xe4f0 +#define FLOW_CONTROL_ENABLE (1<<15)#define PARTIAL_INSTRUCTION_SHOOTDOWN_DISABLE (1<<8)#define STALL_DOP_GATING_DISABLE (1<<5)drivers/gpu/drm/i915/intel_ringbuffer.c +0
-0drivers/gpu/drm/i915/intel_ringbuffer.c static int chv_init_workarounds(struct intel_engine_cs *ring) · line 802
Quoted 7 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +2
-0@@ -796,8 +796,10 @@ static int chv_init_workarounds(struct intel_engine_cs *ring)/* WaDisablePartialInstShootdown:chv */ /* WaDisableThreadStallDopClockGating:chv */ +/* WaClearFlowControlGpgpuContextSave:chv */ WA_SET_BIT_MASKED(GEN8_ROW_CHICKEN, PARTIAL_INSTRUCTION_SHOOTDOWN_DISABLE | + FLOW_CONTROL_ENABLE |This seems to be the default value already. I suppose there's no real harm in setting it though, but then we should also do the same for BDW.
Quoted 2 lines
Would be nice if we actually did a GPU reset on driver load to guarantee a more consistent initial state...
We have some half-baked testcase to compare the different wa registers states after driver load, reset and suspend/resume. But that's not yet been fixed up to also take all the static wa settings into account.
Would be awesome if that would finally happen.
/me dreaming ;-)
Cheers, Daniel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
-------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
PNV 364/364 364/364
ILK -2 366/366 364/366
SNB 450/450 450/450 IVB +16 481/498 497/498 BYT 289/289 289/289 HSW 564/564 564/564 BDW 417/417 417/417 -------------------------------------Detailed------------------------------------- Platform Test drm-intel-nightly Series Applied *ILK igt_kms_flip_rcs-wf_vblank-vs-dpms-interruptible PASS(2, M37M26) DMESG_WARN(1, M26) *ILK igt_kms_flip_bcs-flip-vs-modeset-interruptible PASS(3, M37M26) DMESG_WARN(1, M26) IVB igt_kms_3d DMESG_WARN(1, M34)PASS(10, M4M34M21) PASS(1, M21) IVB igt_kms_cursor_crc_cursor-128x128-onscreen NSPT(1, M34)PASS(10, M4M34M21) PASS(1, M21) IVB igt_kms_cursor_crc_cursor-128x128-random NSPT(1, M34)PASS(10, M4M34M21) PASS(1, M21) IVB igt_kms_cursor_crc_cursor-128x128-sliding NSPT(1, M34)PASS(10, M4M34M21) PASS(1, M21) IVB igt_kms_cursor_crc_cursor-256x256-offscreen NSPT(1, M34)PASS(10, M4M34M21) PASS(1, M21) IVB igt_kms_cursor_crc_cursor-256x256-onscreen NSPT(1, M34)PASS(10, M4M34M21) PASS(1, M21) IVB igt_kms_cursor_crc_cursor-256x256-sliding NSPT(1, M34)PASS(10, M4M34M21) PASS(1, M21) IVB igt_kms_cursor_crc_cursor-64x64-offscreen NSPT(1, M34)PASS(10, M4M34M21) PASS(1, M21) IVB igt_kms_cursor_crc_cursor-64x64-onscreen NSPT(1, M34)PASS(10, M4M34M21) PASS(1, M21) *IVB igt_kms_cursor_crc_cursor-64x64-random NSPT(1, M34)PASS(10, M4M34M21) DMESG_WARN(1, M21) IVB igt_kms_cursor_crc_cursor-64x64-sliding NSPT(1, M34)PASS(10, M4M34M21) PASS(1, M21) IVB igt_kms_cursor_crc_cursor-size-change NSPT(1, M34)PASS(10, M4M34M21) PASS(1, M21) IVB igt_kms_fence_pin_leak NSPT(1, M34)PASS(10, M4M34M21) PASS(1, M21) IVB igt_kms_mmio_vs_cs_flip_setcrtc_vs_cs_flip NSPT(1, M34)PASS(10, M4M34M21) PASS(1, M21) IVB igt_kms_mmio_vs_cs_flip_setplane_vs_cs_flip NSPT(1, M34)PASS(10, M4M34M21) PASS(1, M21) IVB igt_kms_rotation_crc_primary-rotation NSPT(1, M34)PASS(10, M4M34M21) PASS(1, M21) IVB igt_kms_rotation_crc_sprite-rotation NSPT(1, M34)PASS(10, M4M34M21) PASS(1, M21)
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list [email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx