[Intel-gfx] [PATCH 03/10] drm/i915: refactor RPM disabling due to RC6 being disabled

[Joonas Lahtinen]

On ti, 2015-12-15 at 20:10 +0200, Imre Deak wrote:
> We can make the RPM dependency on RC6 explciit in the code by taking
> an
> actual RPM reference, instead of avoiding to drop the initial one.
> This
> will also enable us to remove the HAS_RUNTIME_PM special casing from
> more places in the next patch.
> 
> Signed-off-by: Imre Deak <imre.deak at intel.com>

Reviewed-by: Joonas Lahtinen <joonas.lahtinen at linux.intel.com>

Comment below.

> ---
>  drivers/gpu/drm/i915/intel_pm.c         | 15 +++++++++++++++
>  drivers/gpu/drm/i915/intel_runtime_pm.c |  9 ---------
>  2 files changed, 15 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_pm.c
> b/drivers/gpu/drm/i915/intel_pm.c
> index 99f2642..f93c4b9 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> 
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> 

<SNIP>

> @@ -6025,10 +6035,15 @@ void intel_init_gt_powersave(struct
> drm_device *dev)
>  
>  void intel_cleanup_gt_powersave(struct drm_device *dev)
>  {
> +	struct drm_i915_private *dev_priv = dev->dev_private;
> +
>  	if (IS_CHERRYVIEW(dev))
>  		return;
>  	else if (IS_VALLEYVIEW(dev))
>  		valleyview_cleanup_gt_powersave(dev);
> +
> +	if (!i915.enable_rc6)
> +		intel_runtime_pm_put(dev_priv);

Although intel_enable_rc6 is used in other places, I think this is fine
due to the variable being initialized in the counter function.

Regards, Joonas

>  }
>  
-- 
Joonas Lahtinen
Open Source Technology Center
Intel Corporation