Commit 4df144f8 authored by Darren Powell's avatar Darren Powell Committed by Alex Deucher
Browse files

amdgpu/pm: Powerplay API for smu , added get_performance_level 



v2: updated the structure name to swsmu_pm_funcs

Modified Functions
  smu_get_performance_level() - modifed arg0 to match Powerplay API get_performance_level

Other Changes
  added a new structure swsmu_dpm_funcs to hold smu functions for Powerplay API
  removed special smu handling from amdgpu_get_power_dpm_force_performance_level

Signed-off-by: default avatarDarren Powell <darren.powell@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarEvan Quan <evan.quan@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 996aede2

drivers/gpu/drm/amd/pm/amdgpu_pm.c

+1 −3
Original line number Diff line number Diff line
@@ -279,9 +279,7 @@ static ssize_t amdgpu_get_power_dpm_force_performance_level(struct device *dev, 
		return ret;

	}



	if (is_support_sw_smu(adev))

		level = smu_get_performance_level(&adev->smu);

	else if (adev->powerplay.pp_funcs->get_performance_level)

	if (adev->powerplay.pp_funcs->get_performance_level)

		level = amdgpu_dpm_get_performance_level(adev);

	else

		level = adev->pm.dpm.forced_level;

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

+1 −1
Original line number Diff line number Diff line
@@ -1317,7 +1317,7 @@ int smu_get_dpm_freq_range(struct smu_context *smu, enum smu_clk_type clk_type, 
			   uint32_t *min, uint32_t *max);

int smu_set_soft_freq_range(struct smu_context *smu, enum smu_clk_type clk_type,

			    uint32_t min, uint32_t max);

enum amd_dpm_forced_level smu_get_performance_level(struct smu_context *smu);

enum amd_dpm_forced_level smu_get_performance_level(void *handle);

int smu_force_performance_level(struct smu_context *smu, enum amd_dpm_forced_level level);

int smu_set_display_count(struct smu_context *smu, uint32_t count);

int smu_set_ac_dc(struct smu_context *smu);

drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c

+11 −1
Original line number Diff line number Diff line
@@ -46,6 +46,8 @@ 
#undef pr_info

#undef pr_debug



static const struct amd_pm_funcs swsmu_pm_funcs;



size_t smu_sys_get_pp_feature_mask(struct smu_context *smu, char *buf)

{

	size_t size = 0;
@@ -553,6 +555,9 @@ static int smu_early_init(void *handle) 
	smu->smu_baco.state = SMU_BACO_STATE_EXIT;

	smu->smu_baco.platform_support = false;



	adev->powerplay.pp_handle = smu;

	adev->powerplay.pp_funcs = &swsmu_pm_funcs;



	return smu_set_funcs(adev);

}
@@ -1691,8 +1696,9 @@ int smu_switch_power_profile(struct smu_context *smu, 
	return 0;

}



enum amd_dpm_forced_level smu_get_performance_level(struct smu_context *smu)

enum amd_dpm_forced_level smu_get_performance_level(void *handle)

{

	struct smu_context *smu = handle;

	struct smu_dpm_context *smu_dpm_ctx = &(smu->smu_dpm);

	enum amd_dpm_forced_level level;
@@ -2723,3 +2729,7 @@ int smu_gfx_state_change_set(struct smu_context *smu, uint32_t state) 


	return ret;

}



static const struct amd_pm_funcs swsmu_pm_funcs = {

	.get_performance_level = smu_get_performance_level,

};