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=1793212823; b=YX+VX3fZWolhdzcRjMR0WeH3eopKearL7tQqc3fybrHUzt0kNzbfHmp3k6kBI/0qtAp+ c4sLDQmJYwLQwgS4u7vEL83sxVZ5C9DQTlX5Y9ayjuCugVG6cQ4ewZ+yWyOFU/NoErn2l y9D/pnDlXC000HCZLLN3ynlPVuVCv0A7GgQV75c00TVWGy6WGtKCKF3hSmJvOq7Fkjhpo MFNgjwie0N0R8+Ek3tnQZ9fp2IzrOIATeMjMKYlzGUnsZ7nIpDuNvOls+nDDdNjkX4YqW h3Oucu9KKT9mGSO75TIrDMK9MQmIsW9E/7zl7d7TsRlho379iWZMhEgS3EgwmTUmqAQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793212823; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Type:Content-Transfer-Encoding; bh=KKmwtX2ehoR3vPsGt4Ksu/LNwmG0oPYq5jQ5/eig+nk=; b=CUIh+7MONI+DvHOeYumtuIqE5n42BNh1blSuk60GP6i2djdHa1h5AFeJlZHv1HGVHJXW X3ePXfASg0T4xQMqojIJg2yjvNDrHP2xvvmMA2lyQDZNGZBpzHugRwugKxzelXYnMyOeC HvsZ6Nn22HUxokIGaJMdd0lLx8lpiqDy/zJ1uUkrSkbYjc40Aa3kOf8v3G5ojTIsy9O4g 1BFWDSpTHp2/QoXSkr3Cfe6C1nVQlTIooHkIObH40aGrpjXrlbZ9NUGbWKHXOdsGjkpR/ t9hBAU7ZZpxaeps9qlAGlujx/I0nGagZ7GpY+bfgpXgIQMfN0z2+5aowhk3CK7Kky/g== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=itD1qify; 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 1A72E606A31C; Wed, 28 Oct 2026 18:40:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key, unprotected) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=itD1qify Received: by smtp.kernel.org (Postfix) with ESMTPSA id 69C0E1F01828; Wed, 28 Oct 2026 18:40:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1793212823; bh=KKmwtX2ehoR3vPsGt4Ksu/LNwmG0oPYq5jQ5/eig+nk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=itD1qifyBWkO2n7ZWAomnBdXDRDyKqiHWuCrwXk3zXnwKMBiqsUscRU7Ulk+Ebp1x ywTUap/gQtndZR9SrMTDHRzGZcb3FsEisBIOm112uPMjF5zLqfnyWytS3EZxpMmnNm I4wEZ6uFXFkwnvatQTNIc8PseUb/4zLT8cQ1bqWk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, =?UTF-8?q?Timur=20Krist=C3=B3f?= , Mario Limonciello , Alex Deucher Subject: [PATCH 6.1 0252/1887] drm/amd/pm/si: Fix updating clock limits on AC/DC Date: Wed, 28 Oct 2026 17:39:08 +0100 Message-ID: <20261028170504.966064144@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261028170459.200466217@linuxfoundation.org> References: <20261028170459.200466217@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev 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 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Timur Kristóf commit 08c9100f65299c64439e22e6057d750ae0e6c660 upstream. 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: Greg Kroah-Hartman --- drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c | 36 ++++++++++++++--------------- 1 file changed, 18 insertions(+), 18 deletions(-) --- a/drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c +++ b/drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c @@ -7211,6 +7211,19 @@ static void si_parse_pplib_non_clock_inf 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) @@ -7219,7 +7232,6 @@ static void si_parse_pplib_clock_info(st 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; @@ -7284,26 +7296,14 @@ static void si_parse_pplib_clock_info(st * 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 {