From patchwork Tue Feb 4 13:06:37 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: 13959166 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 84460C0219A for ; Tue, 4 Feb 2025 13:09:42 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2C89B10E631; Tue, 4 Feb 2025 13:09:42 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="RtidVwp9"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.19]) by gabe.freedesktop.org (Postfix) with ESMTPS id 642F010E32D; Tue, 4 Feb 2025 13:09:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1738674581; x=1770210581; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=0TS02hV7M08aXjVrIYf97MOXAGthNftUdDJemyS9Qa4=; b=RtidVwp9DVDpi6xyICnja0GIm63IMqv69mltBVDxf4+plGzleNVFhRh0 X8x+1IThEJto5yl/4REnNZk8CXIDBXzHLu956rsQ96B+jRqFG0L98CzSf t4+gz2lxQMK3VUXiBuO7xNccBkZIXXrimLvsF5IPwJw2IiDi6gdjOP8fV yORz/Wy8s2hgUgYWkc2wL1h8v8E5/qfA6fFGIJfeA/20xBGPpWg1QU4XW ZED5slfv/p8eqPQyYQd3iT0A+I9jh/hClsGRZi8bc2M1OGn3nnOpkuuCr bXpk4vT54gLRNsiwLnMItp2NqPPUthKFa2Mh0roVwA88laxOFoG3Iqta7 Q==; X-CSE-ConnectionGUID: Qyc+ZEa6Qo219stG7Nvj9Q== X-CSE-MsgGUID: vRCfG1WxRDOotX7qFMTQYw== X-IronPort-AV: E=McAfee;i="6700,10204,11336"; a="39082332" X-IronPort-AV: E=Sophos;i="6.13,258,1732608000"; d="scan'208";a="39082332" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by orvoesa111.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Feb 2025 05:09:41 -0800 X-CSE-ConnectionGUID: dTXphXu5T7mBgioAvk+JFA== X-CSE-MsgGUID: zFQ/Ma9xTXCLbGqxzbGd5g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,224,1728975600"; d="scan'208";a="110417866" Received: from mgolanimitul-x299-ud4-pro.iind.intel.com ([10.190.239.114]) by orviesa010.jf.intel.com with ESMTP; 04 Feb 2025 05:09:38 -0800 From: Mitul Golani To: intel-xe@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Cc: jouni.hogander@intel.com, ankit.k.nautiyal@intel.com Subject: [PATCH v2 1/2] drm/i915/display: Skip state checker for AS SDP infoframe enable Date: Tue, 4 Feb 2025 18:36:37 +0530 Message-ID: <20250204130638.2800372-2-mitulkumar.ajitkumar.golani@intel.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250204130638.2800372-1-mitulkumar.ajitkumar.golani@intel.com> References: <20250204130638.2800372-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, preventing full modeset while pipe config changes. --v2: - Add check for exclude_infoframe. (Ankit) - Update commit message. (Ankit) Signed-off-by: Mitul Golani --- drivers/gpu/drm/i915/display/intel_display.c | 10 ++++++++-- 1 file changed, 8 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..b35fb6d37640 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -5388,6 +5388,7 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config, struct drm_i915_private *dev_priv = to_i915(current_config->uapi.crtc->dev); struct intel_crtc *crtc = to_intel_crtc(pipe_config->uapi.crtc); struct drm_printer p; + u32 exclude_infoframes = 0; bool ret = true; if (fastset) @@ -5743,8 +5744,13 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config, PIPE_CONF_CHECK_I(min_voltage_level); if (current_config->has_psr || pipe_config->has_psr) - PIPE_CONF_CHECK_X_WITH_MASK(infoframes.enable, - ~intel_hdmi_infoframe_enable(DP_SDP_VSC)); + exclude_infoframes |= intel_hdmi_infoframe_enable(DP_SDP_VSC); + + if (current_config->vrr.enable || pipe_config->vrr.enable) + exclude_infoframes |= intel_hdmi_infoframe_enable(DP_SDP_ADAPTIVE_SYNC); + + if (exclude_infoframes) + PIPE_CONF_CHECK_X_WITH_MASK(infoframes.enable, ~exclude_infoframes); else PIPE_CONF_CHECK_X(infoframes.enable); From patchwork Tue Feb 4 13:06:38 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: 13959167 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 7EF50C02196 for ; Tue, 4 Feb 2025 13:09:44 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2618A10E634; Tue, 4 Feb 2025 13:09:44 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="Jz6DRUUI"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.19]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6A12C10E634; Tue, 4 Feb 2025 13:09:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1738674583; x=1770210583; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=OmuIelFCdSLw4jXzc4vltgfiOP9hvu4ZnUqeK8dfSh8=; b=Jz6DRUUImCbb2o9uuxaoo0wE+I8Bc3Jqof955x81NE5Yj1p+4x6ntSDL AjYnmFcTB1qNlTZQgCU7ExM/lXx/OXlR4ZEclDCYkC4lrLKHH3bGCo1UX TLDPTkID2pJCTaVhsPMjQRzCd++wcTycw95u49dd97UAGs0ilgq/gXLlk wNf1QmFuBMXyZs4OqBwf9xokZuwDt3mHwJBFwBZG7DUW9vQ1Kp6GrglW1 8C5LgxeqoybqJ95TCFwSXiLJh2dHunBtb9VqHAvmSPujdumvfAmMaqedE jt6MQFE0QZV2Ksngym327D3Z0hI7Xhk1Y+ScvQ+3RVM8WLzC6Q3ha1eGG A==; X-CSE-ConnectionGUID: qHox+RHjSo2BEQKPg0zD1w== X-CSE-MsgGUID: bD5eUlU/S9GFYLc9idpVuw== X-IronPort-AV: E=McAfee;i="6700,10204,11336"; a="39082333" X-IronPort-AV: E=Sophos;i="6.13,258,1732608000"; d="scan'208";a="39082333" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by orvoesa111.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Feb 2025 05:09:43 -0800 X-CSE-ConnectionGUID: QURbHpDaTwqXPC4Oa0rQLg== X-CSE-MsgGUID: 3mNUkRJITNmbDHRmT628ww== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,224,1728975600"; d="scan'208";a="110417869" Received: from mgolanimitul-x299-ud4-pro.iind.intel.com ([10.190.239.114]) by orviesa010.jf.intel.com with ESMTP; 04 Feb 2025 05:09:40 -0800 From: Mitul Golani To: intel-xe@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Cc: jouni.hogander@intel.com, ankit.k.nautiyal@intel.com Subject: [PATCH v2 2/2] Revert "drm/i915/dp: Compute as_sdp based on if vrr possible" Date: Tue, 4 Feb 2025 18:36:38 +0530 Message-ID: <20250204130638.2800372-3-mitulkumar.ajitkumar.golani@intel.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250204130638.2800372-1-mitulkumar.ajitkumar.golani@intel.com> References: <20250204130638.2800372-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" This reverts commit 08277aa5d5a44befd71717de35b956f55e1e8401. 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 cc6aba353c11..8b03f604b240 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -2798,7 +2798,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);