[PATCH 4/5] drm/i915: Ask the sink whether training is required when exiting PSR main-link off mode

[Daniel Vetter]

On Wed, May 18, 2016 at 09:34:21PM +0300, ville.syrjala at linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala at linux.intel.com>
> 
> The sink can tell us if link training needs to be performed when
> exiting PSR main-link off mode. Currently we get that information
> from the VBT, but at least on my HSW the VBT says one thing, the sink
> another. And in practice the sink doesn't seem to notice any screen
> updates unless we do the training.
> 
> Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>

For 3&4: Reviewed-by: Daniel Vetter <daniel.vetter at ffwll.ch>

Need to make sure we merge this one together with mine, or just squash.
-Daniel

> ---
>  drivers/gpu/drm/i915/intel_psr.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_psr.c b/drivers/gpu/drm/i915/intel_psr.c
> index 3d172b91a469..6cab66b1b26a 100644
> --- a/drivers/gpu/drm/i915/intel_psr.c
> +++ b/drivers/gpu/drm/i915/intel_psr.c
> @@ -298,7 +298,8 @@ static void hsw_psr_enable_source(struct intel_dp *intel_dp)
>  	else
>  		val |= EDP_PSR_TP1_TP2_SEL;
>  
> -	if (!dev_priv->vbt.psr.require_aux_wakeup)
> +	if (!dev_priv->vbt.psr.require_aux_wakeup &&
> +	    !drm_dp_psr_need_train_on_exit(intel_dp->psr_dpcd))
>  		val |= EDP_PSR_SKIP_AUX_EXIT;
>  
>  	I915_WRITE(EDP_PSR_CTL, val);
> -- 
> 2.7.4
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch