From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 34E07C53219 for ; Tue, 28 Jul 2026 15:33:40 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BA7F410E5A0; Tue, 28 Jul 2026 15:33:39 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="jClsQq5O"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.17]) by gabe.freedesktop.org (Postfix) with ESMTPS id 827C610E598; Tue, 28 Jul 2026 15:33:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1785252818; x=1816788818; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=RE7tqItMALqtNGA1f3hYkiPaSuR1wSs9enLqQmrQ+4E=; b=jClsQq5O98aSkHoyUibWpky5jL7RnEGG3TSkdYJcPhIoCzvo0/3Kq99Q Dk7BqDb3Xv39NDed8jn/xItBm2ycg4GxTjzKx6R7+l/KTXaNnJXTubpvm 4qQ6Z6Qc+jbCY4lNN3CE7+MnfF2eGtehANiJZeOLmecMoHRHQnLLhfT/A bjx8zGEblcCIq4DbCBzJoxc8pNNQSnTuIVi5kvHhFbr0HAQN/oa9fv4Zm ulMBzfI6rhz9qi4XuHanGvESnPqI4quY5oEZG3LkjoBvkH2YR+tLXanmy eJTDVOaBOneWad9naOAtoO4DMOU/Aad9uqSPpiRyvQJ+V0WMNomW3TBvn Q==; X-CSE-ConnectionGUID: MOSWPl+bQIivOr/Sxa69Ug== X-CSE-MsgGUID: /bfcb3HeRB2FQsRiSTQoIg== X-IronPort-AV: E=McAfee;i="6800,10657,11859"; a="85854449" X-IronPort-AV: E=Sophos;i="6.25,190,1779174000"; d="scan'208";a="85854449" Received: from fmviesa010.fm.intel.com ([10.60.135.150]) by orvoesa109.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Jul 2026 08:33:37 -0700 X-CSE-ConnectionGUID: 1X2zF0APQ4e97i7CT3UNkw== X-CSE-MsgGUID: TxOepKAdTf+dJOMxmjg2yw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.25,190,1779174000"; d="scan'208";a="255813314" Received: from mgolanimitul-x299-ud4-pro.iind.intel.com ([10.190.239.114]) by fmviesa010.fm.intel.com with ESMTP; 28 Jul 2026 08:33:36 -0700 From: Mitul Golani To: intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org Subject: [PATCH v8 01/10] drm/i915/vrr: Return from PSR2 compute config in case of CMRR enabled Date: Tue, 28 Jul 2026 20:53:23 +0530 Message-ID: <20260728152324.3851790-1-mitulkumar.ajitkumar.golani@intel.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20260728145943.3848704-2-mitulkumar.ajitkumar.golani@intel.com> References: <20260728145943.3848704-2-mitulkumar.ajitkumar.golani@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" 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 --v4: - Add check to psr2_config_valid (Jouni) --v5: - Correct debug message Signed-off-by: Mitul Golani --- 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; -- 2.48.1