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 D6A5F4D599 for ; Sat, 23 Aug 2025 23:46:49 +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=1755992809; cv=none; b=qzDV49bFjT8jH6pOaZUfmhpVKKey4klAQlnsEE+W4WS9FeUPi59hhvpBm4/9oDnN+bqxqi83vyJYwzdg7HhVFMV8LKWBdANkHU317r4X6/ufqH5Xp1fgyP/D60uVqtXnHAR+7r1L3sA6Q96Wbt7+w9zvgeXA0C12+iWpJyxHbdY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755992809; c=relaxed/simple; bh=S1tCl0CWPFIcfIClRaAaoaD2XHbAlw3HVAEEZIvndKs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=JOPmm32FB+kJQ6ZkI3QPb5VYm4z9xJmjvfHgTul+qmUSYgm3gzVGz2rvEoVNFxhuAdsc7ehWR5FsLIYSesGB6HQVKiRM0BSIBMCZkYRgZn3sn+Gv+d+3KfCUYHvV/WN8OQOZAZLzfeD2ZX3xta7gqbNL4ssvf5jh7hZUNrtZo44= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=KZC8pyuN; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="KZC8pyuN" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A8BD5C4CEE7; Sat, 23 Aug 2025 23:46:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1755992809; bh=S1tCl0CWPFIcfIClRaAaoaD2XHbAlw3HVAEEZIvndKs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KZC8pyuNjTDAjszMhFp8yfTRnZ3uAgpbqoXrlwBOxJAoV3XTZ2RR4FnWlP5/rlzDH o550Q6y0xX/RL+kAtkKZkPxNsgJIDj4xgY3oRSjrcAmdS3X9ez6fpoYEm81pgopoCH iI4ylc4rY9Hx8Emo7cmUJLjrgt6Xga20FW5XcGG1iwzaQ6yTwkTCTOQi2MAxzkbWIn wM77BmVxcTx1RA9LYwEXaTEtp2FUABfc24mj5gdXx3oQNuvgwi44pYr9o8TLLC2X4E qVMSXdD1hsTVERKLjySHj90EjpZKYCB4qVNWk0gWJh2UBv+ac0RuGgnRHiq0IG69PA Jp7TcDFesOArw== From: Sasha Levin To: stable@vger.kernel.org Cc: =?UTF-8?q?Timur=20Krist=C3=B3f?= , Alex Deucher , Rodrigo Siqueira , Alex Hung , Sasha Levin Subject: [PATCH 6.6.y] drm/amd/display: Don't overclock DCE 6 by 15% Date: Sat, 23 Aug 2025 19:46:46 -0400 Message-ID: <20250823234647.2465453-1-sashal@kernel.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <2025082336-hasty-pregame-9547@gregkh> References: <2025082336-hasty-pregame-9547@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=UTF-8 Content-Transfer-Encoding: 8bit From: Timur Kristóf [ Upstream commit cb7b7ae53b557d168b4af5cd8549f3eff920bfb5 ] The extra 15% clock was added as a workaround for a Polaris issue which uses DCE 11, and should not have been used on DCE 6 which is already hardcoded to the highest possible display clock. Unfortunately, the extra 15% was mistakenly copied and kept even on code paths which don't affect Polaris. This commit fixes that and also adds a check to make sure not to exceed the maximum DCE 6 display clock. Fixes: 8cd61c313d8b ("drm/amd/display: Raise dispclk value for Polaris") Fixes: dc88b4a684d2 ("drm/amd/display: make clk mgr soc specific") Fixes: 3ecb3b794e2c ("drm/amd/display: dc/clk_mgr: add support for SI parts (v2)") Signed-off-by: Timur Kristóf Acked-by: Alex Deucher Reviewed-by: Rodrigo Siqueira Reviewed-by: Alex Hung Signed-off-by: Alex Deucher (cherry picked from commit 427980c1cbd22bb256b9385f5ce73c0937562408) Cc: stable@vger.kernel.org [ `MIN` => `min` ] Signed-off-by: Sasha Levin --- .../gpu/drm/amd/display/dc/clk_mgr/dce60/dce60_clk_mgr.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/clk_mgr/dce60/dce60_clk_mgr.c b/drivers/gpu/drm/amd/display/dc/clk_mgr/dce60/dce60_clk_mgr.c index 0267644717b2..0d6743c37102 100644 --- a/drivers/gpu/drm/amd/display/dc/clk_mgr/dce60/dce60_clk_mgr.c +++ b/drivers/gpu/drm/amd/display/dc/clk_mgr/dce60/dce60_clk_mgr.c @@ -123,11 +123,9 @@ static void dce60_update_clocks(struct clk_mgr *clk_mgr_base, { struct clk_mgr_internal *clk_mgr_dce = TO_CLK_MGR_INTERNAL(clk_mgr_base); struct dm_pp_power_level_change_request level_change_req; - int patched_disp_clk = context->bw_ctx.bw.dce.dispclk_khz; - - /*TODO: W/A for dal3 linux, investigate why this works */ - if (!clk_mgr_dce->dfs_bypass_active) - patched_disp_clk = patched_disp_clk * 115 / 100; + const int max_disp_clk = + clk_mgr_dce->max_clks_by_state[DM_PP_CLOCKS_STATE_PERFORMANCE].display_clk_khz; + int patched_disp_clk = min(max_disp_clk, context->bw_ctx.bw.dce.dispclk_khz); level_change_req.power_level = dce_get_required_clocks_state(clk_mgr_base, context); /* get max clock state from PPLIB */ -- 2.50.1