drm/i915/skl: Introduce a SKL specific init_workarounds()
authorDamien Lespiau <damien.lespiau@intel.com>
Mon, 9 Feb 2015 19:33:15 +0000 (19:33 +0000)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 13 Feb 2015 22:28:34 +0000 (23:28 +0100)
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>
drivers/gpu/drm/i915/intel_ringbuffer.c

index 9ebc11e6bb496bb3c020ba470be4421f16bf24d3..ad9d7eb86ef6553029f055e15e8943c88b70e685 100644 (file)
@@ -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;