Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/i915/skl: drop workarounds for A0 and B0 revisions

Pre-production hardware is not supported.

Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/7929af62a68504c84038a8db1625bd96ebaa9e6f.1474034059.git.jani.nikula@intel.com

+11 -30
-4
drivers/gpu/drm/i915/intel_dp.c
··· 1299 1299 struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp); 1300 1300 struct drm_device *dev = dig_port->base.base.dev; 1301 1301 1302 - /* WaDisableHBR2:skl */ 1303 - if (IS_SKL_REVID(dev, 0, SKL_REVID_B0)) 1304 - return false; 1305 - 1306 1302 if ((IS_HASWELL(dev) && !IS_HSW_ULX(dev)) || IS_BROADWELL(dev) || 1307 1303 (INTEL_INFO(dev)->gen >= 9)) 1308 1304 return true;
+2 -3
drivers/gpu/drm/i915/intel_guc_loader.c
··· 375 375 /* Enable MIA caching. GuC clock gating is disabled. */ 376 376 I915_WRITE(GUC_SHIM_CONTROL, GUC_SHIM_CONTROL_VALUE); 377 377 378 - /* WaDisableMinuteIaClockGating:skl,bxt */ 379 - if (IS_SKL_REVID(dev, 0, SKL_REVID_B0) || 380 - IS_BXT_REVID(dev, 0, BXT_REVID_A1)) { 378 + /* WaDisableMinuteIaClockGating:bxt */ 379 + if (IS_BXT_REVID(dev, 0, BXT_REVID_A1)) { 381 380 I915_WRITE(GUC_SHIM_CONTROL, (I915_READ(GUC_SHIM_CONTROL) & 382 381 ~GUC_ENABLE_MIA_CLOCK_GATING)); 383 382 }
+3 -5
drivers/gpu/drm/i915/intel_lrc.c
··· 269 269 struct drm_i915_private *dev_priv = engine->i915; 270 270 271 271 engine->disable_lite_restore_wa = 272 - (IS_SKL_REVID(dev_priv, 0, SKL_REVID_B0) || 273 - IS_BXT_REVID(dev_priv, 0, BXT_REVID_A1)) && 272 + IS_BXT_REVID(dev_priv, 0, BXT_REVID_A1) && 274 273 (engine->id == VCS || engine->id == VCS2); 275 274 276 275 engine->ctx_desc_template = GEN8_CTX_VALID; ··· 1067 1068 { 1068 1069 uint32_t index = wa_ctx_start(wa_ctx, *offset, CACHELINE_DWORDS); 1069 1070 1070 - /* WaSetDisablePixMaskCammingAndRhwoInCommonSliceChicken:skl,bxt */ 1071 - if (IS_SKL_REVID(engine->i915, 0, SKL_REVID_B0) || 1072 - IS_BXT_REVID(engine->i915, 0, BXT_REVID_A1)) { 1071 + /* WaSetDisablePixMaskCammingAndRhwoInCommonSliceChicken:bxt */ 1072 + if (IS_BXT_REVID(engine->i915, 0, BXT_REVID_A1)) { 1073 1073 wa_ctx_emit(batch, index, MI_LOAD_REGISTER_IMM(1)); 1074 1074 wa_ctx_emit_reg(batch, index, GEN9_SLICE_COMMON_ECO_CHICKEN0); 1075 1075 wa_ctx_emit(batch, index,
+6 -15
drivers/gpu/drm/i915/intel_ringbuffer.c
··· 851 851 WA_SET_BIT_MASKED(HALF_SLICE_CHICKEN3, 852 852 GEN9_DISABLE_OCL_OOB_SUPPRESS_LOGIC); 853 853 854 - /* WaDisableDgMirrorFixInHalfSliceChicken5:skl,bxt */ 855 - if (IS_SKL_REVID(dev_priv, 0, SKL_REVID_B0) || 856 - IS_BXT_REVID(dev_priv, 0, BXT_REVID_A1)) 854 + /* WaDisableDgMirrorFixInHalfSliceChicken5:bxt */ 855 + if (IS_BXT_REVID(dev_priv, 0, BXT_REVID_A1)) 857 856 WA_CLR_BIT_MASKED(GEN9_HALF_SLICE_CHICKEN5, 858 857 GEN9_DG_MIRROR_FIX_ENABLE); 859 858 860 - /* WaSetDisablePixMaskCammingAndRhwoInCommonSliceChicken:skl,bxt */ 861 - if (IS_SKL_REVID(dev_priv, 0, SKL_REVID_B0) || 862 - IS_BXT_REVID(dev_priv, 0, BXT_REVID_A1)) { 859 + /* WaSetDisablePixMaskCammingAndRhwoInCommonSliceChicken:bxt */ 860 + if (IS_BXT_REVID(dev_priv, 0, BXT_REVID_A1)) { 863 861 WA_SET_BIT_MASKED(GEN7_COMMON_SLICE_CHICKEN1, 864 862 GEN9_RHWO_OPTIMIZATION_DISABLE); 865 863 /* ··· 1021 1023 GEN8_LQSC_RO_PERF_DIS); 1022 1024 1023 1025 /* WaEnableGapsTsvCreditFix:skl */ 1024 - if (IS_SKL_REVID(dev_priv, SKL_REVID_C0, REVID_FOREVER)) { 1025 - I915_WRITE(GEN8_GARBCNTL, (I915_READ(GEN8_GARBCNTL) | 1026 - GEN9_GAPS_TSV_CREDIT_DISABLE)); 1027 - } 1028 - 1029 - /* WaDisablePowerCompilerClockGating:skl */ 1030 - if (IS_SKL_REVID(dev_priv, SKL_REVID_B0, SKL_REVID_B0)) 1031 - WA_SET_BIT_MASKED(HIZ_CHICKEN, 1032 - BDW_HIZ_POWER_COMPILER_CLOCK_GATING_DISABLE); 1026 + I915_WRITE(GEN8_GARBCNTL, (I915_READ(GEN8_GARBCNTL) | 1027 + GEN9_GAPS_TSV_CREDIT_DISABLE)); 1033 1028 1034 1029 /* WaBarrierPerformanceFixDisable:skl */ 1035 1030 if (IS_SKL_REVID(dev_priv, SKL_REVID_C0, SKL_REVID_D0))