| Message ID | 1403110376-1889-2-git-send-email-jbarnes@virtuousgeek.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, 2014-06-18 at 09:52 -0700, Jesse Barnes wrote: > 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> Btw, we also have the same redundancy in intel_dp_detect(). --Imre > --- > drivers/gpu/drm/i915/i915_drv.c | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c > index be97741..6eb45ac 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; > } >
On Thu, Jun 19, 2014 at 04:25:55PM +0300, Imre Deak wrote: > On Wed, 2014-06-18 at 09:52 -0700, Jesse Barnes wrote: > > 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> > > Btw, we also have the same redundancy in intel_dp_detect(). Both patches merged, thanks. -Daniel
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index be97741..6eb45ac 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; }
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> --- drivers/gpu/drm/i915/i915_drv.c | 3 --- 1 file changed, 3 deletions(-)