diff options
author | Paulo Zanoni <paulo.r.zanoni@intel.com> | 2014-03-07 18:08:06 -0500 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-03-19 11:38:37 -0400 |
commit | 9e6ea71a591ac4b8203bfaacab9a604abc021af4 (patch) | |
tree | 708b502a21fffb14d9ff2bae6d66f8904161fc40 | |
parent | a8a8bd547e6323c56295e1c5a03e30e765d42325 (diff) |
drm/i915: get/put runtime PM when we get/put a power domain
Any power domain will require the HW to be in PCI D0 state, so just do
the simple thing.
Dear maintainer: since intel_display_power_put() and
intel_display_power_get() are almost identical, git-am has failed
apply the patch on my local machine once: it added both chunks to
put(), instead of one chunk to get() and another to put(). When you
apply this patch to your tree, please check if it is correct.
v2: - Add the warning above.
v3: - Rebase.
Reviewed-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r-- | drivers/gpu/drm/i915/intel_pm.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index ed3e9935737d..5f23e6fada97 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c | |||
@@ -5577,6 +5577,8 @@ void intel_display_power_get(struct drm_i915_private *dev_priv, | |||
5577 | struct i915_power_well *power_well; | 5577 | struct i915_power_well *power_well; |
5578 | int i; | 5578 | int i; |
5579 | 5579 | ||
5580 | intel_runtime_pm_get(dev_priv); | ||
5581 | |||
5580 | power_domains = &dev_priv->power_domains; | 5582 | power_domains = &dev_priv->power_domains; |
5581 | 5583 | ||
5582 | mutex_lock(&power_domains->lock); | 5584 | mutex_lock(&power_domains->lock); |
@@ -5621,6 +5623,8 @@ void intel_display_power_put(struct drm_i915_private *dev_priv, | |||
5621 | } | 5623 | } |
5622 | 5624 | ||
5623 | mutex_unlock(&power_domains->lock); | 5625 | mutex_unlock(&power_domains->lock); |
5626 | |||
5627 | intel_runtime_pm_put(dev_priv); | ||
5624 | } | 5628 | } |
5625 | 5629 | ||
5626 | static struct i915_power_domains *hsw_pwr; | 5630 | static struct i915_power_domains *hsw_pwr; |