Skip to content

Commit a67753e

Browse files
jntestevessmb49
authored andcommitted
drm/amd/pm: Fix output of pp_od_clk_voltage
BugLink: https://bugs.launchpad.net/bugs/2028979 commit 40baba5 upstream. Printing the other clock types should not be conditioned on being able to print OD_SCLK. Some GPUs currently have limited capability of only printing a subset of these. Since this condition was introduced in v5.18-rc1, reading from `pp_od_clk_voltage` has been returning empty on the Asus ROG Strix G15 (2021). Fixes: 79c65f3 ("drm/amd/pm: do not expose power implementation details to amdgpu_pm.c") Reviewed-by: Evan Quan <evan.quan@amd.com> Signed-off-by: Jonatas Esteves <jntesteves@gmail.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Kamal Mostafa <kamal@canonical.com> Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
1 parent d2c673e commit a67753e

1 file changed

Lines changed: 5 additions & 7 deletions

File tree

drivers/gpu/drm/amd/pm/amdgpu_pm.c

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -869,13 +869,11 @@ static ssize_t amdgpu_get_pp_od_clk_voltage(struct device *dev,
869869
}
870870
if (ret == -ENOENT) {
871871
size = amdgpu_dpm_print_clock_levels(adev, OD_SCLK, buf);
872-
if (size > 0) {
873-
size += amdgpu_dpm_print_clock_levels(adev, OD_MCLK, buf + size);
874-
size += amdgpu_dpm_print_clock_levels(adev, OD_VDDC_CURVE, buf + size);
875-
size += amdgpu_dpm_print_clock_levels(adev, OD_VDDGFX_OFFSET, buf + size);
876-
size += amdgpu_dpm_print_clock_levels(adev, OD_RANGE, buf + size);
877-
size += amdgpu_dpm_print_clock_levels(adev, OD_CCLK, buf + size);
878-
}
872+
size += amdgpu_dpm_print_clock_levels(adev, OD_MCLK, buf + size);
873+
size += amdgpu_dpm_print_clock_levels(adev, OD_VDDC_CURVE, buf + size);
874+
size += amdgpu_dpm_print_clock_levels(adev, OD_VDDGFX_OFFSET, buf + size);
875+
size += amdgpu_dpm_print_clock_levels(adev, OD_RANGE, buf + size);
876+
size += amdgpu_dpm_print_clock_levels(adev, OD_CCLK, buf + size);
879877
}
880878

881879
if (size == 0)

0 commit comments

Comments
 (0)