From patchwork Thu Mar 6 13:10:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ankit Nautiyal X-Patchwork-Id: 14004482 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 59693C28B25 for ; Thu, 6 Mar 2025 13:23:28 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DC86A10E98C; Thu, 6 Mar 2025 13:23:27 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="Beg1UY3I"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.18]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4692010E988; Thu, 6 Mar 2025 13:23:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741267407; x=1772803407; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=TpaEVX86w0S7RmBFIyWzNrWBNn8o+AxcxgN0Dtq7Bpg=; b=Beg1UY3IYP437ZsFxCd3swszF6TpYyq4SQWfBSqGDcct5NCv5acj8nDT npb8KwIxzAhGna0OchWlWcXid5g0YDCIMHKMdGoOps+mINpDbyA8f4xNm u99tAEq+wucugS6YpU0IfuHkZsxwYE5+N+KXCLcG2wmJxboPGkHA5DgBB op42USe1RfWCBd2gVxCf0QZ5nF6/wYYvKTSPuDNZaMYpci3qU6MyFv7h0 hgrPLZFJNKU8Yb9N19MXDpMUQPWHejYlRJnBOdkfBPt1Ehyl/oC+xDYmC M1Jj0o0WHtcukJqOY40Sj8vnK6PwipOZk/6EkAQYJnYcGaNc07gYVlkRh Q==; X-CSE-ConnectionGUID: r8oz1U5dSOin5bKpm6fHKQ== X-CSE-MsgGUID: qO94nMVEQHuLiFIEjEc/sg== X-IronPort-AV: E=McAfee;i="6700,10204,11365"; a="41524667" X-IronPort-AV: E=Sophos;i="6.14,226,1736841600"; d="scan'208";a="41524667" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by fmvoesa112.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Mar 2025 05:23:27 -0800 X-CSE-ConnectionGUID: 2l7OHV4RS0qCN43ANTbhqw== X-CSE-MsgGUID: 3palNo8lSpCnIBiuoFoPvw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,226,1736841600"; d="scan'208";a="142243151" Received: from srr4-3-linux-103-aknautiy.iind.intel.com ([10.223.34.160]) by fmviesa002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Mar 2025 05:23:25 -0800 From: Ankit Nautiyal To: intel-gfx@lists.freedesktop.org Cc: intel-xe@lists.freedesktop.org, jani.nikula@linux.intel.com, ville.syrjala@linux.intel.com, mitulkumar.ajitkumar.golani@intel.com Subject: [PATCH 11/21] drm/i915/display: Disable PSR before disabling VRR Date: Thu, 6 Mar 2025 18:40:50 +0530 Message-ID: <20250306131100.3989503-12-ankit.k.nautiyal@intel.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250306131100.3989503-1-ankit.k.nautiyal@intel.com> References: <20250306131100.3989503-1-ankit.k.nautiyal@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" As per bspec 49268: Disable PSR before disabling VRR. Signed-off-by: Ankit Nautiyal Reviewed-by: Ville Syrjälä --- drivers/gpu/drm/i915/display/intel_display.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index f7cb38145e9d..e72c6024f33e 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -1175,6 +1175,8 @@ static void intel_pre_plane_update(struct intel_atomic_state *state, intel_atomic_get_new_crtc_state(state, crtc); enum pipe pipe = crtc->pipe; + intel_psr_pre_plane_update(state, crtc); + if (intel_crtc_vrr_disabling(state, crtc)) { intel_vrr_disable(old_crtc_state); intel_crtc_update_active_timings(old_crtc_state, false); @@ -1185,8 +1187,6 @@ static void intel_pre_plane_update(struct intel_atomic_state *state, intel_drrs_deactivate(old_crtc_state); - intel_psr_pre_plane_update(state, crtc); - if (hsw_ips_pre_update(state, crtc)) intel_crtc_wait_for_next_vblank(crtc);