[Intel-gfx] [PATCH v3 4/9] drm/i915/display/dp: Do not enable PSR if VRR is enabled

[Mun, Gwan-gyeong]

On Thu, 2020-12-03 at 15:53 -0800, Manasi Navare wrote:
> Even though our HW supports PSR + VRR, the available panels
> do not work reliably with PSR and VRR together. So if user
> requested VRR and is supported by HW enable that and do not
> enable PSR in that case.
> 
> Cc: Ville Syrjälä <ville.syrjala at linux.intel.com>
> Cc: Gwan-gyeong Mun <gwan-gyeong.mun at intel.com>
> Cc: Imre Deak <imre.deak at intel.com>
> Signed-off-by: Manasi Navare <manasi.d.navare at intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_psr.c | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_psr.c
> b/drivers/gpu/drm/i915/display/intel_psr.c
> index d9a395c486d3..4bbd92135651 100644
> --- a/drivers/gpu/drm/i915/display/intel_psr.c
> +++ b/drivers/gpu/drm/i915/display/intel_psr.c
> @@ -811,6 +811,13 @@ void intel_psr_compute_config(struct intel_dp
> *intel_dp,
>  		&crtc_state->hw.adjusted_mode;
>  	int psr_setup_time;
>  
> +	/*
> +	 * Current PSR panels dont work reliably with VRR enabled
typo in comments: dont -> don't
> +	 * So if VRR is enabled, do not enable PSR.
> +	 */
> +	if (crtc_state->vrr.enable)
> +		return;
> +
>  	if (!CAN_PSR(dev_priv))
>  		return;
>  
Reviewed-by: Gwan-gyeong Mun <gwan-gyeong.mun at intel.com>