drm/i915: don't take runtime PM reference around freeze/thaw
authorJesse Barnes <jbarnes@virtuousgeek.org>
Wed, 18 Jun 2014 16:52:56 +0000 (09:52 -0700)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Thu, 19 Jun 2014 16:05:30 +0000 (18:05 +0200)
We should be taking the right power well refs these days, so this
shouldn't be necessary.  It also gets in the way of re-using these
routines for S0iX states, as those need all the power saving features
enabled.

Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Reviewed-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/i915_drv.c

index be97741..6eb45ac 100644 (file)
@@ -496,8 +496,6 @@ static int i915_drm_freeze(struct drm_device *dev)
        struct drm_crtc *crtc;
        pci_power_t opregion_target_state;
 
-       intel_runtime_pm_get(dev_priv);
-
        /* ignore lid events during suspend */
        mutex_lock(&dev_priv->modeset_restore_lock);
        dev_priv->modeset_restore = MODESET_SUSPENDED;
@@ -686,7 +684,6 @@ static int __i915_drm_thaw(struct drm_device *dev, bool restore_gtt_mappings)
 
        intel_opregion_notify_adapter(dev, PCI_D0);
 
-       intel_runtime_pm_put(dev_priv);
        return 0;
 }