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

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
...@@ -279,9 +279,7 @@ static ssize_t amdgpu_get_power_dpm_force_performance_level(struct device *dev, ...@@ -279,9 +279,7 @@ static ssize_t amdgpu_get_power_dpm_force_performance_level(struct device *dev,
return ret; return ret;
} }
if (is_support_sw_smu(adev)) if (adev->powerplay.pp_funcs->get_performance_level)
level = smu_get_performance_level(&adev->smu);
else if (adev->powerplay.pp_funcs->get_performance_level)
level = amdgpu_dpm_get_performance_level(adev); level = amdgpu_dpm_get_performance_level(adev);
else else
level = adev->pm.dpm.forced_level; level = adev->pm.dpm.forced_level;
......
...@@ -1317,7 +1317,7 @@ int smu_get_dpm_freq_range(struct smu_context *smu, enum smu_clk_type clk_type, ...@@ -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); uint32_t *min, uint32_t *max);
int smu_set_soft_freq_range(struct smu_context *smu, enum smu_clk_type clk_type, int smu_set_soft_freq_range(struct smu_context *smu, enum smu_clk_type clk_type,
uint32_t min, uint32_t max); 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_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_display_count(struct smu_context *smu, uint32_t count);
int smu_set_ac_dc(struct smu_context *smu); int smu_set_ac_dc(struct smu_context *smu);
......
...@@ -46,6 +46,8 @@ ...@@ -46,6 +46,8 @@
#undef pr_info #undef pr_info
#undef pr_debug #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 smu_sys_get_pp_feature_mask(struct smu_context *smu, char *buf)
{ {
size_t size = 0; size_t size = 0;
...@@ -553,6 +555,9 @@ static int smu_early_init(void *handle) ...@@ -553,6 +555,9 @@ static int smu_early_init(void *handle)
smu->smu_baco.state = SMU_BACO_STATE_EXIT; smu->smu_baco.state = SMU_BACO_STATE_EXIT;
smu->smu_baco.platform_support = false; smu->smu_baco.platform_support = false;
adev->powerplay.pp_handle = smu;
adev->powerplay.pp_funcs = &swsmu_pm_funcs;
return smu_set_funcs(adev); return smu_set_funcs(adev);
} }
...@@ -1691,8 +1696,9 @@ int smu_switch_power_profile(struct smu_context *smu, ...@@ -1691,8 +1696,9 @@ int smu_switch_power_profile(struct smu_context *smu,
return 0; 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); struct smu_dpm_context *smu_dpm_ctx = &(smu->smu_dpm);
enum amd_dpm_forced_level level; enum amd_dpm_forced_level level;
...@@ -2723,3 +2729,7 @@ int smu_gfx_state_change_set(struct smu_context *smu, uint32_t state) ...@@ -2723,3 +2729,7 @@ int smu_gfx_state_change_set(struct smu_context *smu, uint32_t state)
return ret; return ret;
} }
static const struct amd_pm_funcs swsmu_pm_funcs = {
.get_performance_level = smu_get_performance_level,
};
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