From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 9BC0D483817 for ; Mon, 5 Oct 2026 13:13:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791206034; cv=none; b=gjbiDagFWrCPokR3i/YYypUqf7RLHzTgDQn/hd/FPmJQE3QcbYr5UOt9/n3g74WMi6CrhEAKog3ZQEfjoZVNIRfbmOs+p5XO775ZeyUKjh7XSm4lMqUBrqwbqx1SdrRh3bW3xjLNW46LFmMWyhrjExgZB0uUt8NrcCRs2Ou661U= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791206034; c=relaxed/simple; bh=7Wuw1YxGtjnkBXkbkQ8baij3Mlyu1PxXqVAnAEHtSaM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=itOsSf+aBZBu3QxuI/RZiwb4V7d8gZVUZVtZoeg1Q2vvXad0mfFcAP9xj+6gApn2mj8WkDCXbk4Z9nNNzW6S9y+sayGTHspHtvQP5ameyanWYEmqJPl//qNFOp6ryJK1cyV+RWPYoJvq4ZNnqqz3XaTRtFuWAstNVL6gKqo0LIo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=TH7Gqy9i; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="TH7Gqy9i" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0A41B1F00899; Mon, 5 Oct 2026 13:13:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1791206033; bh=d/nfV8oUPoVXcPuEXZa5ZPyhoMU0ZrexTYqyLSbSfx4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=TH7Gqy9i/3PaMsqWi/eyyb9qVrnCus56gZW3f4xsuQ4Pj5s2ZFdiNZ4OQz3mgBex2 ir0e4w2kBVmKnoH5EQiQfZk/DzOI1FiiXvlzGWAnA2sncPUMh7tUjCm2+9pbkEVx14 gXdC02M1pA+mystGHVV+SCNfq608pRvDBof0/u7kW3aEkpyjE9EWso5NxBJunHa77T DVAhS2sHDOa4laHX2PjXYsj5XupCYROmR4DKdd6HmyBLf80Wv5yqNvDedHaS/7a1cR 38L9/ldJcw1Einug1v0iI6KShzw2J4aX5bmGQ8W6/L/79V6DyjWYuBEw/v7wpnFb+w MKXI6YwPme2Fw== From: Sasha Levin To: stable@vger.kernel.org Cc: =?UTF-8?q?Timur=20Krist=C3=B3f?= , Mario Limonciello , Alex Deucher , Sasha Levin Subject: [PATCH 5.15.y] drm/amd/pm/si: Fix updating clock limits on AC/DC Date: Mon, 5 Oct 2026 09:13:50 -0400 Message-ID: <20261005131331.2596237-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026100545-whole-mutiny-321e@gregkh> References: <2026100545-whole-mutiny-321e@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 08c9100f65299c64439e22e6057d750ae0e6c660 ] Assume that the AC limits are the maximum of all power states, and the DC limits are the maximum of battery power states. This shouldn't make any difference in practice, but is cleaner and more robust against bogus information in the VBIOS. Fixes: e6c5d36756e7 ("drm/amd/pm/si: Fix updating clock limits from power states") Signed-off-by: Timur Kristóf Reviewed-by: Mario Limonciello Link: https://patch.msgid.link/20260923120354.1027996-2-timur.kristof@gmail.com Signed-off-by: Mario Limonciello Signed-off-by: Alex Deucher (cherry picked from commit ef8cb9dcc7db7b7abcbdbe870a080cc81e4f0bf3) Cc: stable@vger.kernel.org Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/pm/powerplay/si_dpm.c | 36 +++++++++++------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/drivers/gpu/drm/amd/pm/powerplay/si_dpm.c b/drivers/gpu/drm/amd/pm/powerplay/si_dpm.c index 8cf2ad07ce620..069bf1d67c849 100644 --- a/drivers/gpu/drm/amd/pm/powerplay/si_dpm.c +++ b/drivers/gpu/drm/amd/pm/powerplay/si_dpm.c @@ -7132,6 +7132,19 @@ static void si_parse_pplib_non_clock_info(struct amdgpu_device *adev, adev->pm.dpm.uvd_ps = rps; } +static void si_update_limits(struct amdgpu_clock_and_voltage_limits *limits, + struct rv7xx_pl *pl) +{ + if (pl->sclk > limits->sclk) + limits->sclk = pl->sclk; + if (pl->mclk > limits->mclk) + limits->mclk = pl->mclk; + if (pl->vddc > limits->vddc) + limits->vddc = pl->vddc; + if (pl->vddci > limits->vddci) + limits->vddci = pl->vddci; +} + static void si_parse_pplib_clock_info(struct amdgpu_device *adev, struct amdgpu_ps *rps, int index, union pplib_clock_info *clock_info) @@ -7140,7 +7153,6 @@ static void si_parse_pplib_clock_info(struct amdgpu_device *adev, struct evergreen_power_info *eg_pi = evergreen_get_pi(adev); struct si_power_info *si_pi = si_get_pi(adev); struct si_ps *ps = si_get_ps(rps); - struct amdgpu_clock_and_voltage_limits *limits; u16 leakage_voltage; struct rv7xx_pl *pl = &ps->performance_levels[index]; int ret; @@ -7205,26 +7217,14 @@ static void si_parse_pplib_clock_info(struct amdgpu_device *adev, * VBIOS can contain conflicting values between: * - the maximum allowed clocks and voltages on AC or DC * - the clocks and voltages in power states on AC or DC + * + * Assume that the AC limits are the maximum of all power states, + * and the DC limits are the maximum of battery power states. */ + si_update_limits(&adev->pm.dpm.dyn_state.max_clock_voltage_on_ac, pl); if ((rps->class & ATOM_PPLIB_CLASSIFICATION_UI_MASK) == - ATOM_PPLIB_CLASSIFICATION_UI_PERFORMANCE) - limits = &adev->pm.dpm.dyn_state.max_clock_voltage_on_ac; - else if ((rps->class & ATOM_PPLIB_CLASSIFICATION_UI_MASK) == ATOM_PPLIB_CLASSIFICATION_UI_BATTERY) - limits = &adev->pm.dpm.dyn_state.max_clock_voltage_on_dc; - else - limits = NULL; - - if (limits) { - if (pl->sclk > limits->sclk) - limits->sclk = pl->sclk; - if (pl->mclk > limits->mclk) - limits->mclk = pl->mclk; - if (pl->vddc > limits->vddc) - limits->vddc = pl->vddc; - if (pl->vddci > limits->vddci) - limits->vddci = pl->vddci; - } + si_update_limits(&adev->pm.dpm.dyn_state.max_clock_voltage_on_dc, pl); } union pplib_power_state { -- 2.53.0