mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-05 18:14:07 +08:00
drm/i915/gt: Rearrange ivb workarounds
Some rcs0 workarounds were being incorrectly applied to the GT, and so we failed to restore the expected register settings after a reset. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20210113225144.30810-2-chris@chris-wilson.co.uk
This commit is contained in:
parent
ca85e21846
commit
140e2b0b6b
@ -829,18 +829,6 @@ snb_gt_workarounds_init(struct drm_i915_private *i915, struct i915_wa_list *wal)
|
||||
static void
|
||||
ivb_gt_workarounds_init(struct drm_i915_private *i915, struct i915_wa_list *wal)
|
||||
{
|
||||
/* WaDisableEarlyCull:ivb */
|
||||
wa_masked_en(wal, _3D_CHICKEN3, _3D_CHICKEN_SF_DISABLE_OBJEND_CULL);
|
||||
|
||||
/* WaDisablePSDDualDispatchEnable:ivb */
|
||||
if (IS_IVB_GT1(i915))
|
||||
wa_masked_en(wal,
|
||||
GEN7_HALF_SLICE_CHICKEN1,
|
||||
GEN7_PSD_SINGLE_PORT_DISPATCH_ENABLE);
|
||||
|
||||
/* WaDisable_RenderCache_OperationalFlush:ivb */
|
||||
wa_masked_dis(wal, CACHE_MODE_0_GEN7, RC_OP_FLUSH_ENABLE);
|
||||
|
||||
/* Apply the WaDisableRHWOOptimizationForRenderHang:ivb workaround. */
|
||||
wa_masked_dis(wal,
|
||||
GEN7_COMMON_SLICE_CHICKEN1,
|
||||
@ -852,38 +840,6 @@ ivb_gt_workarounds_init(struct drm_i915_private *i915, struct i915_wa_list *wal)
|
||||
|
||||
/* WaForceL3Serialization:ivb */
|
||||
wa_write_clr(wal, GEN7_L3SQCREG4, L3SQ_URB_READ_CAM_MATCH_DISABLE);
|
||||
|
||||
/*
|
||||
* WaVSThreadDispatchOverride:ivb,vlv
|
||||
*
|
||||
* This actually overrides the dispatch
|
||||
* mode for all thread types.
|
||||
*/
|
||||
wa_write_clr_set(wal, GEN7_FF_THREAD_MODE,
|
||||
GEN7_FF_SCHED_MASK,
|
||||
GEN7_FF_TS_SCHED_HW |
|
||||
GEN7_FF_VS_SCHED_HW |
|
||||
GEN7_FF_DS_SCHED_HW);
|
||||
|
||||
if (0) { /* causes HiZ corruption on ivb:gt1 */
|
||||
/* enable HiZ Raw Stall Optimization */
|
||||
wa_masked_dis(wal, CACHE_MODE_0_GEN7, HIZ_RAW_STALL_OPT_DISABLE);
|
||||
}
|
||||
|
||||
/* WaDisable4x2SubspanOptimization:ivb */
|
||||
wa_masked_en(wal, CACHE_MODE_1, PIXEL_SUBSPAN_COLLECT_OPT_DISABLE);
|
||||
|
||||
/*
|
||||
* BSpec recommends 8x4 when MSAA is used,
|
||||
* however in practice 16x4 seems fastest.
|
||||
*
|
||||
* Note that PS/WM thread counts depend on the WIZ hashing
|
||||
* disable bit, which we don't touch here, but it's good
|
||||
* to keep in mind (see 3DSTATE_PS and 3DSTATE_WM).
|
||||
*/
|
||||
wa_add(wal, GEN7_GT_MODE, 0,
|
||||
_MASKED_FIELD(GEN6_WIZ_HASHING_MASK, GEN6_WIZ_HASHING_16x4),
|
||||
GEN6_WIZ_HASHING_16x4);
|
||||
}
|
||||
|
||||
static void
|
||||
@ -1887,26 +1843,11 @@ rcs_engine_wa_init(struct intel_engine_cs *engine, struct i915_wa_list *wal)
|
||||
|
||||
wa_masked_dis(wal,
|
||||
CACHE_MODE_0_GEN7,
|
||||
/* WaDisable_RenderCache_OperationalFlush:hsw */
|
||||
RC_OP_FLUSH_ENABLE |
|
||||
/* enable HiZ Raw Stall Optimization */
|
||||
HIZ_RAW_STALL_OPT_DISABLE);
|
||||
|
||||
/* WaDisable4x2SubspanOptimization:hsw */
|
||||
wa_masked_en(wal, CACHE_MODE_1, PIXEL_SUBSPAN_COLLECT_OPT_DISABLE);
|
||||
|
||||
/*
|
||||
* BSpec recommends 8x4 when MSAA is used,
|
||||
* however in practice 16x4 seems fastest.
|
||||
*
|
||||
* Note that PS/WM thread counts depend on the WIZ hashing
|
||||
* disable bit, which we don't touch here, but it's good
|
||||
* to keep in mind (see 3DSTATE_PS and 3DSTATE_WM).
|
||||
*/
|
||||
wa_add(wal, GEN7_GT_MODE, 0,
|
||||
_MASKED_FIELD(GEN6_WIZ_HASHING_MASK,
|
||||
GEN6_WIZ_HASHING_16x4),
|
||||
GEN6_WIZ_HASHING_16x4);
|
||||
}
|
||||
|
||||
if (IS_VALLEYVIEW(i915)) {
|
||||
@ -1928,11 +1869,59 @@ rcs_engine_wa_init(struct intel_engine_cs *engine, struct i915_wa_list *wal)
|
||||
GEN7_FF_VS_SCHED_HW |
|
||||
GEN7_FF_DS_SCHED_HW);
|
||||
|
||||
/* WaDisable_RenderCache_OperationalFlush:vlv */
|
||||
/* WaPsdDispatchEnable:vlv */
|
||||
/* WaDisablePSDDualDispatchEnable:vlv */
|
||||
wa_masked_en(wal,
|
||||
GEN7_HALF_SLICE_CHICKEN1,
|
||||
GEN7_MAX_PS_THREAD_DEP |
|
||||
GEN7_PSD_SINGLE_PORT_DISPATCH_ENABLE);
|
||||
}
|
||||
|
||||
if (IS_IVYBRIDGE(i915)) {
|
||||
/* WaDisableEarlyCull:ivb */
|
||||
wa_masked_en(wal,
|
||||
_3D_CHICKEN3,
|
||||
_3D_CHICKEN_SF_DISABLE_OBJEND_CULL);
|
||||
|
||||
if (0) { /* causes HiZ corruption on ivb:gt1 */
|
||||
/* enable HiZ Raw Stall Optimization */
|
||||
wa_masked_dis(wal,
|
||||
CACHE_MODE_0_GEN7,
|
||||
HIZ_RAW_STALL_OPT_DISABLE);
|
||||
}
|
||||
|
||||
/*
|
||||
* WaVSThreadDispatchOverride:ivb,vlv
|
||||
*
|
||||
* This actually overrides the dispatch
|
||||
* mode for all thread types.
|
||||
*/
|
||||
wa_write_clr_set(wal,
|
||||
GEN7_FF_THREAD_MODE,
|
||||
GEN7_FF_SCHED_MASK,
|
||||
GEN7_FF_TS_SCHED_HW |
|
||||
GEN7_FF_VS_SCHED_HW |
|
||||
GEN7_FF_DS_SCHED_HW);
|
||||
|
||||
/* WaDisablePSDDualDispatchEnable:ivb */
|
||||
if (IS_IVB_GT1(i915))
|
||||
wa_masked_en(wal,
|
||||
GEN7_HALF_SLICE_CHICKEN1,
|
||||
GEN7_PSD_SINGLE_PORT_DISPATCH_ENABLE);
|
||||
}
|
||||
|
||||
if (IS_GEN(i915, 7)) {
|
||||
/* WaBCSVCSTlbInvalidationMode:ivb,vlv,hsw */
|
||||
wa_masked_en(wal,
|
||||
GFX_MODE_GEN7,
|
||||
GFX_TLB_INVALIDATE_EXPLICIT | GFX_REPLAY_MODE);
|
||||
|
||||
/* WaDisable_RenderCache_OperationalFlush:ivb,vlv,hsw */
|
||||
wa_masked_dis(wal, CACHE_MODE_0_GEN7, RC_OP_FLUSH_ENABLE);
|
||||
|
||||
/*
|
||||
* BSpec says this must be set, even though
|
||||
* WaDisable4x2SubspanOptimization:ivb,hsw
|
||||
* WaDisable4x2SubspanOptimization isn't listed for VLV.
|
||||
*/
|
||||
wa_masked_en(wal,
|
||||
@ -1951,21 +1940,8 @@ rcs_engine_wa_init(struct intel_engine_cs *engine, struct i915_wa_list *wal)
|
||||
_MASKED_FIELD(GEN6_WIZ_HASHING_MASK,
|
||||
GEN6_WIZ_HASHING_16x4),
|
||||
GEN6_WIZ_HASHING_16x4);
|
||||
|
||||
/* WaPsdDispatchEnable:vlv */
|
||||
/* WaDisablePSDDualDispatchEnable:vlv */
|
||||
wa_masked_en(wal,
|
||||
GEN7_HALF_SLICE_CHICKEN1,
|
||||
GEN7_MAX_PS_THREAD_DEP |
|
||||
GEN7_PSD_SINGLE_PORT_DISPATCH_ENABLE);
|
||||
}
|
||||
|
||||
if (IS_GEN(i915, 7))
|
||||
/* WaBCSVCSTlbInvalidationMode:ivb,vlv,hsw */
|
||||
wa_masked_en(wal,
|
||||
GFX_MODE_GEN7,
|
||||
GFX_TLB_INVALIDATE_EXPLICIT | GFX_REPLAY_MODE);
|
||||
|
||||
if (IS_GEN_RANGE(i915, 6, 7))
|
||||
/*
|
||||
* We need to disable the AsyncFlip performance optimisations in
|
||||
|
Loading…
Reference in New Issue
Block a user