drm/i915/skl: add WaDisableMaskBasedCammingInRCC workaround

Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Nick Hoath <nicholas.hoath@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index e23cbdc029b8291be09032b49fd3eab188f11312..000f608d8ea643944535ea87507942c46061fb86 100644 (file)
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -970,8 +970,8 @@ static int gen9_init_workarounds(struct intel_engine_cs *ring)
         * FIXME: don't apply the following on BXT for stepping C. On BXT A0
         * the flag reads back as 0.
         */
-       /* WaDisableMaskBasedCammingInRCC:bxtA */
-       if (IS_BROXTON(dev))
+       /* WaDisableMaskBasedCammingInRCC:sklC,bxtA */
+       if (INTEL_REVID(dev) == SKL_REVID_C0 || IS_BROXTON(dev))
                WA_SET_BIT_MASKED(SLICE_ECO_CHICKEN0,
                                  PIXEL_MASK_CAMMING_DISABLE);