1 files changed, 1 insertions, 17 deletions

diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c
index 2b5eb229ff2c..0ede02a99d91 100644
--- a/drivers/gpu/drm/i915/i915_suspend.c
+++ b/drivers/gpu/drm/i915/i915_suspend.c
@@ -40,7 +40,7 @@ static bool i915_pipe_enabled(struct drm_device *dev, enum pipe pipe)
                 return false;
 
         if (HAS_PCH_SPLIT(dev))
-                dpll_reg = PCH_DPLL(pipe);
+                dpll_reg = _PCH_DPLL(pipe);
         else
                 dpll_reg = (pipe == PIPE_A) ? _DPLL_A : _DPLL_B;
 
@@ -876,22 +876,6 @@ int i915_restore_state(struct drm_device *dev)
                 I915_WRITE(IER, dev_priv->saveIER);
                 I915_WRITE(IMR, dev_priv->saveIMR);
         }
-        mutex_unlock(&dev->struct_mutex);
-
-        if (drm_core_check_feature(dev, DRIVER_MODESET))
-                intel_init_clock_gating(dev);
-
-        if (IS_IRONLAKE_M(dev)) {
-                ironlake_enable_drps(dev);
-                intel_init_emon(dev);
-        }
-
-        if (INTEL_INFO(dev)->gen >= 6) {
-                gen6_enable_rps(dev_priv);
-                gen6_update_ring_freq(dev_priv);
-        }
-
-        mutex_lock(&dev->struct_mutex);
 
         /* Cache mode state */
         I915_WRITE(CACHE_MODE_0, dev_priv->saveCACHE_MODE_0 | 0xffff0000);