drm/amd/powerplay: fix Vega10 mclk/socclk voltage link setup
Subsystems (2)
PATCH 1/4 drm/amd/powerplay: fix Vega10 mclk/socclk voltage link setup
This may affects the Vega10 MCLK OD functionality.
--- .../drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 35 +++++++++++++------ 1 file changed, 24 insertions(+), 11 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +24 -11
@@ -5016,7 +5016,7 @@ static void vega10_odn_update_soc_table(struct pp_hwmgr *hwmgr,struct vega10_hwmgr *data = hwmgr->backend;struct phm_ppt_v2_information *table_info = hwmgr->pptable;struct phm_ppt_v1_clock_voltage_dependency_table *dep_table = table_info->vdd_dep_on_socclk; -struct vega10_single_dpm_table *dpm_table = &data->golden_dpm_table.soc_table; +struct vega10_single_dpm_table *dpm_table = &data->golden_dpm_table.mem_table;struct vega10_odn_clock_voltage_dependency_table *podn_vdd_dep_on_socclk = &data->odn_dpm_table.vdd_dep_on_socclk;
@@ -5040,7 +5040,8 @@ static void vega10_odn_update_soc_table(struct pp_hwmgr *hwmgr,break ; }if (j == od_vddc_lookup_table->count) { - od_vddc_lookup_table->entries[j-1 ].us_vdd = + j = od_vddc_lookup_table->count -1 ; + od_vddc_lookup_table->entries[j].us_vdd = podn_vdd_dep->entries[i].vddc; data->need_update_dpm_table |=DPMTABLE_OD_UPDATE_VDDC ; }
@@ -5048,23 +5049,35 @@ static void vega10_odn_update_soc_table(struct pp_hwmgr *hwmgr, } dpm_table = &data->dpm_table.soc_table;for (i =0 ; i < dep_table->count; i++) { -if (dep_table->entries[i].vddInd == podn_vdd_dep->entries[dep_table->count-1 ].vddInd && - dep_table->entries[i].clk < podn_vdd_dep->entries[dep_table->count-1 ].clk) { +if (dep_table->entries[i].vddInd == podn_vdd_dep->entries[podn_vdd_dep->count-1 ].vddInd && + dep_table->entries[i].clk < podn_vdd_dep->entries[podn_vdd_dep->count-1 ].clk) { data->need_update_dpm_table |=DPMTABLE_UPDATE_SOCCLK ; - podn_vdd_dep_on_socclk->entries[i].clk = podn_vdd_dep->entries[dep_table->count-1 ].clk; - dpm_table->dpm_levels[i].value = podn_vdd_dep_on_socclk->entries[i].clk; +for (; (i < dep_table->count) && + (dep_table->entries[i].clk < podn_vdd_dep->entries[podn_vdd_dep->count -1 ].clk); i++) { + podn_vdd_dep_on_socclk->entries[i].clk = podn_vdd_dep->entries[podn_vdd_dep->count-1 ].clk; + dpm_table->dpm_levels[i].value = podn_vdd_dep_on_socclk->entries[i].clk; + } +break ; + }else { + dpm_table->dpm_levels[i].value = dep_table->entries[i].clk; + podn_vdd_dep_on_socclk->entries[i].vddc = dep_table->entries[i].vddc; + podn_vdd_dep_on_socclk->entries[i].vddInd = dep_table->entries[i].vddInd; + podn_vdd_dep_on_socclk->entries[i].clk = dep_table->entries[i].clk; } }if (podn_vdd_dep_on_socclk->entries[podn_vdd_dep_on_socclk->count -1 ].clk < - podn_vdd_dep->entries[dep_table->count-1 ].clk) { + podn_vdd_dep->entries[podn_vdd_dep->count -1 ].clk) { data->need_update_dpm_table |=DPMTABLE_UPDATE_SOCCLK ; - podn_vdd_dep_on_socclk->entries[podn_vdd_dep_on_socclk->count -1 ].clk = podn_vdd_dep->entries[dep_table->count-1 ].clk; - dpm_table->dpm_levels[podn_vdd_dep_on_socclk->count -1 ].value = podn_vdd_dep->entries[dep_table->count-1 ].clk; + podn_vdd_dep_on_socclk->entries[podn_vdd_dep_on_socclk->count -1 ].clk = + podn_vdd_dep->entries[podn_vdd_dep->count -1 ].clk; + dpm_table->dpm_levels[podn_vdd_dep_on_socclk->count -1 ].value = + podn_vdd_dep->entries[podn_vdd_dep->count -1 ].clk; }if (podn_vdd_dep_on_socclk->entries[podn_vdd_dep_on_socclk->count -1 ].vddInd < - podn_vdd_dep->entries[dep_table->count-1 ].vddInd) { + podn_vdd_dep->entries[podn_vdd_dep->count -1 ].vddInd) { data->need_update_dpm_table |=DPMTABLE_UPDATE_SOCCLK ; - podn_vdd_dep_on_socclk->entries[podn_vdd_dep_on_socclk->count -1 ].vddInd = podn_vdd_dep->entries[dep_table->count-1 ].vddInd; + podn_vdd_dep_on_socclk->entries[podn_vdd_dep_on_socclk->count -1 ].vddInd = + podn_vdd_dep->entries[podn_vdd_dep->count -1 ].vddInd; } } }
Signature · 6 lines
2.21.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 2/4 drm/amd/powerplay: valid Vega10 DPMTABLE_OD_UPDATE_VDDC settings
With user specified voltage(DPMTABLE_OD_UPDATE_VDDC), the AVFS will be disabled. However, the buggy code makes this actually not working as expected.
--- drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +1 -6
@@ -2466,11 +2466,6 @@ static void vega10_check_dpm_table_updated(struct pp_hwmgr *hwmgr)return ; } } - -if (data->need_update_dpm_table &DPMTABLE_OD_UPDATE_VDDC ) { - data->need_update_dpm_table &= ~DPMTABLE_OD_UPDATE_VDDC ; - data->need_update_dpm_table |=DPMTABLE_OD_UPDATE_SCLK |DPMTABLE_OD_UPDATE_MCLK ; - } }/**
@@ -3683,7 +3678,7 @@ static int vega10_set_power_state_tasks(struct pp_hwmgr *hwmgr,vega10_update_avfs (hwmgr); - data->need_update_dpm_table &=DPMTABLE_OD_UPDATE_VDDC ; + data->need_update_dpm_table =0 ;return 0 ; }
Signature · 6 lines
2.21.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): [email protected]
RE: [PATCH 2/4] drm/amd/powerplay: valid Vega10 DPMTABLE_OD_UPDATE_VDDC settings
Just sent out a V2 version and drop this one.
Quoted 49 lines
-----Original Message-----
From: Evan Quan <[email protected]>
Sent: 2019年5月7日 14:09
To: [email protected]
Cc: [email protected]; Deucher, Alexander <[email protected]>; Quan, Evan <[email protected]>
Subject: [PATCH 2/4] drm/amd/powerplay: valid Vega10DPMTABLE_OD_UPDATE_VDDCsettingsWith user specified
voltage(DPMTABLE_OD_UPDATE_VDDC), the AVFS will be disabled. However, the buggy code makes this actually not working as expected.Change-Id Ifa83a6255bb3f6fa4bdb4de616521cb7bab6830aSigned-off-by Evan Quan <[email protected]>--- drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +0
-4@@ -2466,11 +2466,6 @@ static void vega10_check_dpm_table_updated(struct pp_hwmgr *hwmgr) return; } } - -if (data->need_update_dpm_table & DPMTABLE_OD_UPDATE_VDDC) { - data->need_update_dpm_table &= ~DPMTABLE_OD_UPDATE_VDDC ; - data->need_update_dpm_table |=
DPMTABLE_OD_UPDATE_SCLK|DPMTABLE_OD_UPDATE_MCLK;drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +1
-2- } }/** @@ -3683,7 +3678,7 @@ static int vega10_set_power_state_tasks(structpp_hwmgr *hwmgr,vega10_update_avfs (hwmgr ); - data->need_update_dpm_table &=DPMTABLE_OD_UPDATE_VDDC ; + data->need_update_dpm_table =0 ;return 0 ;
Quoted 3 lines
}
--
2.21.0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/4 drm/amd/powerplay: avoid repeat AVFS enablement/disablement
In reply to a message not in the archiveNo need to enable or disable AVFS if it's already in wanted state.
--- drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +4 -0
@@ -2364,6 +2364,10 @@ static int vega10_avfs_enable(struct pp_hwmgr *hwmgr, bool enable)struct vega10_hwmgr *data = hwmgr->backend; if (data->smu_features[GNLD_AVFS].supported) { + /* Already enabled or disabled */ + if (!(enable ^ data->smu_features[GNLD_AVFS].enabled)) + return 0; + if (enable) { PP_ASSERT_WITH_CODE(!vega10_enable_smc_features(hwmgr, true,
Signature · 6 lines
2.21.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 4/4 drm/amd/powerplay: update Vega10 power state on OD
In reply to a message not in the archiveUpdate Vega10 top performance level power state accordingly on OD.
--- .../drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 59 +++++++++++++++++++ 1 file changed, 59 insertions(+)
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +59 -0
@@ -5009,6 +5009,63 @@ static bool vega10_check_clk_voltage_valid(struct pp_hwmgr *hwmgr,return true; } +static void vega10_odn_update_power_state (struct pp_hwmgr *hwmgr) +{ +struct vega10_hwmgr *data = hwmgr->backend; +struct pp_power_state *ps = hwmgr->request_ps; +struct vega10_power_state *vega10_ps; +struct vega10_single_dpm_table *gfx_dpm_table = + &data->dpm_table.gfx_table; +struct vega10_single_dpm_table *soc_dpm_table = + &data->dpm_table.soc_table; +struct vega10_single_dpm_table *mem_dpm_table = + &data->dpm_table.mem_table; +int max_level; + +if (!ps) +return ; + + vega10_ps =cast_phw_vega10_power_state (&ps->hardware); + max_level = vega10_ps->performance_level_count -1 ; + +if (vega10_ps->performance_levels[max_level].gfx_clock != + gfx_dpm_table->dpm_levels[gfx_dpm_table->count -1 ].value) + vega10_ps->performance_levels[max_level].gfx_clock = + gfx_dpm_table->dpm_levels[gfx_dpm_table->count -1 ].value; + +if (vega10_ps->performance_levels[max_level].soc_clock != + soc_dpm_table->dpm_levels[soc_dpm_table->count -1 ].value) + vega10_ps->performance_levels[max_level].soc_clock = + soc_dpm_table->dpm_levels[soc_dpm_table->count -1 ].value; + +if (vega10_ps->performance_levels[max_level].mem_clock != + mem_dpm_table->dpm_levels[mem_dpm_table->count -1 ].value) + vega10_ps->performance_levels[max_level].mem_clock = + mem_dpm_table->dpm_levels[mem_dpm_table->count -1 ].value; + +if (!hwmgr->ps) +return ; + + ps = (struct pp_power_state *)((unsigned long )(hwmgr->ps) + hwmgr->ps_size * (hwmgr->num_ps -1 )); + vega10_ps =cast_phw_vega10_power_state (&ps->hardware); + max_level = vega10_ps->performance_level_count -1 ; + +if (vega10_ps->performance_levels[max_level].gfx_clock != + gfx_dpm_table->dpm_levels[gfx_dpm_table->count -1 ].value) + vega10_ps->performance_levels[max_level].gfx_clock = + gfx_dpm_table->dpm_levels[gfx_dpm_table->count -1 ].value; + +if (vega10_ps->performance_levels[max_level].soc_clock != + soc_dpm_table->dpm_levels[soc_dpm_table->count -1 ].value) + vega10_ps->performance_levels[max_level].soc_clock = + soc_dpm_table->dpm_levels[soc_dpm_table->count -1 ].value; + +if (vega10_ps->performance_levels[max_level].mem_clock != + mem_dpm_table->dpm_levels[mem_dpm_table->count -1 ].value) + vega10_ps->performance_levels[max_level].mem_clock = + mem_dpm_table->dpm_levels[mem_dpm_table->count -1 ].value; +} +static void vega10_odn_update_soc_table (struct pp_hwmgr *hwmgr,enum PP_OD_DPM_TABLE_COMMAND type) {
@@ -5079,6 +5136,7 @@ static void vega10_odn_update_soc_table(struct pp_hwmgr *hwmgr, podn_vdd_dep->entries[podn_vdd_dep->count -1 ].vddInd; } } +vega10_odn_update_power_state (hwmgr); } static int vega10_odn_edit_dpm_table(struct pp_hwmgr *hwmgr,
@@ -5113,6 +5171,7 @@ static int vega10_odn_edit_dpm_table(struct pp_hwmgr *hwmgr, }else if (PP_OD_RESTORE_DEFAULT_TABLE == type) {memcpy (&(data->dpm_table), &(data->golden_dpm_table),sizeof (struct vega10_dpm_table ));vega10_odn_initial_default_setting (hwmgr); +vega10_odn_update_power_state (hwmgr);return 0 ; }else if (PP_OD_COMMIT_DPM_TABLE == type) {vega10_check_dpm_table_updated (hwmgr);
Signature · 6 lines
2.21.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): [email protected]
Alex Deucher
Acked-byRe: [PATCH 4/4] drm/amd/powerplay: update Vega10 power state on OD
Quoted 6 lines · Evan Quan
Update Vega10 top performance level power state accordingly on OD.
Change-Id Iaadeefb2904222bf5f4d54b39d7179ce53f92ac0Signed-off-by Evan Quan <[email protected]>
Series is:
Quoted 91 lines
--- .../drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 59 +++++++++++++++++++ 1 file changed, 59 insertions(+)drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +59
-1@@ -5009,6 +5009,63 @@ static bool vega10_check_clk_voltage_valid(struct pp_hwmgr *hwmgr,return true; } +static void vega10_odn_update_power_state (struct pp_hwmgr *hwmgr) +{ +struct vega10_hwmgr *data = hwmgr->backend; +struct pp_power_state *ps = hwmgr->request_ps; +struct vega10_power_state *vega10_ps; +struct vega10_single_dpm_table *gfx_dpm_table = + &data->dpm_table.gfx_table; +struct vega10_single_dpm_table *soc_dpm_table = + &data->dpm_table.soc_table; +struct vega10_single_dpm_table *mem_dpm_table = + &data->dpm_table.mem_table; +int max_level; + +if (!ps) +return ; + + vega10_ps =cast_phw_vega10_power_state (&ps->hardware); + max_level = vega10_ps->performance_level_count -1 ; + +if (vega10_ps->performance_levels[max_level].gfx_clock != + gfx_dpm_table->dpm_levels[gfx_dpm_table->count -1 ].value) + vega10_ps->performance_levels[max_level].gfx_clock = + gfx_dpm_table->dpm_levels[gfx_dpm_table->count -1 ].value; + +if (vega10_ps->performance_levels[max_level].soc_clock != + soc_dpm_table->dpm_levels[soc_dpm_table->count -1 ].value) + vega10_ps->performance_levels[max_level].soc_clock = + soc_dpm_table->dpm_levels[soc_dpm_table->count -1 ].value; + +if (vega10_ps->performance_levels[max_level].mem_clock != + mem_dpm_table->dpm_levels[mem_dpm_table->count -1 ].value) + vega10_ps->performance_levels[max_level].mem_clock = + mem_dpm_table->dpm_levels[mem_dpm_table->count -1 ].value; + +if (!hwmgr->ps) +return ; + + ps = (struct pp_power_state *)((unsigned long )(hwmgr->ps) + hwmgr->ps_size * (hwmgr->num_ps -1 )); + vega10_ps =cast_phw_vega10_power_state (&ps->hardware); + max_level = vega10_ps->performance_level_count -1 ; + +if (vega10_ps->performance_levels[max_level].gfx_clock != + gfx_dpm_table->dpm_levels[gfx_dpm_table->count -1 ].value) + vega10_ps->performance_levels[max_level].gfx_clock = + gfx_dpm_table->dpm_levels[gfx_dpm_table->count -1 ].value; + +if (vega10_ps->performance_levels[max_level].soc_clock != + soc_dpm_table->dpm_levels[soc_dpm_table->count -1 ].value) + vega10_ps->performance_levels[max_level].soc_clock = + soc_dpm_table->dpm_levels[soc_dpm_table->count -1 ].value; + +if (vega10_ps->performance_levels[max_level].mem_clock != + mem_dpm_table->dpm_levels[mem_dpm_table->count -1 ].value) + vega10_ps->performance_levels[max_level].mem_clock = + mem_dpm_table->dpm_levels[mem_dpm_table->count -1 ].value; +} +static void vega10_odn_update_soc_table (struct pp_hwmgr *hwmgr,enum PP_OD_DPM_TABLE_COMMAND type) {@@ -5079,6 +5136,7 @@ static void vega10_odn_update_soc_table(struct pp_hwmgr *hwmgr, podn_vdd_dep->entries[podn_vdd_dep->count -1 ].vddInd; } } +vega10_odn_update_power_state (hwmgr); } static int vega10_odn_edit_dpm_table(struct pp_hwmgr *hwmgr,@@ -5113,6 +5171,7 @@ static int vega10_odn_edit_dpm_table(struct pp_hwmgr *hwmgr, }else if (PP_OD_RESTORE_DEFAULT_TABLE == type) {memcpy (&(data->dpm_table), &(data->golden_dpm_table),sizeof (struct vega10_dpm_table ));vega10_odn_initial_default_setting (hwmgr); +vega10_odn_update_power_state (hwmgr);return 0 ; }else if (PP_OD_COMMIT_DPM_TABLE == type) {vega10_check_dpm_table_updated (hwmgr); --2.21.0
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx