Commit 947119a3 authored by Evan Quan's avatar Evan Quan Committed by Alex Deucher

drm/amd/powerplay: drop unnecessary wrapper .populate_smc_tables

Since .populate_smc_tables is just a wrapper of .set_default_dpm_table.
Signed-off-by: default avatarEvan Quan <evan.quan@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent ce63d8f8
...@@ -813,7 +813,7 @@ static int smu_late_init(void *handle) ...@@ -813,7 +813,7 @@ static int smu_late_init(void *handle)
* gfxclk, memclk, dcefclk, and etc. And enable the DPM feature for each * gfxclk, memclk, dcefclk, and etc. And enable the DPM feature for each
* type of clks. * type of clks.
*/ */
ret = smu_populate_smc_tables(smu); ret = smu_set_default_dpm_table(smu);
if (ret) { if (ret) {
dev_err(adev->dev, "Failed to setup default dpm clock tables!\n"); dev_err(adev->dev, "Failed to setup default dpm clock tables!\n");
return ret; return ret;
......
...@@ -2587,7 +2587,6 @@ static const struct pptable_funcs arcturus_ppt_funcs = { ...@@ -2587,7 +2587,6 @@ static const struct pptable_funcs arcturus_ppt_funcs = {
/* pptable related */ /* pptable related */
.setup_pptable = arcturus_setup_pptable, .setup_pptable = arcturus_setup_pptable,
.get_vbios_bootup_values = smu_v11_0_get_vbios_bootup_values, .get_vbios_bootup_values = smu_v11_0_get_vbios_bootup_values,
.populate_smc_tables = smu_v11_0_populate_smc_pptable,
.check_fw_version = smu_v11_0_check_fw_version, .check_fw_version = smu_v11_0_check_fw_version,
.write_pptable = smu_v11_0_write_pptable, .write_pptable = smu_v11_0_write_pptable,
.set_driver_table_location = smu_v11_0_set_driver_table_location, .set_driver_table_location = smu_v11_0_set_driver_table_location,
......
...@@ -505,7 +505,6 @@ struct pptable_funcs { ...@@ -505,7 +505,6 @@ struct pptable_funcs {
int (*check_fw_status)(struct smu_context *smu); int (*check_fw_status)(struct smu_context *smu);
int (*setup_pptable)(struct smu_context *smu); int (*setup_pptable)(struct smu_context *smu);
int (*get_vbios_bootup_values)(struct smu_context *smu); int (*get_vbios_bootup_values)(struct smu_context *smu);
int (*populate_smc_tables)(struct smu_context *smu);
int (*check_fw_version)(struct smu_context *smu); int (*check_fw_version)(struct smu_context *smu);
int (*powergate_sdma)(struct smu_context *smu, bool gate); int (*powergate_sdma)(struct smu_context *smu, bool gate);
int (*set_gfx_cgpg)(struct smu_context *smu, bool enable); int (*set_gfx_cgpg)(struct smu_context *smu, bool enable);
......
...@@ -164,8 +164,6 @@ int smu_v11_0_setup_pptable(struct smu_context *smu); ...@@ -164,8 +164,6 @@ int smu_v11_0_setup_pptable(struct smu_context *smu);
int smu_v11_0_get_vbios_bootup_values(struct smu_context *smu); int smu_v11_0_get_vbios_bootup_values(struct smu_context *smu);
int smu_v11_0_populate_smc_pptable(struct smu_context *smu);
int smu_v11_0_check_fw_version(struct smu_context *smu); int smu_v11_0_check_fw_version(struct smu_context *smu);
int smu_v11_0_write_pptable(struct smu_context *smu); int smu_v11_0_write_pptable(struct smu_context *smu);
......
...@@ -72,7 +72,7 @@ int smu_v12_0_init_smc_tables(struct smu_context *smu); ...@@ -72,7 +72,7 @@ int smu_v12_0_init_smc_tables(struct smu_context *smu);
int smu_v12_0_fini_smc_tables(struct smu_context *smu); int smu_v12_0_fini_smc_tables(struct smu_context *smu);
int smu_v12_0_populate_smc_tables(struct smu_context *smu); int smu_v12_0_set_default_dpm_tables(struct smu_context *smu);
int smu_v12_0_get_enabled_mask(struct smu_context *smu, int smu_v12_0_get_enabled_mask(struct smu_context *smu,
uint32_t *feature_mask, uint32_t num); uint32_t *feature_mask, uint32_t num);
......
...@@ -2423,7 +2423,6 @@ static const struct pptable_funcs navi10_ppt_funcs = { ...@@ -2423,7 +2423,6 @@ static const struct pptable_funcs navi10_ppt_funcs = {
.check_fw_status = smu_v11_0_check_fw_status, .check_fw_status = smu_v11_0_check_fw_status,
.setup_pptable = navi10_setup_pptable, .setup_pptable = navi10_setup_pptable,
.get_vbios_bootup_values = smu_v11_0_get_vbios_bootup_values, .get_vbios_bootup_values = smu_v11_0_get_vbios_bootup_values,
.populate_smc_tables = smu_v11_0_populate_smc_pptable,
.check_fw_version = smu_v11_0_check_fw_version, .check_fw_version = smu_v11_0_check_fw_version,
.write_pptable = smu_v11_0_write_pptable, .write_pptable = smu_v11_0_write_pptable,
.set_driver_table_location = smu_v11_0_set_driver_table_location, .set_driver_table_location = smu_v11_0_set_driver_table_location,
......
...@@ -951,7 +951,7 @@ static const struct pptable_funcs renoir_ppt_funcs = { ...@@ -951,7 +951,7 @@ static const struct pptable_funcs renoir_ppt_funcs = {
.gfx_off_control = smu_v12_0_gfx_off_control, .gfx_off_control = smu_v12_0_gfx_off_control,
.init_smc_tables = smu_v12_0_init_smc_tables, .init_smc_tables = smu_v12_0_init_smc_tables,
.fini_smc_tables = smu_v12_0_fini_smc_tables, .fini_smc_tables = smu_v12_0_fini_smc_tables,
.populate_smc_tables = smu_v12_0_populate_smc_tables, .set_default_dpm_table = smu_v12_0_set_default_dpm_tables,
.get_enabled_mask = smu_v12_0_get_enabled_mask, .get_enabled_mask = smu_v12_0_get_enabled_mask,
.get_current_clk_freq = smu_v12_0_get_current_clk_freq, .get_current_clk_freq = smu_v12_0_get_current_clk_freq,
.get_dpm_ultimate_freq = smu_v12_0_get_dpm_ultimate_freq, .get_dpm_ultimate_freq = smu_v12_0_get_dpm_ultimate_freq,
......
...@@ -2593,7 +2593,6 @@ static const struct pptable_funcs sienna_cichlid_ppt_funcs = { ...@@ -2593,7 +2593,6 @@ static const struct pptable_funcs sienna_cichlid_ppt_funcs = {
.check_fw_status = smu_v11_0_check_fw_status, .check_fw_status = smu_v11_0_check_fw_status,
.setup_pptable = sienna_cichlid_setup_pptable, .setup_pptable = sienna_cichlid_setup_pptable,
.get_vbios_bootup_values = smu_v11_0_get_vbios_bootup_values, .get_vbios_bootup_values = smu_v11_0_get_vbios_bootup_values,
.populate_smc_tables = smu_v11_0_populate_smc_pptable,
.check_fw_version = smu_v11_0_check_fw_version, .check_fw_version = smu_v11_0_check_fw_version,
.write_pptable = smu_v11_0_write_pptable, .write_pptable = smu_v11_0_write_pptable,
.set_driver_table_location = smu_v11_0_set_driver_table_location, .set_driver_table_location = smu_v11_0_set_driver_table_location,
......
...@@ -45,8 +45,6 @@ ...@@ -45,8 +45,6 @@
#define smu_get_vbios_bootup_values(smu) \ #define smu_get_vbios_bootup_values(smu) \
((smu)->ppt_funcs->get_vbios_bootup_values ? (smu)->ppt_funcs->get_vbios_bootup_values((smu)) : 0) ((smu)->ppt_funcs->get_vbios_bootup_values ? (smu)->ppt_funcs->get_vbios_bootup_values((smu)) : 0)
#define smu_populate_smc_tables(smu) \
((smu)->ppt_funcs->populate_smc_tables ? (smu)->ppt_funcs->populate_smc_tables((smu)) : 0)
#define smu_check_fw_version(smu) \ #define smu_check_fw_version(smu) \
((smu)->ppt_funcs->check_fw_version ? (smu)->ppt_funcs->check_fw_version((smu)) : 0) ((smu)->ppt_funcs->check_fw_version ? (smu)->ppt_funcs->check_fw_version((smu)) : 0)
#define smu_write_pptable(smu) \ #define smu_write_pptable(smu) \
......
...@@ -750,15 +750,6 @@ int smu_v11_0_notify_memory_pool_location(struct smu_context *smu) ...@@ -750,15 +750,6 @@ int smu_v11_0_notify_memory_pool_location(struct smu_context *smu)
return ret; return ret;
} }
int smu_v11_0_populate_smc_pptable(struct smu_context *smu)
{
int ret;
ret = smu_set_default_dpm_table(smu);
return ret;
}
int smu_v11_0_write_pptable(struct smu_context *smu) int smu_v11_0_write_pptable(struct smu_context *smu)
{ {
struct smu_table_context *table_context = &smu->smu_table; struct smu_table_context *table_context = &smu->smu_table;
......
...@@ -319,7 +319,7 @@ int smu_v12_0_fini_smc_tables(struct smu_context *smu) ...@@ -319,7 +319,7 @@ int smu_v12_0_fini_smc_tables(struct smu_context *smu)
return 0; return 0;
} }
int smu_v12_0_populate_smc_tables(struct smu_context *smu) int smu_v12_0_set_default_dpm_tables(struct smu_context *smu)
{ {
struct smu_table_context *smu_table = &smu->smu_table; struct smu_table_context *smu_table = &smu->smu_table;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment