On Tue, Jun 07, 2016 at 09:24:29PM +0300, Imre Deak wrote:
> These helpers will be needed by the next patch, so factor them out.
>
> No functional change.
>
> Signed-off-by: Imre Deak <imre.deak@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/intel_runtime_pm.c | 23 +++++++++++++++++------
> 1 file changed, 17 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c
> index 2b75b30..d0d056a 100644
> --- a/drivers/gpu/drm/i915/intel_runtime_pm.c
> +++ b/drivers/gpu/drm/i915/intel_runtime_pm.c
> @@ -151,6 +151,20 @@ static void intel_power_well_disable(struct drm_i915_private *dev_priv,
> power_well->ops->disable(dev_priv, power_well);
> }
>
> +static void intel_power_well_get(struct drm_i915_private *dev_priv,
> + struct i915_power_well *power_well)
> +{
> + if (!power_well->count++)
> + intel_power_well_enable(dev_priv, power_well);
> +}
> +
> +static void intel_power_well_put(struct drm_i915_private *dev_priv,
> + struct i915_power_well *power_well)
> +{
> + if (!--power_well->count)
> + intel_power_well_disable(dev_priv, power_well);
> +}
> +
> /*
> * We should only use the power well if we explicitly asked the hardware to
> * enable it, so check if it's enabled and also check if we've requested it to
> @@ -1518,10 +1532,8 @@ __intel_display_power_get_domain(struct drm_i915_private *dev_priv,
> struct i915_power_well *power_well;
> int i;
>
> - for_each_power_well(i, power_well, BIT(domain), power_domains) {
> - if (!power_well->count++)
> - intel_power_well_enable(dev_priv, power_well);
> - }
> + for_each_power_well(i, power_well, BIT(domain), power_domains)
> + intel_power_well_get(dev_priv, power_well);
>
> power_domains->domain_use_count[domain]++;
> }
> @@ -1620,8 +1632,7 @@ void intel_display_power_put(struct drm_i915_private *dev_priv,
> "Use count on power well %s is already zero",
> power_well->name);
Move the WARN too?
>
> - if (!--power_well->count)
> - intel_power_well_disable(dev_priv, power_well);
> + intel_power_well_put(dev_priv, power_well);
> }
>
> mutex_unlock(&power_domains->lock);
> --
> 2.5.0
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
