drm/amd/powerplay: clean up the overdrive settings

Eliminate the buffer allocation and drop the unnecessary
overdrive table uploading.

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

diff --git a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
index f753be7..95c061d 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
+++ b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
@@ -1197,7 +1197,7 @@ static int smu_smc_table_hw_init(struct smu_context *smu,
        if (ret)
                return ret;
 
-       ret = smu_set_default_od_settings(smu, initialize);
+       ret = smu_set_default_od_settings(smu);
        if (ret)
                return ret;
 

diff --git a/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h b/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
index e21bdad..c9a5c57 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
+++ b/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
@@ -480,7 +480,7 @@ struct pptable_funcs {
                                             uint32_t *value);
        int (*get_thermal_temperature_range)(struct smu_context *smu, struct smu_temperature_range *range);
        int (*get_uclk_dpm_states)(struct smu_context *smu, uint32_t *clocks_in_khz, uint32_t *num_states);
-       int (*set_default_od_settings)(struct smu_context *smu, bool initialize);
+       int (*set_default_od_settings)(struct smu_context *smu);
        int (*set_performance_level)(struct smu_context *smu, enum amd_dpm_forced_level level);
        int (*display_disable_memory_clock_switch)(struct smu_context *smu, bool disable_memory_clock_switch);
        void (*dump_pptable)(struct smu_context *smu);

diff --git a/drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h b/drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h
index e9c71e5..c442fc9 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h
+++ b/drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h
@@ -259,8 +259,6 @@ int smu_v11_0_set_soft_freq_limited_range(struct smu_context *smu, enum smu_clk_
 
 int smu_v11_0_override_pcie_parameters(struct smu_context *smu);
 
-int smu_v11_0_set_default_od_settings(struct smu_context *smu, bool initialize, size_t overdrive_table_size);
-
 uint32_t smu_v11_0_get_max_power_limit(struct smu_context *smu);
 
 int smu_v11_0_set_performance_level(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 1108459..4c1c4af 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/navi10_ppt.c
+++ b/drivers/gpu/drm/amd/powerplay/navi10_ppt.c
@@ -1969,55 +1969,49 @@ static bool navi10_is_baco_supported(struct smu_context *smu)
        return (val & RCC_BIF_STRAP0__STRAP_PX_CAPABLE_MASK) ? true : false;
 }
 
-static int navi10_set_default_od_settings(struct smu_context *smu, bool initialize) {
-       OverDriveTable_t *od_table, *boot_od_table;
+static int navi10_set_default_od_settings(struct smu_context *smu)
+{
+       OverDriveTable_t *od_table =
+               (OverDriveTable_t *)smu->smu_table.overdrive_table;
+       OverDriveTable_t *boot_od_table =
+               (OverDriveTable_t *)smu->smu_table.boot_overdrive_table;
        int ret = 0;
 
-       ret = smu_v11_0_set_default_od_settings(smu, initialize, sizeof(OverDriveTable_t));
-       if (ret)
+       ret = smu_update_table(smu, SMU_TABLE_OVERDRIVE, 0, (void *)od_table, false);
+       if (ret) {
+               pr_err("Failed to get overdrive table!\n");
                return ret;
+       }
 
-       od_table = (OverDriveTable_t *)smu->smu_table.overdrive_table;
-       boot_od_table = (OverDriveTable_t *)smu->smu_table.boot_overdrive_table;
-       if (initialize) {
-               if (od_table) {
-                       if (!od_table->GfxclkVolt1) {
-                               ret = navi10_overdrive_get_gfx_clk_base_voltage(smu,
-                                                                               &od_table->GfxclkVolt1,
-                                                                               od_table->GfxclkFreq1);
-                               if (ret)
-                                       od_table->GfxclkVolt1 = 0;
-                               if (boot_od_table)
-                                       boot_od_table->GfxclkVolt1 = od_table->GfxclkVolt1;
-                       }
-
-                       if (!od_table->GfxclkVolt2) {
-                               ret = navi10_overdrive_get_gfx_clk_base_voltage(smu,
-                                                                               &od_table->GfxclkVolt2,
-                                                                               od_table->GfxclkFreq2);
-                               if (ret)
-                                       od_table->GfxclkVolt2 = 0;
-                               if (boot_od_table)
-                                       boot_od_table->GfxclkVolt2 = od_table->GfxclkVolt2;
-                       }
+       if (!od_table->GfxclkVolt1) {
+               ret = navi10_overdrive_get_gfx_clk_base_voltage(smu,
+                                                               &od_table->GfxclkVolt1,
+                                                               od_table->GfxclkFreq1);
+               if (ret)
+                       return ret;
+       }
 
-                       if (!od_table->GfxclkVolt3) {
-                               ret = navi10_overdrive_get_gfx_clk_base_voltage(smu,
-                                                                               &od_table->GfxclkVolt3,
-                                                                               od_table->GfxclkFreq3);
-                               if (ret)
-                                       od_table->GfxclkVolt3 = 0;
-                               if (boot_od_table)
-                                       boot_od_table->GfxclkVolt3 = od_table->GfxclkVolt3;
-                       }
-               }
+       if (!od_table->GfxclkVolt2) {
+               ret = navi10_overdrive_get_gfx_clk_base_voltage(smu,
+                                                               &od_table->GfxclkVolt2,
+                                                               od_table->GfxclkFreq2);
+               if (ret)
+                       return ret;
        }
 
-       if (od_table) {
-               navi10_dump_od_table(od_table);
+       if (!od_table->GfxclkVolt3) {
+               ret = navi10_overdrive_get_gfx_clk_base_voltage(smu,
+                                                               &od_table->GfxclkVolt3,
+                                                               od_table->GfxclkFreq3);
+               if (ret)
+                       return ret;
        }
 
-       return ret;
+       memcpy(boot_od_table, od_table, sizeof(OverDriveTable_t));
+
+       navi10_dump_od_table(od_table);
+
+       return 0;
 }
 
 static int navi10_od_edit_dpm_table(struct smu_context *smu, enum PP_OD_DPM_TABLE_COMMAND type, long input[], uint32_t size) {

diff --git a/drivers/gpu/drm/amd/powerplay/smu_internal.h b/drivers/gpu/drm/amd/powerplay/smu_internal.h
index 493a3a5..7c0f488 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/smu_internal.h
+++ b/drivers/gpu/drm/amd/powerplay/smu_internal.h
@@ -66,8 +66,8 @@
        ((smu)->ppt_funcs->system_features_control ? (smu)->ppt_funcs->system_features_control((smu), (en)) : 0)
 #define smu_init_max_sustainable_clocks(smu) \
        ((smu)->ppt_funcs->init_max_sustainable_clocks ? (smu)->ppt_funcs->init_max_sustainable_clocks((smu)) : 0)
-#define smu_set_default_od_settings(smu, initialize) \
-       ((smu)->ppt_funcs->set_default_od_settings ? (smu)->ppt_funcs->set_default_od_settings((smu), (initialize)) : 0)
+#define smu_set_default_od_settings(smu) \
+       ((smu)->ppt_funcs->set_default_od_settings ? (smu)->ppt_funcs->set_default_od_settings((smu)) : 0)
 
 #define smu_send_smc_msg_with_param(smu, msg, param, read_arg) \
        ((smu)->ppt_funcs->send_smc_msg_with_param? (smu)->ppt_funcs->send_smc_msg_with_param((smu), (msg), (param), (read_arg)) : 0)

diff --git a/drivers/gpu/drm/amd/powerplay/smu_v11_0.c b/drivers/gpu/drm/amd/powerplay/smu_v11_0.c
index fa95c89..642963c 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/smu_v11_0.c
+++ b/drivers/gpu/drm/amd/powerplay/smu_v11_0.c
@@ -1912,26 +1912,6 @@ int smu_v11_0_override_pcie_parameters(struct smu_context *smu)
 
 }
 
-int smu_v11_0_set_default_od_settings(struct smu_context *smu, bool initialize, size_t overdrive_table_size)
-{
-       struct smu_table_context *table_context = &smu->smu_table;
-       int ret = 0;
-
-       if (initialize) {
-               ret = smu_update_table(smu, SMU_TABLE_OVERDRIVE, 0, table_context->overdrive_table, false);
-               if (ret) {
-                       pr_err("Failed to export overdrive table!\n");
-                       return ret;
-               }
-       }
-       ret = smu_update_table(smu, SMU_TABLE_OVERDRIVE, 0, table_context->overdrive_table, true);
-       if (ret) {
-               pr_err("Failed to import overdrive table!\n");
-               return ret;
-       }
-       return ret;
-}
-
 int smu_v11_0_set_performance_level(struct smu_context *smu,
                                    enum amd_dpm_forced_level level)
 {