aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Widawsky <benjamin.widawsky@intel.com>2015-03-11 11:23:12 +0200
committerDaniel Vetter <daniel.vetter@ffwll.ch>2015-04-14 13:55:23 +0200
commit8d09c8123db62859886bbbc504a56ff5d9d9e8cd (patch)
tree8e160c26a5ee17d1fd20b27c1539bbe3072504f7
parentdrm/i915/bxt: add WaDisableMaskBasedCammingInRCC workaround (diff)
downloadlinux-dev-8d09c8123db62859886bbbc504a56ff5d9d9e8cd.tar.xz
linux-dev-8d09c8123db62859886bbbc504a56ff5d9d9e8cd.zip
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>
-rw-r--r--drivers/gpu/drm/i915/intel_ringbuffer.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index e23cbdc029b8..000f608d8ea6 100644
--- 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);