aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Lespiau <damien.lespiau@intel.com>2015-02-09 19:33:15 +0000
committerDaniel Vetter <daniel.vetter@ffwll.ch>2015-02-13 23:28:34 +0100
commit8d2054941071d10c8bbe120dd2160be8ae21f267 (patch)
treea0cd4b9ef4d39768b30607fb010a717af65a074e
parentdrm/i915/skl: Document that we implement WaRsClearFWBitsAtReset (diff)
downloadlinux-dev-8d2054941071d10c8bbe120dd2160be8ae21f267.tar.xz
linux-dev-8d2054941071d10c8bbe120dd2160be8ae21f267.zip
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>
-rw-r--r--drivers/gpu/drm/i915/intel_ringbuffer.c11
1 files changed, 10 insertions, 1 deletions
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;