aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugeni Dodonov <eugeni.dodonov@intel.com>2012-04-13 16:08:44 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-04-17 06:12:58 -0400
commit246bdbeb0f0fb14c4c085b6ed7edbab11afccd33 (patch)
treee26cc1828f7c2376e251075081848083d367c681
parentef4d084fae9d4719bc52f97e15e41e1602e3bc6e (diff)
drm/i915: share forcewaking code between IVB and HSW
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@gmail.com> Signed-off-by: Eugeni Dodonov <eugeni.dodonov@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--drivers/gpu/drm/i915/intel_display.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 7506a72ee882..0ef44720af97 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -9312,7 +9312,7 @@ static void intel_init_display(struct drm_device *dev)
9312 dev_priv->display.force_wake_put = __gen6_gt_force_wake_put; 9312 dev_priv->display.force_wake_put = __gen6_gt_force_wake_put;
9313 9313
9314 /* IVB configs may use multi-threaded forcewake */ 9314 /* IVB configs may use multi-threaded forcewake */
9315 if (IS_IVYBRIDGE(dev)) { 9315 if (IS_IVYBRIDGE(dev) || IS_HASWELL(dev)) {
9316 u32 ecobus; 9316 u32 ecobus;
9317 9317
9318 /* A small trick here - if the bios hasn't configured MT forcewake, 9318 /* A small trick here - if the bios hasn't configured MT forcewake,