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>

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 7506a72ee8820bd94004c32aa14e4a293645de3b..0ef44720af97cd252eb5d275705cb4c7361cffb5 100644 (file)
--- 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)
                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,