From patchwork Fri Feb 14 12:11:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Nautiyal, Ankit K" X-Patchwork-Id: 13974818 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 7507EC02198 for ; Fri, 14 Feb 2025 12:22:49 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 141C110EC6E; Fri, 14 Feb 2025 12:22:49 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="CLth1mjj"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.13]) by gabe.freedesktop.org (Postfix) with ESMTPS id A12B610EC6E; Fri, 14 Feb 2025 12:22: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=1739535769; x=1771071769; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Wcuwb+sxLxyHXUJhcCp0Kv8Iyv90Va5cJY3h3h1Konc=; b=CLth1mjjDuR5NKqQ53h5f9itYh/hIqCOlHkhOTH+hnw6l00YLITPr96F OBTRagoxDlrAdTqpa6eslVBhxvrFEEusmTKDZfYZW+Eh8UN6gTObmJjBf /Td+czAZ+RTDOOXrY0VlfYZe68ej+pRidY7i81Ew1HKrn4ng0+ZVT9+P5 Ry7TLiSCk4nrDIV+Ywmnfs9wG6hn0W1VFA9hK2Qs1eBYBQrJF+xTYllVh CZ935gUj4Pp6+DsNr1T3pEXUDfKz41mO9hhIsFh27BFEP1jZVVQ60f38y gu/JM5v/rDtUW2C0dU0sJRsMXVNO0912rz4eYK6B0idRPVE/fbuzEhbdy g==; X-CSE-ConnectionGUID: QHRLnigSTA2NzHJYsJuSmA== X-CSE-MsgGUID: CaGeLoqnSyOHkeGzbuDyaQ== X-IronPort-AV: E=McAfee;i="6700,10204,11345"; a="51256005" X-IronPort-AV: E=Sophos;i="6.13,285,1732608000"; d="scan'208";a="51256005" Received: from fmviesa006.fm.intel.com ([10.60.135.146]) by orvoesa105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Feb 2025 04:22:48 -0800 X-CSE-ConnectionGUID: RTnZ4KygQdaWTbCnCBl3Qw== X-CSE-MsgGUID: jR+CR++bT/OBSe8xAkBM9Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.13,285,1732608000"; d="scan'208";a="113309573" Received: from srr4-3-linux-103-aknautiy.iind.intel.com ([10.223.34.160]) by fmviesa006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Feb 2025 04:22:46 -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/19] drm/i915/display: Disable PSR before disabling VRR Date: Fri, 14 Feb 2025 17:41:21 +0530 Message-ID: <20250214121130.1808451-12-ankit.k.nautiyal@intel.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250214121130.1808451-1-ankit.k.nautiyal@intel.com> References: <20250214121130.1808451-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 --- 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 0fec343ddc0d..47d8dbf39b5c 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -1313,6 +1313,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); @@ -1323,8 +1325,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);