From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 611F72620D5 for ; Mon, 24 Mar 2025 16:22:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742833372; cv=none; b=fKdJh4jSNySJUuNDAVLEKF9vpXqXKoFETL70dCo+m044Oj+uVlEpfBKMuFIx3yZld2RSBcpQ+Lnc9oiVuX3kq/qSy3OEor1IK2fYL3dvu9kgb8pThuYOTozwRICYk/qPPYd5dcGuq017gsYxbcp0S7Uik0eISs3ARME62Ses7is= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742833372; c=relaxed/simple; bh=uj9Nv0F9QKXepxQ58BTTwAN78p9vupI1NQTGn1VUH8E=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=EwjxdMrSb+oZQKoQg21eg/CnE1byswGuUSBZLRNjOoECjl3FxS8YI36rHhcO0SB0aRE/rpBKQMeL7cTSy3jLbARsmrUZubYxbvXlPEHv9SNabDsf3iRlsQ6tO/GzfC+5uXn5LCLZFlnw5g3QBiigOPgKcj1oEUZSfgH6LFa4Owg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ZyDIB1Yn; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="ZyDIB1Yn" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AAC17C4CEDD; Mon, 24 Mar 2025 16:22:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1742833371; bh=uj9Nv0F9QKXepxQ58BTTwAN78p9vupI1NQTGn1VUH8E=; h=Subject:To:Cc:From:Date:From; b=ZyDIB1YnEOWiRO2xT2UHoNvgTDaK79JlCONZsqTpzYsV9VsIGdXoiz4gBzw9djFjE fFAp2F9T0l47Mb6eTVwHozPjSMOl7Geu9cXAN6/G9CW++S7lG051LZ0ubYtvdFMd6G bwe1eddbwamw3LMuNVA7F5rzZ6zErkq/8haCZkvk= Subject: FAILED: patch "[PATCH] drm/amd/display: Use HW lock mgr for PSR1 when only one eDP" failed to apply to 6.1-stable tree To: mario.limonciello@amd.com,alex.hung@amd.com,alexander.deucher@amd.com,chiahsuan.chung@amd.com,daniel.wheeler@amd.com Cc: From: Date: Mon, 24 Mar 2025 09:21:29 -0700 Message-ID: <2025032429-chirpy-penholder-af16@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x acbf16a6ae775b4db86f537448cc466288aa307e # git commit -s git send-email --to '' --in-reply-to '2025032429-chirpy-penholder-af16@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From acbf16a6ae775b4db86f537448cc466288aa307e Mon Sep 17 00:00:00 2001 From: Mario Limonciello Date: Fri, 7 Mar 2025 15:55:20 -0600 Subject: [PATCH] drm/amd/display: Use HW lock mgr for PSR1 when only one eDP [WHY] DMUB locking is important to make sure that registers aren't accessed while in PSR. Previously it was enabled but caused a deadlock in situations with multiple eDP panels. [HOW] Detect if multiple eDP panels are in use to decide whether to use lock. Refactor the function so that the first check is for PSR-SU and then replay is in use to prevent having to look up number of eDP panels for those configurations. Fixes: f245b400a223 ("Revert "drm/amd/display: Use HW lock mgr for PSR1"") Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/3965 Reviewed-by: ChiaHsuan Chung Signed-off-by: Mario Limonciello Signed-off-by: Alex Hung Tested-by: Daniel Wheeler Signed-off-by: Alex Deucher (cherry picked from commit ed569e1279a3045d6b974226c814e071fa0193a6) Cc: stable@vger.kernel.org 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 bf636b28e3e1..6e2fce329d73 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 @@ -69,5 +69,16 @@ bool should_use_dmub_lock(struct dc_link *link) if (link->replay_settings.replay_feature_enabled) return true; + /* only use HW lock for PSR1 on single eDP */ + if (link->psr_settings.psr_version == DC_PSR_VERSION_1) { + struct dc_link *edp_links[MAX_NUM_EDP]; + int edp_num; + + dc_get_edp_links(link->dc, edp_links, &edp_num); + + if (edp_num == 1) + return true; + } + return false; }