On 7/16/2026 5:59 PM, Golani, Mitulkumar Ajitkumar wrote:
-----Original Message-----
From: Borah, Chaitanya Kumar <[email protected]>
Sent: 15 July 2026 18:45
To: Golani, Mitulkumar Ajitkumar <[email protected]>;
[email protected]
Cc: [email protected]; Shankar, Uma <[email protected]>;
Nautiyal, Ankit K <[email protected]>
Subject: Re: [PATCH v3 7/8] drm/i915/vrr: Return from CMRR compute config
in case of PSR2 enabled
On 7/14/2026 4:09 PM, Mitul Golani wrote:
CMRR is mutually exclusive to PSR2, hence return from CMRR if PSR2 is
already computed.
Signed-off-by: Mitul Golani <[email protected]>
---
drivers/gpu/drm/i915/display/intel_vrr.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/gpu/drm/i915/display/intel_vrr.c
b/drivers/gpu/drm/i915/display/intel_vrr.c
index 52fe40fdbdb3..ca3cac5aa6ab 100644
--- a/drivers/gpu/drm/i915/display/intel_vrr.c
+++ b/drivers/gpu/drm/i915/display/intel_vrr.c
@@ -202,6 +202,9 @@ intel_vrr_cmrr_compute_config(struct
intel_crtc_state *crtc_state)
if (!HAS_CMRR(display))
return;
+ if (crtc_state->has_sel_update)
+ return;
+
This won't work because psr_compute_config happens after
vrr_compute_config.
Also is this the best flag to identify PSR2?
AFAIK, this is the suitable flag to guard PSR2.
crtc_state->has_sel_update is also set for Panel Replay.
So I think you would need something like
crtc_state->has_psr && crtc_state->has_sel_update &&
!crtc_state->has_panel_replay
Adding Jouni if he has something to add.
thanks for pointing out the other problem which is actually a chicken and egg
problem, I will look into it and address in the next revision
Thanks
/* No CMRR ratio configured through debugfs */
if (!crtc->force_cmrr.numerator)
return;
