On Tue, Jun 9, 2020 at 6:10 AM Evan Quan <evan.quan@xxxxxxx> wrote:
>
> Since .populate_smc_tables is just a wrapper of .set_default_dpm_table.
>
> Change-Id: I80e89146359d6cf5d80f1887878d371b41b41cb0
> Signed-off-by: Evan Quan <evan.quan@xxxxxxx>
Reviewed-by: Alex Deucher <alexander.deucher@xxxxxxx>
> ---
> drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 2 +-
> drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 1 -
> drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 1 -
> drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 2 --
> drivers/gpu/drm/amd/powerplay/inc/smu_v12_0.h | 2 +-
> drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 1 -
> drivers/gpu/drm/amd/powerplay/renoir_ppt.c | 2 +-
> drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c | 1 -
> drivers/gpu/drm/amd/powerplay/smu_internal.h | 2 --
> drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 9 ---------
> drivers/gpu/drm/amd/powerplay/smu_v12_0.c | 2 +-
> 11 files changed, 4 insertions(+), 21 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
> index 89dd12536d58..78263de02678 100644
> --- a/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
> +++ b/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
> @@ -813,7 +813,7 @@ static int smu_late_init(void *handle)
> * gfxclk, memclk, dcefclk, and etc. And enable the DPM feature for each
> * type of clks.
> */
> - ret = smu_populate_smc_tables(smu);
> + ret = smu_set_default_dpm_table(smu);
> if (ret) {
> dev_err(adev->dev, "Failed to setup default dpm clock tables!\n");
> return ret;
> diff --git a/drivers/gpu/drm/amd/powerplay/arcturus_ppt.c b/drivers/gpu/drm/amd/powerplay/arcturus_ppt.c
> index 96c9a348f8b3..ee492fc77414 100644
> --- a/drivers/gpu/drm/amd/powerplay/arcturus_ppt.c
> +++ b/drivers/gpu/drm/amd/powerplay/arcturus_ppt.c
> @@ -2587,7 +2587,6 @@ static const struct pptable_funcs arcturus_ppt_funcs = {
> /* pptable related */
> .setup_pptable = arcturus_setup_pptable,
> .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,
> .write_pptable = smu_v11_0_write_pptable,
> .set_driver_table_location = smu_v11_0_set_driver_table_location,
> diff --git a/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h b/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
> index 3420a58fad03..0d1429fc791b 100644
> --- a/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
> +++ b/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
> @@ -505,7 +505,6 @@ struct pptable_funcs {
> int (*check_fw_status)(struct smu_context *smu);
> int (*setup_pptable)(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 (*powergate_sdma)(struct smu_context *smu, bool gate);
> int (*set_gfx_cgpg)(struct smu_context *smu, bool enable);
> 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 9ccf62e99dcb..d6cd3d74dcfa 100644
> --- a/drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h
> +++ b/drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h
> @@ -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_populate_smc_pptable(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);
> diff --git a/drivers/gpu/drm/amd/powerplay/inc/smu_v12_0.h b/drivers/gpu/drm/amd/powerplay/inc/smu_v12_0.h
> index 7fbebc1979cf..d29f75223987 100644
> --- a/drivers/gpu/drm/amd/powerplay/inc/smu_v12_0.h
> +++ b/drivers/gpu/drm/amd/powerplay/inc/smu_v12_0.h
> @@ -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_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,
> uint32_t *feature_mask, uint32_t num);
> diff --git a/drivers/gpu/drm/amd/powerplay/navi10_ppt.c b/drivers/gpu/drm/amd/powerplay/navi10_ppt.c
> index abbfcce6d9ad..ef04ab1eba94 100644
> --- a/drivers/gpu/drm/amd/powerplay/navi10_ppt.c
> +++ b/drivers/gpu/drm/amd/powerplay/navi10_ppt.c
> @@ -2423,7 +2423,6 @@ static const struct pptable_funcs navi10_ppt_funcs = {
> .check_fw_status = smu_v11_0_check_fw_status,
> .setup_pptable = navi10_setup_pptable,
> .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,
> .write_pptable = smu_v11_0_write_pptable,
> .set_driver_table_location = smu_v11_0_set_driver_table_location,
> diff --git a/drivers/gpu/drm/amd/powerplay/renoir_ppt.c b/drivers/gpu/drm/amd/powerplay/renoir_ppt.c
> index 6b5e60b4c039..f286c1e1934f 100644
> --- a/drivers/gpu/drm/amd/powerplay/renoir_ppt.c
> +++ b/drivers/gpu/drm/amd/powerplay/renoir_ppt.c
> @@ -951,7 +951,7 @@ static const struct pptable_funcs renoir_ppt_funcs = {
> .gfx_off_control = smu_v12_0_gfx_off_control,
> .init_smc_tables = smu_v12_0_init_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_current_clk_freq = smu_v12_0_get_current_clk_freq,
> .get_dpm_ultimate_freq = smu_v12_0_get_dpm_ultimate_freq,
> diff --git a/drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c b/drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c
> index 6a9d04cac240..9a05fda05355 100644
> --- a/drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c
> +++ b/drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c
> @@ -2593,7 +2593,6 @@ static const struct pptable_funcs sienna_cichlid_ppt_funcs = {
> .check_fw_status = smu_v11_0_check_fw_status,
> .setup_pptable = sienna_cichlid_setup_pptable,
> .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,
> .write_pptable = smu_v11_0_write_pptable,
> .set_driver_table_location = smu_v11_0_set_driver_table_location,
> diff --git a/drivers/gpu/drm/amd/powerplay/smu_internal.h b/drivers/gpu/drm/amd/powerplay/smu_internal.h
> index 86c09098963a..03679eb21e0d 100644
> --- a/drivers/gpu/drm/amd/powerplay/smu_internal.h
> +++ b/drivers/gpu/drm/amd/powerplay/smu_internal.h
> @@ -45,8 +45,6 @@
>
> #define smu_get_vbios_bootup_values(smu) \
> ((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) \
> ((smu)->ppt_funcs->check_fw_version ? (smu)->ppt_funcs->check_fw_version((smu)) : 0)
> #define smu_write_pptable(smu) \
> diff --git a/drivers/gpu/drm/amd/powerplay/smu_v11_0.c b/drivers/gpu/drm/amd/powerplay/smu_v11_0.c
> index 5590dab46e8c..9e3fee9e4aca 100644
> --- a/drivers/gpu/drm/amd/powerplay/smu_v11_0.c
> +++ b/drivers/gpu/drm/amd/powerplay/smu_v11_0.c
> @@ -750,15 +750,6 @@ int smu_v11_0_notify_memory_pool_location(struct smu_context *smu)
> 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)
> {
> struct smu_table_context *table_context = &smu->smu_table;
> diff --git a/drivers/gpu/drm/amd/powerplay/smu_v12_0.c b/drivers/gpu/drm/amd/powerplay/smu_v12_0.c
> index f10113fc4571..5b56e7579ff4 100644
> --- a/drivers/gpu/drm/amd/powerplay/smu_v12_0.c
> +++ b/drivers/gpu/drm/amd/powerplay/smu_v12_0.c
> @@ -319,7 +319,7 @@ int smu_v12_0_fini_smc_tables(struct smu_context *smu)
> 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;
>
> --
> 2.27.0
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@xxxxxxxxxxxxxxxxxxxxx
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
amd-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
