aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915
diff options
context:
space:
mode:
authorDamien Lespiau <damien.lespiau@intel.com>2015-02-09 14:33:15 -0500
committerDaniel Vetter <daniel.vetter@ffwll.ch>2015-02-13 17:28:34 -0500
commit8d2054941071d10c8bbe120dd2160be8ae21f267 (patch)
treea0cd4b9ef4d39768b30607fb010a717af65a074e /drivers/gpu/drm/i915
parent8543747ce5bde14f80cc07b4150e884c24a3edcf (diff)
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>
Diffstat (limited to 'drivers/gpu/drm/i915')
-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)
984 return 0; 984 return 0;
985} 985}
986 986
987static int skl_init_workarounds(struct intel_engine_cs *ring)
988{
989 gen9_init_workarounds(ring);
990
991 return 0;
992}
993
987int init_workarounds_ring(struct intel_engine_cs *ring) 994int init_workarounds_ring(struct intel_engine_cs *ring)
988{ 995{
989 struct drm_device *dev = ring->dev; 996 struct drm_device *dev = ring->dev;
@@ -999,7 +1006,9 @@ int init_workarounds_ring(struct intel_engine_cs *ring)
999 if (IS_CHERRYVIEW(dev)) 1006 if (IS_CHERRYVIEW(dev))
1000 return chv_init_workarounds(ring); 1007 return chv_init_workarounds(ring);
1001 1008
1002 if (IS_GEN9(dev)) 1009 if (IS_SKYLAKE(dev))
1010 return skl_init_workarounds(ring);
1011 else if (IS_GEN9(dev))
1003 return gen9_init_workarounds(ring); 1012 return gen9_init_workarounds(ring);
1004 1013
1005 return 0; 1014 return 0;