drm/amd/powerplay: drop unnecessary wrappers around clock retrieving

By calling the target APIs directly.

Signed-off-by: Evan Quan <evan.quan@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/powerplay/arcturus_ppt.c b/drivers/gpu/drm/amd/powerplay/arcturus_ppt.c
index d93f8a43a96ff116141f69f1a1204236ea645bce..dc0178349c28066cbc7f08592a3e37a3677d3802 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/arcturus_ppt.c
+++ b/drivers/gpu/drm/amd/powerplay/arcturus_ppt.c
@@ -661,7 +661,7 @@ static int arcturus_print_clk_levels(struct smu_context *smu,
 
        switch (type) {
        case SMU_SCLK:
-               ret = smu_get_current_clk_freq(smu, SMU_GFXCLK, &now);
+               ret = smu_v11_0_get_current_clk_freq(smu, SMU_GFXCLK, &now);
                if (ret) {
                        dev_err(smu->adev->dev, "Attempt to get current gfx clk Failed!");
                        return ret;
@@ -688,7 +688,7 @@ static int arcturus_print_clk_levels(struct smu_context *smu,
                break;
 
        case SMU_MCLK:
-               ret = smu_get_current_clk_freq(smu, SMU_UCLK, &now);
+               ret = smu_v11_0_get_current_clk_freq(smu, SMU_UCLK, &now);
                if (ret) {
                        dev_err(smu->adev->dev, "Attempt to get current mclk Failed!");
                        return ret;
@@ -711,7 +711,7 @@ static int arcturus_print_clk_levels(struct smu_context *smu,
                break;
 
        case SMU_SOCCLK:
-               ret = smu_get_current_clk_freq(smu, SMU_SOCCLK, &now);
+               ret = smu_v11_0_get_current_clk_freq(smu, SMU_SOCCLK, &now);
                if (ret) {
                        dev_err(smu->adev->dev, "Attempt to get current socclk Failed!");
                        return ret;
@@ -734,7 +734,7 @@ static int arcturus_print_clk_levels(struct smu_context *smu,
                break;
 
        case SMU_FCLK:
-               ret = smu_get_current_clk_freq(smu, SMU_FCLK, &now);
+               ret = smu_v11_0_get_current_clk_freq(smu, SMU_FCLK, &now);
                if (ret) {
                        dev_err(smu->adev->dev, "Attempt to get current fclk Failed!");
                        return ret;
@@ -2597,7 +2597,6 @@ static const struct pptable_funcs arcturus_ppt_funcs = {
        .get_enabled_mask = smu_v11_0_get_enabled_mask,
        .notify_display_change = NULL,
        .set_power_limit = smu_v11_0_set_power_limit,
-       .get_current_clk_freq = smu_v11_0_get_current_clk_freq,
        .init_max_sustainable_clocks = smu_v11_0_init_max_sustainable_clocks,
        .enable_thermal_alert = smu_v11_0_enable_thermal_alert,
        .disable_thermal_alert = smu_v11_0_disable_thermal_alert,

diff --git a/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h b/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
index 7b349e0389721cce8b80061f8c1ca97e9c134ba8..f3bc1f16b0a48666af85a4e76768fa550ef7abd9 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
+++ b/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
@@ -521,7 +521,6 @@ struct pptable_funcs {
        int (*get_enabled_mask)(struct smu_context *smu, uint32_t *feature_mask, uint32_t num);
        int (*notify_display_change)(struct smu_context *smu);
        int (*set_power_limit)(struct smu_context *smu, uint32_t n);
-       int (*get_current_clk_freq)(struct smu_context *smu, enum smu_clk_type clk_id, uint32_t *value);
        int (*init_max_sustainable_clocks)(struct smu_context *smu);
        int (*enable_thermal_alert)(struct smu_context *smu);
        int (*disable_thermal_alert)(struct smu_context *smu);

diff --git a/drivers/gpu/drm/amd/powerplay/navi10_ppt.c b/drivers/gpu/drm/amd/powerplay/navi10_ppt.c
index 4f7d064e16e41d45ca60cf90a7f7b52feceaf3c7..6046cb6db4a1bc122e3b1d1e37a85b75a508f3cd 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/navi10_ppt.c
+++ b/drivers/gpu/drm/amd/powerplay/navi10_ppt.c
@@ -877,7 +877,7 @@ static int navi10_print_clk_levels(struct smu_context *smu,
        case SMU_UCLK:
        case SMU_FCLK:
        case SMU_DCEFCLK:
-               ret = smu_get_current_clk_freq(smu, clk_type, &cur_value);
+               ret = smu_v11_0_get_current_clk_freq(smu, clk_type, &cur_value);
                if (ret)
                        return size;
 
@@ -2438,7 +2438,6 @@ static const struct pptable_funcs navi10_ppt_funcs = {
        .get_enabled_mask = smu_v11_0_get_enabled_mask,
        .notify_display_change = smu_v11_0_notify_display_change,
        .set_power_limit = smu_v11_0_set_power_limit,
-       .get_current_clk_freq = smu_v11_0_get_current_clk_freq,
        .init_max_sustainable_clocks = smu_v11_0_init_max_sustainable_clocks,
        .enable_thermal_alert = smu_v11_0_enable_thermal_alert,
        .disable_thermal_alert = smu_v11_0_disable_thermal_alert,

diff --git a/drivers/gpu/drm/amd/powerplay/renoir_ppt.c b/drivers/gpu/drm/amd/powerplay/renoir_ppt.c
index f286c1e1934fc55af8166470bc94704cbb230e91..a52d562addc211c18f6c042c7efd2e42134aea90 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/renoir_ppt.c
+++ b/drivers/gpu/drm/amd/powerplay/renoir_ppt.c
@@ -953,7 +953,6 @@ static const struct pptable_funcs renoir_ppt_funcs = {
        .fini_smc_tables = smu_v12_0_fini_smc_tables,
        .set_default_dpm_table = smu_v12_0_set_default_dpm_tables,
        .get_enabled_mask = smu_v12_0_get_enabled_mask,
-       .get_current_clk_freq = smu_v12_0_get_current_clk_freq,
        .get_dpm_ultimate_freq = smu_v12_0_get_dpm_ultimate_freq,
        .mode2_reset = smu_v12_0_mode2_reset,
        .set_soft_freq_limited_range = smu_v12_0_set_soft_freq_limited_range,

diff --git a/drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c b/drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c
index 3efa41444ddf83090cecd88d64970338feafb5b2..bd8882edb21c2d1298406c1d928284f5caa004b6 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c
+++ b/drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c
@@ -781,7 +781,7 @@ static int sienna_cichlid_print_clk_levels(struct smu_context *smu,
        case SMU_UCLK:
        case SMU_FCLK:
        case SMU_DCEFCLK:
-               ret = smu_get_current_clk_freq(smu, clk_type, &cur_value);
+               ret = smu_v11_0_get_current_clk_freq(smu, clk_type, &cur_value);
                if (ret)
                        goto print_clk_out;
 
@@ -2517,7 +2517,6 @@ static const struct pptable_funcs sienna_cichlid_ppt_funcs = {
        .get_enabled_mask = smu_v11_0_get_enabled_mask,
        .notify_display_change = NULL,
        .set_power_limit = smu_v11_0_set_power_limit,
-       .get_current_clk_freq = smu_v11_0_get_current_clk_freq,
        .init_max_sustainable_clocks = smu_v11_0_init_max_sustainable_clocks,
        .enable_thermal_alert = smu_v11_0_enable_thermal_alert,
        .disable_thermal_alert = smu_v11_0_disable_thermal_alert,

diff --git a/drivers/gpu/drm/amd/powerplay/smu_internal.h b/drivers/gpu/drm/amd/powerplay/smu_internal.h
index 31e1fcbe0fcabde26fa5f70a96e21a6356fba560..053b0b3b2b6ff93991d293509222593c27affdb4 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/smu_internal.h
+++ b/drivers/gpu/drm/amd/powerplay/smu_internal.h
@@ -59,7 +59,6 @@
 #define smu_set_default_dpm_table(smu)                                 smu_ppt_funcs(set_default_dpm_table, 0, smu)
 #define smu_populate_umd_state_clk(smu)                                        smu_ppt_funcs(populate_umd_state_clk, 0, smu)
 #define smu_set_default_od8_settings(smu)                              smu_ppt_funcs(set_default_od8_settings, 0, smu)
-#define smu_get_current_clk_freq(smu, clk_id, value)                   smu_ppt_funcs(get_current_clk_freq, 0, smu, clk_id, value)
 #define smu_tables_init(smu, tab)                                      smu_ppt_funcs(tables_init, 0, smu, tab)
 #define smu_set_thermal_fan_table(smu)                                 smu_ppt_funcs(set_thermal_fan_table, 0, smu)
 #define smu_enable_thermal_alert(smu)                                  smu_ppt_funcs(enable_thermal_alert, 0, smu)

diff --git a/drivers/gpu/drm/amd/powerplay/smu_v11_0.c b/drivers/gpu/drm/amd/powerplay/smu_v11_0.c
index 373e1135ca5fca89775b703836978dbded4d52f1..70cfb4a07db43493815e4c90dc6e7e29082dcf16 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/smu_v11_0.c
+++ b/drivers/gpu/drm/amd/powerplay/smu_v11_0.c
@@ -1183,11 +1183,11 @@ int smu_v11_0_read_sensor(struct smu_context *smu,
 
        switch (sensor) {
        case AMDGPU_PP_SENSOR_GFX_MCLK:
-               ret = smu_get_current_clk_freq(smu, SMU_UCLK, (uint32_t *)data);
+               ret = smu_v11_0_get_current_clk_freq(smu, SMU_UCLK, (uint32_t *)data);
                *size = 4;
                break;
        case AMDGPU_PP_SENSOR_GFX_SCLK:
-               ret = smu_get_current_clk_freq(smu, SMU_GFXCLK, (uint32_t *)data);
+               ret = smu_v11_0_get_current_clk_freq(smu, SMU_GFXCLK, (uint32_t *)data);
                *size = 4;
                break;
        case AMDGPU_PP_SENSOR_VDDGFX:

diff --git a/drivers/gpu/drm/amd/powerplay/smu_v12_0.c b/drivers/gpu/drm/amd/powerplay/smu_v12_0.c
index b03127273d5636d462ccfaa732ddc2f751bde03f..1d7caaf57b70bc20d05fc4609da760d88a0f3003 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/smu_v12_0.c
+++ b/drivers/gpu/drm/amd/powerplay/smu_v12_0.c
@@ -214,11 +214,11 @@ int smu_v12_0_read_sensor(struct smu_context *smu,
 
        switch (sensor) {
        case AMDGPU_PP_SENSOR_GFX_MCLK:
-               ret = smu_get_current_clk_freq(smu, SMU_UCLK, (uint32_t *)data);
+               ret = smu_v12_0_get_current_clk_freq(smu, SMU_UCLK, (uint32_t *)data);
                *size = 4;
                break;
        case AMDGPU_PP_SENSOR_GFX_SCLK:
-               ret = smu_get_current_clk_freq(smu, SMU_GFXCLK, (uint32_t *)data);
+               ret = smu_v12_0_get_current_clk_freq(smu, SMU_GFXCLK, (uint32_t *)data);
                *size = 4;
                break;
        default: