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

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

drivers/gpu/drm/amd/powerplay/amdgpu_smu.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/amd/powerplay/arcturus_ppt.c

+0 −1
Original line number Diff line number Diff line
@@ -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,

drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h

+0 −1
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h

+0 −2
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/amd/powerplay/inc/smu_v12_0.h

+1 −1
Original line number Diff line number Diff line
@@ -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);