drm/amd/powerplay: drop unused code around power limit

Drop unused APIs, variables and argument.

Signed-off-by: Evan Quan <[email protected]>
Reviewed-by: Alex Deucher <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
index b2cdc8a1268f4b72f6d32de83b6339ed4b70eeab..395ddbe2461cdd92ed3c20fba5b9e6c1b303ab29 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
@@ -2739,7 +2739,7 @@ static ssize_t amdgpu_hwmon_show_power_cap_max(struct device *dev,
                return r;
 
        if (is_support_sw_smu(adev)) {
-               smu_get_power_limit(&adev->smu, &limit, true, true);
+               smu_get_power_limit(&adev->smu, &limit, true);
                size = snprintf(buf, PAGE_SIZE, "%u\n", limit * 1000000);
        } else if (adev->powerplay.pp_funcs && adev->powerplay.pp_funcs->get_power_limit) {
                adev->powerplay.pp_funcs->get_power_limit(adev->powerplay.pp_handle, &limit, true);
@@ -2771,7 +2771,7 @@ static ssize_t amdgpu_hwmon_show_power_cap(struct device *dev,
                return r;
 
        if (is_support_sw_smu(adev)) {
-               smu_get_power_limit(&adev->smu, &limit, false,  true);
+               smu_get_power_limit(&adev->smu, &limit, false);
                size = snprintf(buf, PAGE_SIZE, "%u\n", limit * 1000000);
        } else if (adev->powerplay.pp_funcs && adev->powerplay.pp_funcs->get_power_limit) {
                adev->powerplay.pp_funcs->get_power_limit(adev->powerplay.pp_handle, &limit, false);

diff --git a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
index 7cde80c9614fb236c4ee69081dac4247de74edc8..725ac90c0f36c1ccd0103459eb83aa0662ecdc56 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
+++ b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
@@ -2210,24 +2210,18 @@ int smu_set_fan_speed_rpm(struct smu_context *smu, uint32_t speed)
 
 int smu_get_power_limit(struct smu_context *smu,
                        uint32_t *limit,
-                       bool def,
-                       bool lock_needed)
+                       bool max_setting)
 {
-       int ret = 0;
-
-       if (lock_needed) {
-               if (!smu->pm_enabled || !smu->adev->pm.dpm_enabled)
-                       return -EOPNOTSUPP;
+       if (!smu->pm_enabled || !smu->adev->pm.dpm_enabled)
+               return -EOPNOTSUPP;
 
-               mutex_lock(&smu->mutex);
-       }
+       mutex_lock(&smu->mutex);
 
-       *limit = (def ? smu->max_power_limit : smu->current_power_limit);
+       *limit = (max_setting ? smu->max_power_limit : smu->current_power_limit);
 
-       if (lock_needed)
-               mutex_unlock(&smu->mutex);
+       mutex_unlock(&smu->mutex);
 
-       return ret;
+       return 0;
 }
 
 int smu_set_power_limit(struct smu_context *smu, uint32_t limit)

diff --git a/drivers/gpu/drm/amd/powerplay/arcturus_ppt.c b/drivers/gpu/drm/amd/powerplay/arcturus_ppt.c
index 66b8f143cc46db1d935bd75131f693ced1ad2bf2..c104844b28f165bb12e1366a94cef17e88edfce6 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/arcturus_ppt.c
+++ b/drivers/gpu/drm/amd/powerplay/arcturus_ppt.c
@@ -2411,13 +2411,6 @@ static bool arcturus_is_baco_supported(struct smu_context *smu)
        return (val & RCC_BIF_STRAP0__STRAP_PX_CAPABLE_MASK) ? true : false;
 }
 
-static uint32_t arcturus_get_pptable_power_limit(struct smu_context *smu)
-{
-       PPTable_t *pptable = smu->smu_table.driver_pptable;
-
-       return pptable->SocketPowerLimitAc[PPT_THROTTLER_PPT0];
-}
-
 static int arcturus_set_df_cstate(struct smu_context *smu,
                                  enum pp_df_cstate state)
 {
@@ -2544,33 +2537,6 @@ static int arcturus_set_thermal_range(struct smu_context *smu,
        return 0;
 }
 
-static uint32_t atcturus_get_max_power_limit(struct smu_context *smu) {
-       uint32_t od_limit, max_power_limit;
-       struct smu_11_0_powerplay_table *powerplay_table = NULL;
-       struct smu_table_context *table_context = &smu->smu_table;
-       powerplay_table = table_context->power_play_table;
-
-       max_power_limit = arcturus_get_pptable_power_limit(smu);
-
-       if (!max_power_limit) {
-               // If we couldn't get the table limit, fall back on first-read value
-               if (!smu->default_power_limit)
-                       smu->default_power_limit = smu->power_limit;
-               max_power_limit = smu->default_power_limit;
-       }
-
-       if (smu->od_enabled) {
-               od_limit = le32_to_cpu(powerplay_table->overdrive_table.max[SMU_11_0_ODSETTING_POWERPERCENTAGE]);
-
-               dev_dbg(smu->adev->dev, "ODSETTING_POWERPERCENTAGE: %d (default: %d)\n", od_limit, smu->default_power_limit);
-
-               max_power_limit *= (100 + od_limit);
-               max_power_limit /= 100;
-       }
-
-       return max_power_limit;
-}
-
 static const struct pptable_funcs arcturus_ppt_funcs = {
        /* translate smu index into arcturus specific index */
        .get_smu_msg_index = arcturus_get_smu_msg_index,
@@ -2662,7 +2628,6 @@ static const struct pptable_funcs arcturus_ppt_funcs = {
        .allow_xgmi_power_down = arcturus_allow_xgmi_power_down,
        .log_thermal_throttling_event = arcturus_log_thermal_throttling_event,
        .set_thermal_range = arcturus_set_thermal_range,
-       .get_max_power_limit = atcturus_get_max_power_limit,
 };
 
 void arcturus_set_ppt_funcs(struct smu_context *smu)

diff --git a/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h b/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
index db63ed057840f088f522e62658604022a0330983..8eaa6338ad44dc062378aaf46aab770d41b13213 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
+++ b/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
@@ -380,8 +380,6 @@ struct smu_context
        uint32_t pstate_mclk;
 
        bool od_enabled;
-       uint32_t power_limit;
-       uint32_t default_power_limit;
        uint32_t current_power_limit;
        uint32_t max_power_limit;
 
@@ -573,7 +571,6 @@ struct pptable_funcs {
        int (*set_power_source)(struct smu_context *smu, enum smu_power_src_type power_src);
        void (*log_thermal_throttling_event)(struct smu_context *smu);
        int (*set_thermal_range)(struct smu_context *smu, struct smu_temperature_range range);
-       uint32_t (*get_max_power_limit)(struct smu_context *smu);
 };
 
 typedef enum {
@@ -616,8 +613,7 @@ int smu_set_fan_speed_rpm(struct smu_context *smu, uint32_t speed);
 
 int smu_get_power_limit(struct smu_context *smu,
                        uint32_t *limit,
-                       bool def,
-                       bool lock_needed);
+                       bool max_setting);
 
 int smu_set_power_limit(struct smu_context *smu, uint32_t limit);
 int smu_print_clk_levels(struct smu_context *smu, enum smu_clk_type clk_type, char *buf);

diff --git a/drivers/gpu/drm/amd/powerplay/navi10_ppt.c b/drivers/gpu/drm/amd/powerplay/navi10_ppt.c
index 2e0836976001a62a07e7621caa767f78f9fcfef0..186cdf6696f8dc4d7a39e0cff754d8f3304411d5 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/navi10_ppt.c
+++ b/drivers/gpu/drm/amd/powerplay/navi10_ppt.c
@@ -1916,12 +1916,6 @@ static int navi10_display_disable_memory_clock_switch(struct smu_context *smu,
        return ret;
 }
 
-static uint32_t navi10_get_pptable_power_limit(struct smu_context *smu)
-{
-       PPTable_t *pptable = smu->smu_table.driver_pptable;
-       return pptable->SocketPowerLimitAc[PPT_THROTTLER_PPT0];
-}
-
 static int navi10_get_power_limit(struct smu_context *smu)
 {
        struct smu_11_0_powerplay_table *powerplay_table =
@@ -2380,33 +2374,6 @@ static int navi10_set_thermal_range(struct smu_context *smu,
        return 0;
 }
 
-static uint32_t navi10_get_max_power_limit(struct smu_context *smu) {
-       uint32_t od_limit, max_power_limit;
-       struct smu_11_0_powerplay_table *powerplay_table = NULL;
-       struct smu_table_context *table_context = &smu->smu_table;
-       powerplay_table = table_context->power_play_table;
-
-       max_power_limit = navi10_get_pptable_power_limit(smu);
-
-       if (!max_power_limit) {
-               // If we couldn't get the table limit, fall back on first-read value
-               if (!smu->default_power_limit)
-                       smu->default_power_limit = smu->power_limit;
-               max_power_limit = smu->default_power_limit;
-       }
-
-       if (smu->od_enabled) {
-               od_limit = le32_to_cpu(powerplay_table->overdrive_table.max[SMU_11_0_ODSETTING_POWERPERCENTAGE]);
-
-               dev_dbg(smu->adev->dev, "ODSETTING_POWERPERCENTAGE: %d (default: %d)\n", od_limit, smu->default_power_limit);
-
-               max_power_limit *= (100 + od_limit);
-               max_power_limit /= 100;
-       }
-
-       return max_power_limit;
-}
-
 static const struct pptable_funcs navi10_ppt_funcs = {
        .tables_init = navi10_tables_init,
        .alloc_dpm_context = navi10_allocate_dpm_context,
@@ -2497,7 +2464,6 @@ static const struct pptable_funcs navi10_ppt_funcs = {
        .disable_umc_cdr_12gbps_workaround = navi10_disable_umc_cdr_12gbps_workaround,
        .set_power_source = smu_v11_0_set_power_source,
        .set_thermal_range = navi10_set_thermal_range,
-       .get_max_power_limit = navi10_get_max_power_limit,
 };
 
 void navi10_set_ppt_funcs(struct smu_context *smu)

diff --git a/drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c b/drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c
index 44719c110655bd0565c21a1ee4fa8da47a33be54..81cc04de9b06337ce8a9a3e2eb7a3db79a8fa402 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c
+++ b/drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c
@@ -1737,12 +1737,6 @@ static int sienna_cichlid_display_disable_memory_clock_switch(struct smu_context
        return ret;
 }
 
-static uint32_t sienna_cichlid_get_pptable_power_limit(struct smu_context *smu)
-{
-       PPTable_t *pptable = smu->smu_table.driver_pptable;
-       return pptable->SocketPowerLimitAc[PPT_THROTTLER_PPT0];
-}
-
 static int sienna_cichlid_get_power_limit(struct smu_context *smu)
 {
        struct smu_11_0_7_powerplay_table *powerplay_table =
@@ -1886,33 +1880,6 @@ static int sienna_cichlid_set_thermal_range(struct smu_context *smu,
        return 0;
 }
 
-static uint32_t sienna_cichlid_get_max_power_limit(struct smu_context *smu) {
-       uint32_t od_limit, max_power_limit;
-       struct smu_11_0_7_powerplay_table *powerplay_table = NULL;
-       struct smu_table_context *table_context = &smu->smu_table;
-       powerplay_table = table_context->power_play_table;
-
-       max_power_limit = sienna_cichlid_get_pptable_power_limit(smu);
-
-       if (!max_power_limit) {
-               // If we couldn't get the table limit, fall back on first-read value
-               if (!smu->default_power_limit)
-                       smu->default_power_limit = smu->power_limit;
-               max_power_limit = smu->default_power_limit;
-       }
-
-       if (smu->od_enabled) {
-               od_limit = le32_to_cpu(powerplay_table->overdrive_table.max[SMU_11_0_7_ODSETTING_POWERPERCENTAGE]);
-
-               dev_dbg(smu->adev->dev, "ODSETTING_POWERPERCENTAGE: %d (default: %d)\n", od_limit, smu->default_power_limit);
-
-               max_power_limit *= (100 + od_limit);
-               max_power_limit /= 100;
-       }
-
-       return max_power_limit;
-}
-
 static void sienna_cichlid_dump_pptable(struct smu_context *smu)
 {
        struct smu_table_context *table_context = &smu->smu_table;
@@ -2664,7 +2631,6 @@ static const struct pptable_funcs sienna_cichlid_ppt_funcs = {
        .set_soft_freq_limited_range = sienna_cichlid_set_soft_freq_limited_range,
        .override_pcie_parameters = smu_v11_0_override_pcie_parameters,
        .set_thermal_range = sienna_cichlid_set_thermal_range,
-       .get_max_power_limit = sienna_cichlid_get_max_power_limit,
 };
 
 void sienna_cichlid_set_ppt_funcs(struct smu_context *smu)

diff --git a/drivers/gpu/drm/amd/powerplay/smu_internal.h b/drivers/gpu/drm/amd/powerplay/smu_internal.h
index 346aea9198e969a84cc18d84f91509c767a00b51..094db34ddbd1211309f447686f1662500f125089 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/smu_internal.h
+++ b/drivers/gpu/drm/amd/powerplay/smu_internal.h
@@ -194,8 +194,6 @@ static inline int smu_send_smc_msg(struct smu_context *smu, enum smu_message_typ
 
 #define smu_set_thermal_range(smu, range) \
                ((smu)->ppt_funcs->set_thermal_range ? (smu)->ppt_funcs->set_thermal_range((smu), (range)) : 0)
-#define smu_get_max_power_limit(smu) \
-               ((smu)->ppt_funcs->get_max_power_limit ? (smu)->ppt_funcs->get_max_power_limit((smu)) : 0)
 
 #define smu_disable_umc_cdr_12gbps_workaround(smu) \
        ((smu)->ppt_funcs->disable_umc_cdr_12gbps_workaround ? (smu)->ppt_funcs->disable_umc_cdr_12gbps_workaround((smu)) : 0)