From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794274130; b=Ve/WON1hamFeZRCEzCa/KYdKqQrQJlh+rIzLGE8n6c9rZ7iVhBOagmXn/iV7alLKygJd A0TDDEqO5m+k1Bs7ybVExwsEay7FB10UOq4YyRXDyS9+4AVYYNzinFajBUtA/Pj97oXR1 adQ7aW9LTX4Y8a97ADIQRM5kgM+B5lo5DGo7f5ubpS8b8kqHcKYCpVfQecQuqRtHcr+Sz RShD4F9Xp/x7lRdRkuaZPaKFSJ0T39AqqCa9kvxzp/YhyXX1auxH6nVL2ZJttBkknBFfk s2KzMWKCRbkZ/KgeH0NtKFgmpvmlqmIYGEtnsw5y1Q/25MpMuGFDGNjL1+1zkZSITIQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794274130; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: MIME-Version:Content-Type:Content-Transfer-Encoding; bh=nbrjB18s9w+8LNVWcneaabvk3Q/NbxdX/rQw2tevA/k=; b=z7GvGOUJFvQe2slsx9gmdFoAD2j+l27KLqYRXDp0DSMzsC3OnRyWszv4geSFDV+7sFbN 7dINkxYeBR0MYm2I33syj9mhHq3IFWlHkqr5igoCEoHDTKp6fi21xAr3sGS+tZVXKKFAW DahrKvwXOEPlfZk9xX6gx3Rn18SnlfF/Y7b/Olx2YO3nP2IgT0k6IjbAWT5Z8pSX9E7J+ VpGKoM5T9Rl3lfFv8vDvHdHaV3ITSjgHGb5HQXtJgNzYjuXCcIdQ6d1J+8dUqU7ii3xnt wl0vtA9duTK5ftK5mP6MuY0aR9YLhfwuYDzdjT2OR2Vn6blCq3Oqa+6RTYZd1JRVp0Q== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b="M/tkAowZ"; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 94054606A31C for ; Tue, 10 Nov 2026 01:28:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=M/tkAowZ Received: by smtp.kernel.org (Postfix) with ESMTPSA id E82881F0089F; Tue, 10 Nov 2026 01:28:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1794274130; bh=nbrjB18s9w+8LNVWcneaabvk3Q/NbxdX/rQw2tevA/k=; h=From:To:Cc:Subject:Date; b=M/tkAowZEjrUZFmE00jegCkgbtQc5hemD30kYXlmQE1oqnX8oy1jY9Z7rI1214PLs NE41TQaG6VGVixQnMS6beCaZ1iYpFFt3zjqfWSjU5jMOeTkw1qBlk/ngb8MoK0k93D xR2ED4Xn+bFeLEcynleykhNyf8GIj64lOiipuuKqRTSHHAq+bEMXjMOSvlFNP6biB3 iZ34cWwOsrjIDQb+jp52DoxYDWfRuiGfkvBffH1PWVShItZXmcg9akX9GfOqEUquXM V7FBqhBS49unCX1yLjy7/YrQ9AN2M4dWd1YH91VuxRYJO1yiOP6MubPDV2feA4sj/v Nrd9cGVv7jVqA== From: Sasha Levin To: misha@nasledov.com, alex.hung@amd.com, alexander.deucher@amd.com Cc: stable@vger.kernel.org Subject: FAILED: patch "[PATCH] drm/amd/display: Drop clock requirements on DCN32 when no displays are active" failed to apply to 5.10-stable tree Date: Mon, 9 Nov 2026 20:28:48 -0500 Message-ID: <20261109202848-failed-5.10-bba4dc330648@kernel.org> X-Mailer: git-send-email 2.53.0 X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The patch below does not apply to the 5.10-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-5.10.y git checkout FETCH_HEAD git cherry-pick -x bba4dc3306483335ddbe065c05b2d8359ec387a4 # git commit -s git send-email --to '' --in-reply-to '20261109202848-failed-5.10-bba4dc330648@kernel.org' --subject-prefix 'PATCH 5.10.y' 'HEAD^..' Thanks, Sasha ------------------ original commit in Linus's tree ------------------ >From bba4dc3306483335ddbe065c05b2d8359ec387a4 Mon Sep 17 00:00:00 2001 From: Misha Nasledov Date: Mon, 19 Oct 2026 16:42:32 -0700 Subject: [PATCH] drm/amd/display: Drop clock requirements on DCN32 when no displays are active amdgpu_dm builds the new dc_state as a copy of the old one. When the last stream is removed, dml1_validate() returns early on pipe_cnt == 0 and never reaches dcn32_calculate_dlg_params(), so bw.dcn.clk keeps the dramclk/dcfclk/fclk requirements of the display that was just turned off. dcn32_update_clocks() then keeps those hard minimums applied. On an RX 7900 XTX this leaves UCLK at 456 MHz and DCFCLK at 637 MHz with the monitor off, and the board idles at 28.4 W. With this change they drop to 96 MHz and 145 MHz and board power falls to 15.3 W. Reset the clock requirements in that case, as calculate_dlg_params() already does when no HUBP is active and as the DML2 path does for stream_count == 0. Signed-off-by: Misha Nasledov Reviewed-by: Alex Hung Signed-off-by: Alex Deucher (cherry picked from commit 0261a0ef89f37ef962fbc9dbc724ebf65fe681cf) Cc: stable@vger.kernel.org --- .../display/dc/resource/dcn32/dcn32_resource.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/display/dc/resource/dcn32/dcn32_resource.c b/drivers/gpu/drm/amd/display/dc/resource/dcn32/dcn32_resource.c index 3a6a489388435..619b9b3362fc6 100644 --- a/drivers/gpu/drm/amd/display/dc/resource/dcn32/dcn32_resource.c +++ b/drivers/gpu/drm/amd/display/dc/resource/dcn32/dcn32_resource.c @@ -1941,8 +1941,21 @@ static bool dml1_validate(struct dc *dc, struct dc_state *context, enum dc_valid out = dcn32_internal_validate_bw(dc, context, pipes, &pipe_cnt, &vlevel, validate_mode); DC_FP_END(); - if (pipe_cnt == 0) + if (pipe_cnt == 0) { + /* The context is a copy of the previous state, so without this the + * clocks the last display needed stay applied with all displays off. + */ + context->bw_ctx.bw.dcn.clk.socclk_khz = 0; + context->bw_ctx.bw.dcn.clk.dppclk_khz = 0; + context->bw_ctx.bw.dcn.clk.dcfclk_khz = 0; + context->bw_ctx.bw.dcn.clk.dcfclk_deep_sleep_khz = 0; + context->bw_ctx.bw.dcn.clk.dramclk_khz = 0; + context->bw_ctx.bw.dcn.clk.fclk_khz = 0; + context->bw_ctx.bw.dcn.clk.p_state_change_support = true; + context->bw_ctx.bw.dcn.clk.fclk_p_state_change_support = true; + context->bw_ctx.bw.dcn.clk.num_ways = 0; goto validate_out; + } if (!out) goto validate_fail; -- 2.53.0