Commit c7a063a2 authored by Kevin Wang's avatar Kevin Wang Committed by Alex Deucher

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

use sw-smu clk type name to replace legacy clk type name
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 6f6a7bba
...@@ -564,9 +564,9 @@ struct pptable_funcs { ...@@ -564,9 +564,9 @@ struct pptable_funcs {
int (*update_specified_od8_value)(struct smu_context *smu, int (*update_specified_od8_value)(struct smu_context *smu,
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 smu_clk_type clk_type);
int (*set_od_percentage)(struct smu_context *smu, int (*set_od_percentage)(struct smu_context *smu,
enum pp_clock_type type, enum smu_clk_type clk_type,
uint32_t value); uint32_t value);
int (*od_edit_dpm_table)(struct smu_context *smu, int (*od_edit_dpm_table)(struct smu_context *smu,
enum PP_OD_DPM_TABLE_COMMAND type, enum PP_OD_DPM_TABLE_COMMAND type,
......
...@@ -1690,7 +1690,7 @@ static int vega20_get_metrics_table(struct smu_context *smu, ...@@ -1690,7 +1690,7 @@ static int vega20_get_metrics_table(struct smu_context *smu,
return ret; return ret;
} }
static int vega20_get_od_percentage(struct smu_context *smu, 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 smu_dpm_context *smu_dpm = &smu->smu_dpm;
struct vega20_dpm_table *dpm_table = NULL; struct vega20_dpm_table *dpm_table = NULL;
...@@ -1702,12 +1702,12 @@ static int vega20_get_od_percentage(struct smu_context *smu, ...@@ -1702,12 +1702,12 @@ static int vega20_get_od_percentage(struct smu_context *smu,
dpm_table = smu_dpm->dpm_context; dpm_table = smu_dpm->dpm_context;
golden_table = smu_dpm->golden_dpm_context; golden_table = smu_dpm->golden_dpm_context;
switch (type) { switch (clk_type) {
case OD_SCLK: case SMU_OD_SCLK:
single_dpm_table = &(dpm_table->gfx_table); single_dpm_table = &(dpm_table->gfx_table);
golden_dpm_table = &(golden_table->gfx_table); golden_dpm_table = &(golden_table->gfx_table);
break; break;
case OD_MCLK: case SMU_OD_MCLK:
single_dpm_table = &(dpm_table->mem_table); single_dpm_table = &(dpm_table->mem_table);
golden_dpm_table = &(golden_table->mem_table); golden_dpm_table = &(golden_table->mem_table);
break; break;
...@@ -2447,7 +2447,7 @@ static int vega20_update_specified_od8_value(struct smu_context *smu, ...@@ -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, static int vega20_set_od_percentage(struct smu_context *smu,
enum pp_clock_type type, enum smu_clk_type clk_type,
uint32_t value) uint32_t value)
{ {
struct smu_dpm_context *smu_dpm = &smu->smu_dpm; struct smu_dpm_context *smu_dpm = &smu->smu_dpm;
...@@ -2465,15 +2465,15 @@ static int vega20_set_od_percentage(struct smu_context *smu, ...@@ -2465,15 +2465,15 @@ static int vega20_set_od_percentage(struct smu_context *smu,
dpm_table = smu_dpm->dpm_context; dpm_table = smu_dpm->dpm_context;
golden_table = smu_dpm->golden_dpm_context; golden_table = smu_dpm->golden_dpm_context;
switch (type) { switch (clk_type) {
case OD_SCLK: case SMU_OD_SCLK:
single_dpm_table = &(dpm_table->gfx_table); single_dpm_table = &(dpm_table->gfx_table);
golden_dpm_table = &(golden_table->gfx_table); golden_dpm_table = &(golden_table->gfx_table);
feature_enabled = smu_feature_is_enabled(smu, SMU_FEATURE_DPM_GFXCLK_BIT); feature_enabled = smu_feature_is_enabled(smu, SMU_FEATURE_DPM_GFXCLK_BIT);
clk_id = PPCLK_GFXCLK; clk_id = PPCLK_GFXCLK;
index = OD8_SETTING_GFXCLK_FMAX; index = OD8_SETTING_GFXCLK_FMAX;
break; break;
case OD_MCLK: case SMU_OD_MCLK:
single_dpm_table = &(dpm_table->mem_table); single_dpm_table = &(dpm_table->mem_table);
golden_dpm_table = &(golden_table->mem_table); golden_dpm_table = &(golden_table->mem_table);
feature_enabled = smu_feature_is_enabled(smu, SMU_FEATURE_DPM_UCLK_BIT); feature_enabled = smu_feature_is_enabled(smu, SMU_FEATURE_DPM_UCLK_BIT);
......
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