From: Jesse Barnes Date: Wed, 18 Jun 2014 16:52:56 +0000 (-0700) Subject: drm/i915: don't take runtime PM reference around freeze/thaw X-Git-Tag: v3.17-rc1~82^2~63^2~4 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=395a5abbd97d7d76a7a26da52f33daebe279b3b3;p=~emulex%2Finfiniband.git drm/i915: don't take runtime PM reference around freeze/thaw 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 Reviewed-by: Imre Deak Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index be977414842..6eb45ac7a7d 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -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; }