From patchwork Mon Feb 3 16:14:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Golani, Mitulkumar Ajitkumar" X-Patchwork-Id: 13957759 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 6C89BC02196 for ; Mon, 3 Feb 2025 16:17:50 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1A0F510E4DF; Mon, 3 Feb 2025 16:17:50 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="l2oATdKV"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.10]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1A11E10E103 for ; Mon, 3 Feb 2025 16:17:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1738599468; x=1770135468; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=w5w7i7km0JJLGxyRIAAl7GqXhZ1JW3nLF5ivwdLVLYY=; b=l2oATdKVswuedpcXDRazptKvM7Sy+JDRJAO6E4AA/vB3S3X/XvYD9KWE SvwJCA/8DUk9bWaN6xXT4W5meWnPTaL14rgHPMCIz38ZEStW50Uft+vsO k6NsdEaEyvSMuf7fMvcsm8tdmSqYiKPU2gMMB4CdaNsjt2bmU28oHWXcn 8IDfiAmioiA/xrDRlDcCjSzec3QRYQNC2PaF3WZ4K+DVmO/EgwILrvZlj C7mMKWnySKUt4xAPnEJ5dAwaUlgESXIKSKLLQu01SaKjcLX7/xrXQ/sTX U2g+ZaeljJ+/tKIXWoXnjGwqlVXIzkydUPJK4gUEk0dgw7tUATGIu8l50 g==; X-CSE-ConnectionGUID: Lhcj3EDDSp+pozBkKrTiYw== X-CSE-MsgGUID: ZcbruiPDRsuyBcdVlUBE8A== X-IronPort-AV: E=McAfee;i="6700,10204,11314"; a="50511926" X-IronPort-AV: E=Sophos;i="6.12,310,1728975600"; d="scan'208";a="50511926" Received: from orviesa006.jf.intel.com ([10.64.159.146]) by fmvoesa104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Feb 2025 08:17:48 -0800 X-CSE-ConnectionGUID: tfCstZITSuOELaCSBu9d2A== X-CSE-MsgGUID: TdkPO3GwQny92WzgL4LoAw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.13,256,1732608000"; d="scan'208";a="110286939" Received: from mgolanimitul-x299-ud4-pro.iind.intel.com ([10.190.239.114]) by orviesa006.jf.intel.com with ESMTP; 03 Feb 2025 08:17:48 -0800 From: Mitul Golani To: intel-gfx@lists.freedesktop.org Subject: [PATCH v1 1/2] drm/i915/display: Skip state checker for AS SDP infoframe enable Date: Mon, 3 Feb 2025 21:44:46 +0530 Message-ID: <20250203161447.2643039-2-mitulkumar.ajitkumar.golani@intel.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250203161447.2643039-1-mitulkumar.ajitkumar.golani@intel.com> References: <20250203161447.2643039-1-mitulkumar.ajitkumar.golani@intel.com> MIME-Version: 1.0 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" Avoid full modeset by skipping infoframe.enable check when toggling AS SDP while enabling VRR or while state change from PSR to VRR, preventing full modeset while pipe config changes. Signed-off-by: Mitul Golani --- drivers/gpu/drm/i915/display/intel_display.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index a6383ddde871..8415b305f702 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -5744,9 +5744,11 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config, if (current_config->has_psr || pipe_config->has_psr) PIPE_CONF_CHECK_X_WITH_MASK(infoframes.enable, - ~intel_hdmi_infoframe_enable(DP_SDP_VSC)); + ~(intel_hdmi_infoframe_enable(DP_SDP_VSC) | + intel_hdmi_infoframe_enable(DP_SDP_ADAPTIVE_SYNC))); else - PIPE_CONF_CHECK_X(infoframes.enable); + PIPE_CONF_CHECK_X_WITH_MASK(infoframes.enable, + ~intel_hdmi_infoframe_enable(DP_SDP_ADAPTIVE_SYNC)); PIPE_CONF_CHECK_X(infoframes.gcp); PIPE_CONF_CHECK_INFOFRAME(avi); From patchwork Mon Feb 3 16:14:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Golani, Mitulkumar Ajitkumar" X-Patchwork-Id: 13957760 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 71182C02195 for ; Mon, 3 Feb 2025 16:17:51 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1B1BC10E4FB; Mon, 3 Feb 2025 16:17:51 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="RcaJLrOH"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.10]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2874510E4DF for ; Mon, 3 Feb 2025 16:17:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1738599469; x=1770135469; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=/3xHokRCPLaxOWZ8zmeYj9GSn5MhEt2XqtB3WypgDuE=; b=RcaJLrOHWJYqAf6H7su1FRwgBo/M48OaRHfB0+NDlGE1ibYcQbdYx9j8 UXtdunTPyU2llaQijAUR0bGocCTuRtsNfI8JEoyYxl6Hm6SdNM6s7aSio qw/eyuM9hNgT55pCoJXMsPlSTDRUHj5Hvf7/ov7ZUMac+O/8sc/SrCxo0 jVWIHb6ogreWdTs/kvIUkRX7E0JsVCftfu9Eekvz+/9/GJLadxjF8QSKe GVlLsvK0q84uDK6J3S9leWidAxSwb1WQ4+aM4KhN2PavanwIpxiUObDaJ /xZYWwfHKJBDCeCckZZ9phWlh1vKuw/ukc86+1v89Lq23Ije+x9GkQ2PQ A==; X-CSE-ConnectionGUID: YHcx/hkMRd2+F+jg6yaHvg== X-CSE-MsgGUID: k29naVHeRrWeUTE/gCbGfw== X-IronPort-AV: E=McAfee;i="6700,10204,11314"; a="50511928" X-IronPort-AV: E=Sophos;i="6.12,310,1728975600"; d="scan'208";a="50511928" Received: from orviesa006.jf.intel.com ([10.64.159.146]) by fmvoesa104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Feb 2025 08:17:49 -0800 X-CSE-ConnectionGUID: YCd3xl7IS3K864Lqljxjuw== X-CSE-MsgGUID: 7hC7JLr+QZGoORLGKG52Aw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.13,256,1732608000"; d="scan'208";a="110286941" Received: from mgolanimitul-x299-ud4-pro.iind.intel.com ([10.190.239.114]) by orviesa006.jf.intel.com with ESMTP; 03 Feb 2025 08:17:49 -0800 From: Mitul Golani To: intel-gfx@lists.freedesktop.org Subject: [PATCH v1 2/2] drm/i915/dp: Compute AS SDP only when vrr.enable is set Date: Mon, 3 Feb 2025 21:44:47 +0530 Message-ID: <20250203161447.2643039-3-mitulkumar.ajitkumar.golani@intel.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250203161447.2643039-1-mitulkumar.ajitkumar.golani@intel.com> References: <20250203161447.2643039-1-mitulkumar.ajitkumar.golani@intel.com> MIME-Version: 1.0 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" Compute AS SDP params only when VRR is enabled to maintain PSR exclusivity. Signed-off-by: Mitul Golani --- drivers/gpu/drm/i915/display/intel_dp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index 00b95da18cc5..1223133e0bb6 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -2826,7 +2826,7 @@ static void intel_dp_compute_as_sdp(struct intel_dp *intel_dp, const struct drm_display_mode *adjusted_mode = &crtc_state->hw.adjusted_mode; - if (!intel_vrr_possible(crtc_state) || !intel_dp->as_sdp_supported) + if (!crtc_state->vrr.enable || !intel_dp->as_sdp_supported) return; crtc_state->infoframes.enable |= intel_hdmi_infoframe_enable(DP_SDP_ADAPTIVE_SYNC);