From: Mitul Golani <mitulkumar.ajitkumar.golani@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: intel-xe@lists.freedesktop.org, uma.shankar@intel.com,
ankit.k.nautiyal@intel.com, chaitanya.kumar.borah@intel.com
Subject: [PATCH v4 1/9] drm/i915/vrr: Return from CMRR compute config in case of PSR2 enabled
Date: Mon, 20 Jul 2026 14:31:33 +0530 [thread overview]
Message-ID: <20260720090142.2864289-2-mitulkumar.ajitkumar.golani@intel.com> (raw)
In-Reply-To: <20260720090142.2864289-1-mitulkumar.ajitkumar.golani@intel.com>
CMRR is mutually exclusive to PSR2, do not enable PSR2 when CMRR is
enabled.
Signed-off-by: Mitul Golani <mitulkumar.ajitkumar.golani@intel.com>
--v2:
- Restrict selective update config check (Ankit)
- Commit message change
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..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;
+ }
+
if (HAS_PSR2_SEL_FETCH(display) &&
!intel_psr2_sel_fetch_config_valid(intel_dp, crtc_state) &&
!HAS_PSR_HW_TRACKING(display)) {
--
2.48.1
next prev parent reply other threads:[~2026-07-20 9:12 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-20 9:01 [PATCH v4 0/9] Enable CMRR in fixed-RR VRR path Mitul Golani
2026-07-20 9:01 ` Mitul Golani [this message]
2026-07-20 9:01 ` [PATCH v4 2/9] drm/i915/vrr: Restrict CMRR enable condition to VRR-TG-default platforms Mitul Golani
2026-07-20 9:01 ` [PATCH v4 3/9] drm/i915/vrr: Add per-CRTC vrr/cmrr debugfs control Mitul Golani
2026-07-20 9:01 ` [PATCH v4 4/9] drm/i915/vrr: Update AS_SDP target_rr_divider based on CMRR config request Mitul Golani
2026-07-20 9:01 ` [PATCH v4 5/9] drm/i915/display: Move CMRR crtc_state members under VRR Mitul Golani
2026-07-20 9:01 ` [PATCH v4 6/9] drm/i915/vrr: Compute CMRR fractional timings generically Mitul Golani
2026-07-20 9:01 ` [PATCH v4 7/9] drm/i915/vrr: Dump CMRR state in the crtc state dump Mitul Golani
2026-07-20 9:01 ` [PATCH v4 8/9] drm/i915/vrr: Program CMRR enable/disable from transcoder timings Mitul Golani
2026-07-20 9:01 ` [PATCH v4 9/9] drm/i915/vrr: Enable cmrr Mitul Golani
2026-07-20 19:21 ` ✗ i915.CI.BAT: failure for Enable CMRR in fixed-RR VRR path (rev4) Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260720090142.2864289-2-mitulkumar.ajitkumar.golani@intel.com \
--to=mitulkumar.ajitkumar.golani@intel.com \
--cc=ankit.k.nautiyal@intel.com \
--cc=chaitanya.kumar.borah@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=intel-xe@lists.freedesktop.org \
--cc=uma.shankar@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox