Re: [PATCH v6 1/9] drm/i915/vrr: Return from PSR2 compute config in case of CMRR enabled

On 7/22/2026 10:09 AM, Mitul Golani wrote:
> CMRR is mutually exclusive to PSR2, do not enable PSR2 when CMRR is
> enabled.
> 
> --v2:
> - Restrict selective update config check (Ankit)
> - Commit message change
> 
> --v3:
> - Commit changes
> 
> Signed-off-by: Mitul Golani <[email protected]>
> ---
>   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..6a90ded5d1fa 100644
> --- a/drivers/gpu/drm/i915/display/intel_psr.c
> +++ b/drivers/gpu/drm/i915/display/intel_psr.c
> @@ -1587,6 +1587,12 @@ static bool intel_sel_update_config_valid(struct intel_crtc_state *crtc_state,
>   	struct intel_dp *intel_dp = intel_attached_dp(connector);
>   	struct intel_display *display = to_intel_display(intel_dp);
>   
> +	if (crtc_state->cmrr.enable) {
> +		drm_dbg_kms(display->drm,
> +			    "Selective update cannot be enabled when CMRR is enabled\n");
> +		goto unsupported;
> +	}

This also disables panel replay, please make sure that this is desired. 
If so, add it in commit message.

> +
>   	if (HAS_PSR2_SEL_FETCH(display) &&
>   	    !intel_psr2_sel_fetch_config_valid(intel_dp, crtc_state) &&
>   	    !HAS_PSR_HW_TRACKING(display)) {