From: Damien Lespiau <damien.lespiau@intel.com>
Date: Mon, 9 Feb 2015 19:33:15 +0000 (+0000)
Subject: drm/i915/skl: Introduce a SKL specific init_workarounds()
X-Git-Tag: v4.1-rc1~69^2~35^2~13
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8d2054941071d10c8bbe120dd2160be8ae21f267;p=karo-tx-linux.git

drm/i915/skl: Introduce a SKL specific init_workarounds()

This function will host SKL-only W/As.

Signed-off-by: Damien Lespiau <damien.lespiau@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 9ebc11e6bb49..ad9d7eb86ef6 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -984,6 +984,13 @@ static int gen9_init_workarounds(struct intel_engine_cs *ring)
 	return 0;
 }
 
+static int skl_init_workarounds(struct intel_engine_cs *ring)
+{
+	gen9_init_workarounds(ring);
+
+	return 0;
+}
+
 int init_workarounds_ring(struct intel_engine_cs *ring)
 {
 	struct drm_device *dev = ring->dev;
@@ -999,7 +1006,9 @@ int init_workarounds_ring(struct intel_engine_cs *ring)
 	if (IS_CHERRYVIEW(dev))
 		return chv_init_workarounds(ring);
 
-	if (IS_GEN9(dev))
+	if (IS_SKYLAKE(dev))
+		return skl_init_workarounds(ring);
+	else if (IS_GEN9(dev))
 		return gen9_init_workarounds(ring);
 
 	return 0;