From: Hoath, Nicholas <nicholas.hoath@intel.com>
Date: Thu, 5 Feb 2015 10:47:16 +0000 (+0000)
Subject: drm/i915: ring w/a initialisation for gen 9
X-Git-Tag: v4.1-rc1~69^2~35^2~70
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3b10653178473c44e8909b5f23ab6f515fb63259;p=linux.git

drm/i915: ring w/a initialisation for gen 9

Add framework for gen 9 HW WAs

v1: Changed SOC specific WA function to gen 9 common function (Req: Damien Lespiau)

Signed-off-by: Nick Hoath <nicholas.hoath@intel.com>
Reviewed-by: Damien Lespiau <damien.lespiau@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 e1036c8e3dd1..fbfe65ac590b 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -873,6 +873,11 @@ static int chv_init_workarounds(struct intel_engine_cs *ring)
 	return 0;
 }
 
+static int gen9_init_workarounds(struct intel_engine_cs *ring)
+{
+	return 0;
+}
+
 int init_workarounds_ring(struct intel_engine_cs *ring)
 {
 	struct drm_device *dev = ring->dev;
@@ -888,6 +893,9 @@ int init_workarounds_ring(struct intel_engine_cs *ring)
 	if (IS_CHERRYVIEW(dev))
 		return chv_init_workarounds(ring);
 
+	if (IS_GEN9(dev))
+		return gen9_init_workarounds(ring);
+
 	return 0;
 }