Commit 1316b713 authored by Kevin Wang's avatar Kevin Wang Committed by Alex Deucher
Browse files

drm/amd/powerplay: remove upload_dpm_level function for vega20 



the function upload_dpm_level is an internal function,
so remove public interface.

Signed-off-by: default avatarKevin Wang <kevin1.wang@amd.com>
Reviewed-by: default avatarHuang Rui <ray.huang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 2d589a5b

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

+0 −4
Original line number Diff line number Diff line
@@ -576,8 +576,6 @@ struct pptable_funcs { 
	int (*notify_smc_dispaly_config)(struct smu_context *smu);

	int (*force_dpm_limit_value)(struct smu_context *smu, bool highest);

	int (*unforce_dpm_levels)(struct smu_context *smu);

	int (*upload_dpm_level)(struct smu_context *smu, bool max,

				uint32_t feature_mask);

	int (*get_profiling_clk_mask)(struct smu_context *smu,

				      enum amd_dpm_forced_level level,

				      uint32_t *sclk_mask,
@@ -814,8 +812,6 @@ struct smu_funcs 
	((smu)->ppt_funcs->force_dpm_limit_value ? (smu)->ppt_funcs->force_dpm_limit_value((smu), (highest)) : 0)

#define smu_unforce_dpm_levels(smu) \

	((smu)->ppt_funcs->unforce_dpm_levels ? (smu)->ppt_funcs->unforce_dpm_levels((smu)) : 0)

#define smu_upload_dpm_level(smu, max, feature_mask) \

	((smu)->ppt_funcs->upload_dpm_level ? (smu)->ppt_funcs->upload_dpm_level((smu), (max), (feature_mask)) : 0)

#define smu_get_profiling_clk_mask(smu, level, sclk_mask, mclk_mask, soc_mask) \

	((smu)->ppt_funcs->get_profiling_clk_mask ? (smu)->ppt_funcs->get_profiling_clk_mask((smu), (level), (sclk_mask), (mclk_mask), (soc_mask)) : 0)

#define smu_set_cpu_power_state(smu) \

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

+2 −3
Original line number Diff line number Diff line
@@ -2329,13 +2329,13 @@ static int vega20_unforce_dpm_levels(struct smu_context *smu) 
	dpm_table->soc_table.dpm_state.soft_max_level =

		dpm_table->soc_table.dpm_levels[soft_max_level].value;



	ret = smu_upload_dpm_level(smu, false, 0xFFFFFFFF);

	ret = vega20_upload_dpm_level(smu, false, 0xFFFFFFFF);

	if (ret) {

		pr_err("Failed to upload DPM Bootup Levels!");

		return ret;

	}



	ret = smu_upload_dpm_level(smu, true, 0xFFFFFFFF);

	ret = vega20_upload_dpm_level(smu, true, 0xFFFFFFFF);

	if (ret) {

		pr_err("Failed to upload DPM Max Levels!");

		return ret;
@@ -3142,7 +3142,6 @@ static const struct pptable_funcs vega20_ppt_funcs = { 
	.notify_smc_dispaly_config = vega20_notify_smc_dispaly_config,

	.force_dpm_limit_value = vega20_force_dpm_limit_value,

	.unforce_dpm_levels = vega20_unforce_dpm_levels,

	.upload_dpm_level = vega20_upload_dpm_level,

	.get_profiling_clk_mask = vega20_get_profiling_clk_mask,

	.set_ppfeature_status = vega20_set_ppfeature_status,

	.get_ppfeature_status = vega20_get_ppfeature_status,

CRA Git | Maintained and supported by SUSTech CRA and CCSE