Commit e9c5b46e authored by Likun Gao's avatar Likun Gao Committed by Alex Deucher

drm/amd/powerplay: add sys interface for set sclk_od/mclk_od for smu

Add sys interface for set pp_sclk_od and pp_mclk_od for smu.
Signed-off-by: default avatarLikun Gao <Likun.Gao@amd.com>
Reviewed-by: default avatarHuang Rui <ray.huang@amd.com>
Reviewed-by: default avatarKevin Wang <kevin1.wang@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 31535a40
...@@ -1069,6 +1069,10 @@ static ssize_t amdgpu_set_pp_sclk_od(struct device *dev, ...@@ -1069,6 +1069,10 @@ static ssize_t amdgpu_set_pp_sclk_od(struct device *dev,
count = -EINVAL; count = -EINVAL;
goto fail; goto fail;
} }
if (is_support_sw_smu(adev)) {
value = smu_set_od_percentage(&(adev->smu), OD_SCLK, (uint32_t)value);
} else {
if (adev->powerplay.pp_funcs->set_sclk_od) if (adev->powerplay.pp_funcs->set_sclk_od)
amdgpu_dpm_set_sclk_od(adev, (uint32_t)value); amdgpu_dpm_set_sclk_od(adev, (uint32_t)value);
...@@ -1078,6 +1082,7 @@ static ssize_t amdgpu_set_pp_sclk_od(struct device *dev, ...@@ -1078,6 +1082,7 @@ static ssize_t amdgpu_set_pp_sclk_od(struct device *dev,
adev->pm.dpm.current_ps = adev->pm.dpm.boot_ps; adev->pm.dpm.current_ps = adev->pm.dpm.boot_ps;
amdgpu_pm_compute_clocks(adev); amdgpu_pm_compute_clocks(adev);
} }
}
fail: fail:
return count; return count;
...@@ -1115,6 +1120,10 @@ static ssize_t amdgpu_set_pp_mclk_od(struct device *dev, ...@@ -1115,6 +1120,10 @@ static ssize_t amdgpu_set_pp_mclk_od(struct device *dev,
count = -EINVAL; count = -EINVAL;
goto fail; goto fail;
} }
if (is_support_sw_smu(adev)) {
value = smu_set_od_percentage(&(adev->smu), OD_MCLK, (uint32_t)value);
} else {
if (adev->powerplay.pp_funcs->set_mclk_od) if (adev->powerplay.pp_funcs->set_mclk_od)
amdgpu_dpm_set_mclk_od(adev, (uint32_t)value); amdgpu_dpm_set_mclk_od(adev, (uint32_t)value);
...@@ -1124,6 +1133,7 @@ static ssize_t amdgpu_set_pp_mclk_od(struct device *dev, ...@@ -1124,6 +1133,7 @@ static ssize_t amdgpu_set_pp_mclk_od(struct device *dev,
adev->pm.dpm.current_ps = adev->pm.dpm.boot_ps; adev->pm.dpm.current_ps = adev->pm.dpm.boot_ps;
amdgpu_pm_compute_clocks(adev); amdgpu_pm_compute_clocks(adev);
} }
}
fail: fail:
return count; return count;
......
...@@ -414,6 +414,9 @@ struct pptable_funcs { ...@@ -414,6 +414,9 @@ struct pptable_funcs {
uint32_t index, uint32_t index,
uint32_t value); uint32_t value);
int (*get_od_percentage)(struct smu_context *smu, enum pp_clock_type type); int (*get_od_percentage)(struct smu_context *smu, enum pp_clock_type type);
int (*set_od_percentage)(struct smu_context *smu,
enum pp_clock_type type,
uint32_t value);
int (*get_clock_by_type_with_latency)(struct smu_context *smu, int (*get_clock_by_type_with_latency)(struct smu_context *smu,
enum amd_pp_clock_type type, enum amd_pp_clock_type type,
struct struct
...@@ -598,6 +601,8 @@ struct smu_funcs ...@@ -598,6 +601,8 @@ struct smu_funcs
((smu)->ppt_funcs->force_clk_levels ? (smu)->ppt_funcs->force_clk_levels((smu), (type), (level)) : 0) ((smu)->ppt_funcs->force_clk_levels ? (smu)->ppt_funcs->force_clk_levels((smu), (type), (level)) : 0)
#define smu_get_od_percentage(smu, type) \ #define smu_get_od_percentage(smu, type) \
((smu)->ppt_funcs->get_od_percentage ? (smu)->ppt_funcs->get_od_percentage((smu), (type)) : 0) ((smu)->ppt_funcs->get_od_percentage ? (smu)->ppt_funcs->get_od_percentage((smu), (type)) : 0)
#define smu_set_od_percentage(smu, type, value) \
((smu)->ppt_funcs->set_od_percentage ? (smu)->ppt_funcs->set_od_percentage((smu), (type), (value)) : 0)
#define smu_start_thermal_control(smu) \ #define smu_start_thermal_control(smu) \
((smu)->funcs->start_thermal_control? (smu)->funcs->start_thermal_control((smu)) : 0) ((smu)->funcs->start_thermal_control? (smu)->funcs->start_thermal_control((smu)) : 0)
#define smu_read_sensor(smu, sensor, data, size) \ #define smu_read_sensor(smu, sensor, data, size) \
......
...@@ -1924,6 +1924,67 @@ static int vega20_update_specified_od8_value(struct smu_context *smu, ...@@ -1924,6 +1924,67 @@ static int vega20_update_specified_od8_value(struct smu_context *smu,
return 0; return 0;
} }
static int vega20_set_od_percentage(struct smu_context *smu,
enum pp_clock_type type,
uint32_t value)
{
struct smu_dpm_context *smu_dpm = &smu->smu_dpm;
struct vega20_dpm_table *dpm_table = NULL;
struct vega20_dpm_table *golden_table = NULL;
struct vega20_single_dpm_table *single_dpm_table;
struct vega20_single_dpm_table *golden_dpm_table;
uint32_t od_clk, index;
int ret, feature_enabled;
PPCLK_e clk_id;
dpm_table = smu_dpm->dpm_context;
golden_table = smu_dpm->golden_dpm_context;
switch (type) {
case OD_SCLK:
single_dpm_table = &(dpm_table->gfx_table);
golden_dpm_table = &(golden_table->gfx_table);
feature_enabled = smu_feature_is_enabled(smu, FEATURE_DPM_GFXCLK_BIT);
clk_id = PPCLK_GFXCLK;
index = OD8_SETTING_GFXCLK_FMAX;
break;
case OD_MCLK:
single_dpm_table = &(dpm_table->mem_table);
golden_dpm_table = &(golden_table->mem_table);
feature_enabled = smu_feature_is_enabled(smu, FEATURE_DPM_UCLK_BIT);
clk_id = PPCLK_UCLK;
index = OD8_SETTING_UCLK_FMAX;
break;
default:
return -EINVAL;
break;
}
od_clk = golden_dpm_table->dpm_levels[golden_dpm_table->count - 1].value * value;
od_clk /= 100;
od_clk += golden_dpm_table->dpm_levels[golden_dpm_table->count - 1].value;
ret = smu_update_od8_settings(smu, index, od_clk);
if (ret) {
pr_err("[Setoverdrive] failed to set od clk!\n");
return ret;
}
if (feature_enabled) {
ret = vega20_set_single_dpm_table(smu, single_dpm_table,
clk_id);
if (ret) {
pr_err("[Setoverdrive] failed to refresh dpm table!\n");
return ret;
}
} else {
single_dpm_table->count = 1;
single_dpm_table->dpm_levels[0].value = smu->smu_table.boot_values.gfxclk / 100;
}
return 0;
}
static const struct pptable_funcs vega20_ppt_funcs = { static const struct pptable_funcs vega20_ppt_funcs = {
.alloc_dpm_context = vega20_allocate_dpm_context, .alloc_dpm_context = vega20_allocate_dpm_context,
.store_powerplay_table = vega20_store_powerplay_table, .store_powerplay_table = vega20_store_powerplay_table,
...@@ -1944,6 +2005,7 @@ static const struct pptable_funcs vega20_ppt_funcs = { ...@@ -1944,6 +2005,7 @@ static const struct pptable_funcs vega20_ppt_funcs = {
.get_performance_level = vega20_get_performance_level, .get_performance_level = vega20_get_performance_level,
.force_performance_level = vega20_force_performance_level, .force_performance_level = vega20_force_performance_level,
.update_specified_od8_value = vega20_update_specified_od8_value, .update_specified_od8_value = vega20_update_specified_od8_value,
.set_od_percentage = vega20_set_od_percentage,
}; };
void vega20_set_ppt_funcs(struct smu_context *smu) void vega20_set_ppt_funcs(struct smu_context *smu)
......
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