iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/amd/powerplay: fix clk type name error OD_SCLK OD_MCLK

Browse Source 
use sw-smu clk type name to replace legacy clk type name

Signed-off-by: Kevin Wang <kevin1.wang@amd.com>
Reviewed-by: Huang Rui <ray.huang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Kevin Wang 2019-05-16 18:24:08 +08:00 committed by Alex Deucher
parent 6f6a7bba69
commit c7a063a2f2
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
View File

@ -564,9 +564,9 @@ struct pptable_funcs {
int (*update_specified_od8_value)(struct smu_context *smu,
uint32_t index,
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 smu_clk_type clk_type);
int (*set_od_percentage)(struct smu_context *smu,
enum pp_clock_type type,
enum smu_clk_type clk_type,
uint32_t value);
int (*od_edit_dpm_table)(struct smu_context *smu,
enum PP_OD_DPM_TABLE_COMMAND type,

16
drivers/gpu/drm/amd/powerplay/vega20_ppt.c
View File

@ -1690,7 +1690,7 @@ static int vega20_get_metrics_table(struct smu_context *smu,
return ret;
}
static int vega20_get_od_percentage(struct smu_context *smu,
enum pp_clock_type type)
enum smu_clk_type clk_type)
{
struct smu_dpm_context *smu_dpm = &smu->smu_dpm;
struct vega20_dpm_table *dpm_table = NULL;
@ -1702,12 +1702,12 @@ static int vega20_get_od_percentage(struct smu_context *smu,
dpm_table = smu_dpm->dpm_context;
golden_table = smu_dpm->golden_dpm_context;
switch (type) {
case OD_SCLK:
switch (clk_type) {
case SMU_OD_SCLK:
single_dpm_table = &(dpm_table->gfx_table);
golden_dpm_table = &(golden_table->gfx_table);
break;
case OD_MCLK:
case SMU_OD_MCLK:
single_dpm_table = &(dpm_table->mem_table);
golden_dpm_table = &(golden_table->mem_table);
break;
@ -2447,7 +2447,7 @@ static int vega20_update_specified_od8_value(struct smu_context *smu,
}
static int vega20_set_od_percentage(struct smu_context *smu,
enum pp_clock_type type,
enum smu_clk_type clk_type,
uint32_t value)
{
struct smu_dpm_context *smu_dpm = &smu->smu_dpm;
@ -2465,15 +2465,15 @@ static int vega20_set_od_percentage(struct smu_context *smu,
dpm_table = smu_dpm->dpm_context;
golden_table = smu_dpm->golden_dpm_context;
switch (type) {
case OD_SCLK:
switch (clk_type) {
case SMU_OD_SCLK:
single_dpm_table = &(dpm_table->gfx_table);
golden_dpm_table = &(golden_table->gfx_table);
feature_enabled = smu_feature_is_enabled(smu, SMU_FEATURE_DPM_GFXCLK_BIT);
clk_id = PPCLK_GFXCLK;
index = OD8_SETTING_GFXCLK_FMAX;
break;
case OD_MCLK:
case SMU_OD_MCLK:
single_dpm_table = &(dpm_table->mem_table);
golden_dpm_table = &(golden_table->mem_table);
feature_enabled = smu_feature_is_enabled(smu, SMU_FEATURE_DPM_UCLK_BIT);