From: Nick Hoath <nicholas.hoath@intel.com>
Date: Thu, 7 May 2015 13:15:33 +0000 (+0100)
Subject: drm/i915/bxt: Enable WaEnableYV12BugFixInHalfSliceChicken7 for Broxton
X-Git-Tag: v4.2-rc1~13^2~54^2~19
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=27a1b688d9f1fa2abd14bfe6a8729a19fb3b1b25;p=karo-tx-linux.git

drm/i915/bxt: Enable WaEnableYV12BugFixInHalfSliceChicken7 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>
---

diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index 8404e0c318e7..e8eeea190687 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -944,8 +944,9 @@ static int gen9_init_workarounds(struct intel_engine_cs *ring)
 				  DISABLE_PIXEL_MASK_CAMMING);
 	}
 
-	if (INTEL_REVID(dev) >= SKL_REVID_C0) {
-		/* WaEnableYV12BugFixInHalfSliceChicken7:skl */
+	if ((IS_SKYLAKE(dev) && INTEL_REVID(dev) >= SKL_REVID_C0) ||
+	    IS_BROXTON(dev)) {
+		/* WaEnableYV12BugFixInHalfSliceChicken7:skl,bxt */
 		WA_SET_BIT_MASKED(GEN9_HALF_SLICE_CHICKEN7,
 				  GEN9_ENABLE_YV12_BUGFIX);
 	}