[Intel-gfx] [PATCH 3/8] drm/i915/bxt: Also add bxt_resume_prepare() to the S3/S4 path

[Imre Deak]

On Mon, 2015-05-18 at 19:53 +0100, Damien Lespiau wrote:
> Currently bxt_resume_prepare() is only used in the runtime-resume path.
> Add it to the full S3/S4 path as well.
> 
> Cc: Imre Deak <imre.deak at intel.com>
> Signed-off-by: Damien Lespiau <damien.lespiau at intel.com>

Yep, this slipped past the review of "drm/i915/bxt: Add DC9 Trigger
sequence". The fix looks ok:
Reviewed-by: Imre Deak <imre.deak at intel.com>

> ---
>  drivers/gpu/drm/i915/i915_drv.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index 5a9399c..7eb751b 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -595,6 +595,7 @@ static int intel_suspend_complete(struct drm_i915_private *dev_priv);
>  static int vlv_resume_prepare(struct drm_i915_private *dev_priv,
>  			      bool rpm_resume);
>  static int skl_resume_prepare(struct drm_i915_private *dev_priv);
> +static int bxt_resume_prepare(struct drm_i915_private *dev_priv);
>  
> 
>  static int i915_drm_suspend(struct drm_device *dev)
> @@ -810,7 +811,9 @@ static int i915_drm_resume_early(struct drm_device *dev)
>  
>  	intel_uncore_early_sanitize(dev, true);
>  
> -	if (IS_SKYLAKE(dev_priv))
> +	if (IS_BROXTON(dev))
> +		ret = bxt_resume_prepare(dev_priv);
> +	else if (IS_SKYLAKE(dev_priv))
>  		ret = skl_resume_prepare(dev_priv);
>  	else if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv))
>  		hsw_disable_pc8(dev_priv);