drm/i915: share forcewaking code between IVB and HSW
authorEugeni Dodonov <eugeni.dodonov@intel.com>
Fri, 13 Apr 2012 20:08:44 +0000 (17:08 -0300)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 17 Apr 2012 10:12:58 +0000 (12:12 +0200)
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>
drivers/gpu/drm/i915/intel_display.c

index 7506a72..0ef4472 100644 (file)
@@ -9312,7 +9312,7 @@ static void intel_init_display(struct drm_device *dev)
                dev_priv->display.force_wake_put = __gen6_gt_force_wake_put;
 
                /* IVB configs may use multi-threaded forcewake */
-               if (IS_IVYBRIDGE(dev)) {
+               if (IS_IVYBRIDGE(dev) || IS_HASWELL(dev)) {
                        u32     ecobus;
 
                        /* A small trick here - if the bios hasn't configured MT forcewake,