From: Paulo Zanoni Date: Fri, 7 Mar 2014 23:08:06 +0000 (-0300) Subject: drm/i915: get/put runtime PM when we get/put a power domain X-Git-Tag: v3.15-rc1~51^2~18^2~25 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9e6ea71a591ac4b8203bfaacab9a604abc021af4;p=karo-tx-linux.git 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 Signed-off-by: Paulo Zanoni Signed-off-by: Daniel Vetter --- 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, struct i915_power_well *power_well; int i; + intel_runtime_pm_get(dev_priv); + power_domains = &dev_priv->power_domains; mutex_lock(&power_domains->lock); @@ -5621,6 +5623,8 @@ void intel_display_power_put(struct drm_i915_private *dev_priv, } mutex_unlock(&power_domains->lock); + + intel_runtime_pm_put(dev_priv); } static struct i915_power_domains *hsw_pwr;