drm/amd/pm: Use emit_clk_levels in SMUv13.0.4

Move to emit_clk_levels from print_clk_levels

Signed-off-by: Lijo Lazar <lijo.lazar@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git 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
index 6908f9930f1696a70c7a3321e96c5b0b6d15150c..b0fa726ea25dec7172eb7f0078d492334bbda8bb 100644 (file)
--- 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
@@ -494,16 +494,14 @@ static int smu_v13_0_4_get_dpm_level_count(struct smu_context *smu,
        return 0;
 }
 
-static int smu_v13_0_4_print_clk_levels(struct smu_context *smu,
-                                       enum smu_clk_type clk_type, char *buf)
+static int smu_v13_0_4_emit_clk_levels(struct smu_context *smu,
+                                      enum smu_clk_type clk_type, char *buf,
+                                      int *offset)
 {
-       int i, idx, size = 0, ret = 0, start_offset = 0;
+       int i, idx, size = *offset, ret = 0, start_offset = *offset;
        uint32_t cur_value = 0, value = 0, count = 0;
        uint32_t min, max;
 
-       smu_cmn_get_sysfs_buf(&buf, &size);
-       start_offset = size;
-
        switch (clk_type) {
        case SMU_OD_SCLK:
                size += sysfs_emit_at(buf, size, "%s:\n", "OD_SCLK");
@@ -525,17 +523,17 @@ static int smu_v13_0_4_print_clk_levels(struct smu_context *smu,
        case SMU_FCLK:
                ret = smu_v13_0_4_get_current_clk_freq(smu, clk_type, &cur_value);
                if (ret)
-                       break;
+                       return ret;
 
                ret = smu_v13_0_4_get_dpm_level_count(smu, clk_type, &count);
                if (ret)
-                       break;
+                       return ret;
 
                for (i = 0; i < count; i++) {
                        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;
+                               return ret;
 
                        size += sysfs_emit_at(buf, size, "%d: %uMhz %s\n", i, value,
                                              cur_value == value ? "*" : "");
@@ -545,7 +543,7 @@ static int smu_v13_0_4_print_clk_levels(struct smu_context *smu,
        case SMU_SCLK:
                ret = smu_v13_0_4_get_current_clk_freq(smu, clk_type, &cur_value);
                if (ret)
-                       break;
+                       return ret;
                min = (smu->gfx_actual_hard_min_freq > 0) ? smu->gfx_actual_hard_min_freq : smu->gfx_default_hard_min_freq;
                max = (smu->gfx_actual_soft_max_freq > 0) ? smu->gfx_actual_soft_max_freq : smu->gfx_default_soft_max_freq;
                if (cur_value  == max)
@@ -566,7 +564,9 @@ static int smu_v13_0_4_print_clk_levels(struct smu_context *smu,
                break;
        }
 
-       return size - start_offset;
+       *offset += size - start_offset;
+
+       return 0;
 }
 
 static int smu_v13_0_4_read_sensor(struct smu_context *smu,
@@ -1114,7 +1114,7 @@ static const struct pptable_funcs smu_v13_0_4_ppt_funcs = {
        .mode2_reset = smu_v13_0_4_mode2_reset,
        .get_dpm_ultimate_freq = smu_v13_0_4_get_dpm_ultimate_freq,
        .od_edit_dpm_table = smu_v13_0_od_edit_dpm_table,
-       .print_clk_levels = smu_v13_0_4_print_clk_levels,
+       .emit_clk_levels = smu_v13_0_4_emit_clk_levels,
        .force_clk_levels = smu_v13_0_4_force_clk_levels,
        .set_performance_level = smu_v13_0_4_set_performance_level,
        .set_fine_grain_gfx_freq_parameters = smu_v13_0_4_set_fine_grain_gfx_freq_parameters,