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 3E867C3600B for ; Tue, 25 Mar 2025 11:34:48 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 02C9810E54D; Tue, 25 Mar 2025 11:34:48 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="nEFUAAWa"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.15]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3183610E545; Tue, 25 Mar 2025 11:34:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1742902483; x=1774438483; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=9/TWZFKuWG+gt0R6/mloNA/cyFOiardj1cZ6DwP/RNA=; b=nEFUAAWaPqG4OMZXX2ni9tEsTUWLKnwVpYaNxnGEtXhZ6BwVgcs8ixW6 UR50F5zHcaI1/lqR5fBmJFlhPYDLTLJ+bWImQW6kdCYbAqsJgSqWWBdaU KMo1qAVS2+cFT4wmxEaSQQHnC/fpzvkg3PgeyTI/hkL7c54sTeAaR7L26 q/BLx9ifpqIrqNPNdCLOrz33TbFiKnxM9pllOs3NX+qnMZymG9ceoGKLG eB55fRW05OVvAGdnsUJ07679ZhLSb0ya+rguMXAw6SDC9z+3OxgCm+opT tJSdmf1/lvZX5WY27wHP68hLVuXO6J++eWw/vUHs4Q4anBTqLeQQkgP27 A==; X-CSE-ConnectionGUID: jGO4DKDATSWZ8XCLaK2ppQ== X-CSE-MsgGUID: swAOOBYmS2yrcEETRf+mYQ== X-IronPort-AV: E=McAfee;i="6700,10204,11383"; a="44266903" X-IronPort-AV: E=Sophos;i="6.14,274,1736841600"; d="scan'208";a="44266903" Received: from orviesa009.jf.intel.com ([10.64.159.149]) by fmvoesa109.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Mar 2025 04:34:43 -0700 X-CSE-ConnectionGUID: LkH0s2JaQui3k4YvcGyH0Q== X-CSE-MsgGUID: mCWe7IfwQ5ujjECxucSLmQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,274,1736841600"; d="scan'208";a="124070544" Received: from srr4-3-linux-103-aknautiy.iind.intel.com ([10.223.34.160]) by orviesa009-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Mar 2025 04:34:41 -0700 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 03/16] drm/i915/display: Disable PSR before disabling VRR Date: Tue, 25 Mar 2025 16:52:36 +0530 Message-ID: <20250325112249.228444-4-ankit.k.nautiyal@intel.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250325112249.228444-1-ankit.k.nautiyal@intel.com> References: <20250325112249.228444-1-ankit.k.nautiyal@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" 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 b852ffe94a10..53675a92bbf5 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -1174,6 +1174,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); @@ -1184,8 +1186,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); -- 2.45.2