aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_ringbuffer.c
diff options
context:
space:
mode:
authorNick Hoath <nicholas.hoath@intel.com>2015-05-07 14:15:32 +0100
committerDaniel Vetter <daniel.vetter@ffwll.ch>2015-05-08 13:04:14 +0200
commita13d215fe75d0b98b9841654b56dcd6e8cc796e4 (patch)
tree43690b1addad9b54c70467ecad647d0ffd8ff83e /drivers/gpu/drm/i915/intel_ringbuffer.c
parentdrm/i915/bxt: Enable WaDisableDgMirrorFixInHalfSliceChicken5 for Broxton (diff)
downloadlinux-dev-a13d215fe75d0b98b9841654b56dcd6e8cc796e4.tar.xz
linux-dev-a13d215fe75d0b98b9841654b56dcd6e8cc796e4.zip
drm/i915/bxt: Enable WaSetDisablePixMaskCammingAndRhwoInCommonSliceChicken for Broxton
Signed-off-by: Nick Hoath <nicholas.hoath@intel.com> Reviewed-by: Imre Deak <imre.deak@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_ringbuffer.c')
-rw-r--r--drivers/gpu/drm/i915/intel_ringbuffer.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index 4b0d48bccb9b..8404e0c318e7 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -935,8 +935,9 @@ static int gen9_init_workarounds(struct intel_engine_cs *ring)
GEN9_DG_MIRROR_FIX_ENABLE);
}
- if (IS_SKYLAKE(dev) && INTEL_REVID(dev) <= SKL_REVID_B0) {
- /* WaSetDisablePixMaskCammingAndRhwoInCommonSliceChicken:skl */
+ if ((IS_SKYLAKE(dev) && INTEL_REVID(dev) <= SKL_REVID_B0) ||
+ (IS_BROXTON(dev) && INTEL_REVID(dev) < BXT_REVID_B0)) {
+ /* WaSetDisablePixMaskCammingAndRhwoInCommonSliceChicken:skl,bxt */
WA_SET_BIT_MASKED(GEN7_COMMON_SLICE_CHICKEN1,
GEN9_RHWO_OPTIMIZATION_DISABLE);
WA_SET_BIT_MASKED(GEN9_SLICE_COMMON_ECO_CHICKEN0,