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 33ACFC0219D for ; Tue, 11 Feb 2025 01:32:22 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A927710E629; Tue, 11 Feb 2025 01:32:21 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="SqN3dYvv"; dkim-atps=neutral Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by gabe.freedesktop.org (Postfix) with ESMTPS id 043AA10E629; Tue, 11 Feb 2025 01:32:21 +0000 (UTC) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id A639AA4209A; Tue, 11 Feb 2025 01:30:34 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E0A96C4CED1; Tue, 11 Feb 2025 01:32:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1739237539; bh=NmqdavnhcYMYJi7NzOk/aLK8R3nAiUSCjBp6O2Qp7LI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SqN3dYvvUfgd9p6lkujfOCgZJJNujImv9ylprpw8nnPIthXi/DxnnTr7OaXv8IHvT Dd9B+2d1rJyZMT7UQdqY/vlLLfeT8luwEwfPnSjDRSzIxA0O5e72Z2Eyz24eM0aoOi nzxav9Rk6O2rFebNfyPkfen26cXU3+I7+ejLULEEPyazcnElqZlaLA3vAguFKPRV8G XyfDMxYl0X25gGhVtatDE+mvQxFWrYXmsmRhc3RLi2gDaaye9ra6GyvxcOoeA5aIQp t0PIrf9hH7eQVdggTvSRJ6mNNt4aAcXT1x0t4dqag01NFijKDRzipDNuWpD8hEdkCq ixn4iCC9E5nfg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Tom Chung , Wayne Lin , Alex Deucher , Sasha Levin , harry.wentland@amd.com, sunpeng.li@amd.com, Rodrigo.Siqueira@amd.com, christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@gmail.com, simona@ffwll.ch, robin.chen@amd.com, aurabindo.pillai@amd.com, martin.tsai@amd.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 6.1 07/11] Revert "drm/amd/display: Use HW lock mgr for PSR1" Date: Mon, 10 Feb 2025 20:32:02 -0500 Message-Id: <20250211013206.4098522-7-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250211013206.4098522-1-sashal@kernel.org> References: <20250211013206.4098522-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.1.128 Content-Transfer-Encoding: 8bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Tom Chung [ Upstream commit f245b400a223a71d6d5f4c72a2cb9b573a7fc2b6 ] This reverts commit a2b5a9956269 ("drm/amd/display: Use HW lock mgr for PSR1") Because it may cause system hang while connect with two edp panel. Acked-by: Wayne Lin Signed-off-by: Tom Chung Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/dc/dce/dmub_hw_lock_mgr.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/dce/dmub_hw_lock_mgr.c b/drivers/gpu/drm/amd/display/dc/dce/dmub_hw_lock_mgr.c index 8d7b2eee8c7c3..3f32e9c3fbaf4 100644 --- a/drivers/gpu/drm/amd/display/dc/dce/dmub_hw_lock_mgr.c +++ b/drivers/gpu/drm/amd/display/dc/dce/dmub_hw_lock_mgr.c @@ -65,8 +65,7 @@ void dmub_hw_lock_mgr_inbox0_cmd(struct dc_dmub_srv *dmub_srv, bool should_use_dmub_lock(struct dc_link *link) { - if (link->psr_settings.psr_version == DC_PSR_VERSION_SU_1 || - link->psr_settings.psr_version == DC_PSR_VERSION_1) + if (link->psr_settings.psr_version == DC_PSR_VERSION_SU_1) return true; return false; } -- 2.39.5