|
@@ -851,15 +851,13 @@ static int gen9_init_workarounds(struct intel_engine_cs *engine)
|
|
|
WA_SET_BIT_MASKED(HALF_SLICE_CHICKEN3,
|
|
|
GEN9_DISABLE_OCL_OOB_SUPPRESS_LOGIC);
|
|
|
|
|
|
- /* WaDisableDgMirrorFixInHalfSliceChicken5:skl,bxt */
|
|
|
- if (IS_SKL_REVID(dev_priv, 0, SKL_REVID_B0) ||
|
|
|
- IS_BXT_REVID(dev_priv, 0, BXT_REVID_A1))
|
|
|
+ /* WaDisableDgMirrorFixInHalfSliceChicken5:bxt */
|
|
|
+ if (IS_BXT_REVID(dev_priv, 0, BXT_REVID_A1))
|
|
|
WA_CLR_BIT_MASKED(GEN9_HALF_SLICE_CHICKEN5,
|
|
|
GEN9_DG_MIRROR_FIX_ENABLE);
|
|
|
|
|
|
- /* WaSetDisablePixMaskCammingAndRhwoInCommonSliceChicken:skl,bxt */
|
|
|
- if (IS_SKL_REVID(dev_priv, 0, SKL_REVID_B0) ||
|
|
|
- IS_BXT_REVID(dev_priv, 0, BXT_REVID_A1)) {
|
|
|
+ /* WaSetDisablePixMaskCammingAndRhwoInCommonSliceChicken:bxt */
|
|
|
+ if (IS_BXT_REVID(dev_priv, 0, BXT_REVID_A1)) {
|
|
|
WA_SET_BIT_MASKED(GEN7_COMMON_SLICE_CHICKEN1,
|
|
|
GEN9_RHWO_OPTIMIZATION_DISABLE);
|
|
|
/*
|
|
@@ -1023,15 +1021,8 @@ static int skl_init_workarounds(struct intel_engine_cs *engine)
|
|
|
GEN8_LQSC_RO_PERF_DIS);
|
|
|
|
|
|
/* WaEnableGapsTsvCreditFix:skl */
|
|
|
- if (IS_SKL_REVID(dev_priv, SKL_REVID_C0, REVID_FOREVER)) {
|
|
|
- I915_WRITE(GEN8_GARBCNTL, (I915_READ(GEN8_GARBCNTL) |
|
|
|
- GEN9_GAPS_TSV_CREDIT_DISABLE));
|
|
|
- }
|
|
|
-
|
|
|
- /* WaDisablePowerCompilerClockGating:skl */
|
|
|
- if (IS_SKL_REVID(dev_priv, SKL_REVID_B0, SKL_REVID_B0))
|
|
|
- WA_SET_BIT_MASKED(HIZ_CHICKEN,
|
|
|
- BDW_HIZ_POWER_COMPILER_CLOCK_GATING_DISABLE);
|
|
|
+ I915_WRITE(GEN8_GARBCNTL, (I915_READ(GEN8_GARBCNTL) |
|
|
|
+ GEN9_GAPS_TSV_CREDIT_DISABLE));
|
|
|
|
|
|
/* WaBarrierPerformanceFixDisable:skl */
|
|
|
if (IS_SKL_REVID(dev_priv, SKL_REVID_C0, SKL_REVID_D0))
|