This is a note to let you know that I've just added the patch titled
drm/amd/pm: reverse mclk and fclk clocks levels for SMU v13.0.4
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-amd-pm-reverse-mclk-and-fclk-clocks-levels-for-smu-v13.0.4.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 6a07826f2057b5fa1c479ba56460195882464270 Mon Sep 17 00:00:00 2001
From: Tim Huang <Tim.Huang@xxxxxxx>
Date: Sun, 21 May 2023 09:24:00 +0800
Subject: drm/amd/pm: reverse mclk and fclk clocks levels for SMU v13.0.4
From: Tim Huang <Tim.Huang@xxxxxxx>
commit 6a07826f2057b5fa1c479ba56460195882464270 upstream.
This patch reverses the DPM clocks levels output of pp_dpm_mclk
and pp_dpm_fclk.
On dGPUs and older APUs we expose the levels from lowest clocks
to highest clocks. But for some APUs, the clocks levels that from
the DFPstateTable are given the reversed orders by PMFW. Like the
memory DPM clocks that are exposed by pp_dpm_mclk.
It's not intuitive that they are reversed on these APUs. All tools
and software that talks to the driver then has to know different ways
to interpret the data depending on the asic.
So we need to reverse them to expose the clocks levels from the
driver consistently.
Signed-off-by: Tim Huang <Tim.Huang@xxxxxxx>
Reviewed-by: Alex Deucher <alexander.deucher@xxxxxxx>
Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>
Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c
@@ -478,7 +478,7 @@ static int smu_v13_0_4_get_dpm_level_cou
static int smu_v13_0_4_print_clk_levels(struct smu_context *smu,
enum smu_clk_type clk_type, char *buf)
{
- int i, size = 0, ret = 0;
+ int i, idx, size = 0, ret = 0;
uint32_t cur_value = 0, value = 0, count = 0;
uint32_t min, max;
@@ -512,7 +512,8 @@ static int smu_v13_0_4_print_clk_levels(
break;
for (i = 0; i < count; i++) {
- ret = smu_v13_0_4_get_dpm_freq_by_index(smu, clk_type, i, &value);
+ idx = (clk_type == SMU_FCLK || clk_type == SMU_MCLK) ? (count - i - 1) : i;
+ ret = smu_v13_0_4_get_dpm_freq_by_index(smu, clk_type, idx, &value);
if (ret)
break;
Patches currently in stable-queue which might be from Tim.Huang@xxxxxxx are
queue-6.1/drm-amd-pm-reverse-mclk-clocks-levels-for-smu-v13.0.5.patch
queue-6.1/drm-amd-pm-reverse-mclk-and-fclk-clocks-levels-for-yellow-carp.patch
queue-6.1/drm-amd-pm-reverse-mclk-and-fclk-clocks-levels-for-vangogh.patch
queue-6.1/drm-amd-pm-reverse-mclk-and-fclk-clocks-levels-for-renoir.patch
queue-6.1/drm-amd-pm-reverse-mclk-and-fclk-clocks-levels-for-smu-v13.0.4.patch
