Re: [PATCH v8 01/10] drm/i915/vrr: Return from PSR2 compute config in case of CMRR enabled

["Borah, Chaitanya Kumar" <chaitanya.kumar.borah@intel.com>]

On 7/28/2026 8:53 PM, Mitul Golani wrote:
> CMRR is mutually exclusive to PSR2, do not enable PSR2 when CMRR is
> enabled.
> 

nit: drm/i915/psr: Do not enable PSR2 when CMRR is ON

With that,

Reviewed-by: Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
> --v2:
> - Restrict selective update config check (Ankit)
> - Commit message change
> 
> --v3:
> - Commit changes
> 
> --v4:
> - Add check to psr2_config_valid (Jouni)
> 
> --v5:
> - Correct debug message
> 
> Signed-off-by: Mitul Golani <mitulkumar.ajitkumar.golani@intel.com>
> ---
>   drivers/gpu/drm/i915/display/intel_psr.c | 6 ++++++
>   1 file changed, 6 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
> index 40e3d7095996..410778e73a2d 100644
> --- a/drivers/gpu/drm/i915/display/intel_psr.c
> +++ b/drivers/gpu/drm/i915/display/intel_psr.c
> @@ -1491,6 +1491,12 @@ static bool intel_psr2_config_valid(struct intel_dp *intel_dp,
>   	int crtc_vdisplay = crtc_state->hw.adjusted_mode.crtc_vdisplay;
>   	int psr_max_h = 0, psr_max_v = 0, max_bpp = 0;
>   
> +	if (crtc_state->cmrr.enable) {
> +		drm_dbg_kms(display->drm,
> +			    "PSR2 cannot be enabled when CMRR is enabled\n");
> +		return false;
> +	}
> +
>   	if (!connector->dp.psr_caps.su_support || display->params.enable_psr == 1)
>   		return false;
>