[Intel-gfx] [PATCH 2/2] drm/i915: restore RSTDBYCTL only on non-KMS paths

[Ville Syrjälä]

On Tue, Nov 11, 2014 at 04:48:04PM +0200, Jani Nikula wrote:
> Since RSTDBYCTL is only saved on non-KMS path in within i915_save_state,
> move the restore in i915_restore_state for symmetry.

Makes sense. And IIRC this is an ilk-only register anyway, so frobbing it
on snb+ is dubious at best.

Reviewed-by: Ville Syrjälä <ville.syrjala at linux.intel.com>

> 
> Signed-off-by: Jani Nikula <jani.nikula at intel.com>
> 
> ---
> 
> UNTESTED!!!
> ---
>  drivers/gpu/drm/i915/i915_suspend.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c
> index bd8adf2ca7d8..26b6bf9261ca 100644
> --- a/drivers/gpu/drm/i915/i915_suspend.c
> +++ b/drivers/gpu/drm/i915/i915_suspend.c
> @@ -271,8 +271,6 @@ static void i915_restore_display(struct drm_device *dev)
>  		I915_WRITE(PCH_PP_OFF_DELAYS, dev_priv->regfile.savePP_OFF_DELAYS);
>  		I915_WRITE(PCH_PP_DIVISOR, dev_priv->regfile.savePP_DIVISOR);
>  		I915_WRITE(PCH_PP_CONTROL, dev_priv->regfile.savePP_CONTROL);
> -		I915_WRITE(RSTDBYCTL,
> -			   dev_priv->regfile.saveMCHBAR_RENDER_STANDBY);
>  	} else if (IS_VALLEYVIEW(dev)) {
>  		I915_WRITE(VLV_BLC_HIST_CTL(PIPE_A),
>  			   dev_priv->regfile.saveBLC_HIST_CTL);
> @@ -367,6 +365,8 @@ int i915_restore_state(struct drm_device *dev)
>  			I915_WRITE(_FDI_RXA_IMR, dev_priv->regfile.saveFDI_RXA_IMR);
>  			I915_WRITE(_FDI_RXB_IMR, dev_priv->regfile.saveFDI_RXB_IMR);
>  			I915_WRITE(PCH_PORT_HOTPLUG, dev_priv->regfile.savePCH_PORT_HOTPLUG);
> +			I915_WRITE(RSTDBYCTL,
> +				   dev_priv->regfile.saveMCHBAR_RENDER_STANDBY);
>  		} else {
>  			I915_WRITE(IER, dev_priv->regfile.saveIER);
>  			I915_WRITE(IMR, dev_priv->regfile.saveIMR);
> -- 
> 2.1.1
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Ville Syrjälä
Intel OTC