Move to emit_clk_levels from print_clk_levels
Signed-off-by: Lijo Lazar <[email protected]>
---
.../drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 21 +++++++++----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c
b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c
index a3fc35b9011e..4e699d3ab1e3 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c
@@ -1173,27 +1173,24 @@ static int smu_v13_0_7_upload_overdrive_table(struct
smu_context *smu,
return ret;
}
-static int smu_v13_0_7_print_clk_levels(struct smu_context *smu,
- enum smu_clk_type clk_type,
- char *buf)
+static int smu_v13_0_7_emit_clk_levels(struct smu_context *smu,
+ enum smu_clk_type clk_type, char *buf,
+ int *offset)
{
struct smu_dpm_context *smu_dpm = &smu->smu_dpm;
struct smu_13_0_dpm_context *dpm_context = smu_dpm->dpm_context;
OverDriveTableExternal_t *od_table =
(OverDriveTableExternal_t *)smu->smu_table.overdrive_table;
+ int i, curr_freq, size = *offset, start_offset = *offset;
struct smu_13_0_dpm_table *single_dpm_table;
struct smu_13_0_pcie_table *pcie_table;
uint32_t gen_speed, lane_width;
- int i, curr_freq, size = 0, start_offset = 0;
int32_t min_value, max_value;
int ret = 0;
- smu_cmn_get_sysfs_buf(&buf, &size);
- start_offset = size;
-
if (amdgpu_ras_intr_triggered()) {
- size += sysfs_emit_at(buf, size, "unavailable\n");
- return size - start_offset;
+ sysfs_emit_at(buf, size, "unavailable\n");
+ return -EBUSY;
}
switch (clk_type) {
@@ -1524,7 +1521,9 @@ static int smu_v13_0_7_print_clk_levels(struct
smu_context *smu,
break;
}
- return size - start_offset;
+ *offset += size - start_offset;
+
+ return 0;
}
static int smu_v13_0_7_od_restore_table_single(struct smu_context *smu, long
input)
@@ -2830,7 +2829,7 @@ static const struct pptable_funcs smu_v13_0_7_ppt_funcs =
{
.get_vbios_bootup_values = smu_v13_0_get_vbios_bootup_values,
.read_sensor = smu_v13_0_7_read_sensor,
.feature_is_enabled = smu_cmn_feature_is_enabled,
- .print_clk_levels = smu_v13_0_7_print_clk_levels,
+ .emit_clk_levels = smu_v13_0_7_emit_clk_levels,
.force_clk_levels = smu_v13_0_7_force_clk_levels,
.update_pcie_parameters = smu_v13_0_7_update_pcie_parameters,
.get_thermal_temperature_range =
smu_v13_0_7_get_thermal_temperature_range,
--
2.49.0