openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/amd/powerplay: fix arcturus real-time clock frequency retrieval 

Make sure we can still get the accurate gfxclk/uclk/socclk frequency
even on dpm disabled.

Signed-off-by: Evan Quan <evan.quan@amd.com>
Reviewed-by: Kenneth Feng <kenneth.feng@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Evan Quan 2019-07-23 11:42:24 +08:00 committed by Alex Deucher
parent 790ef68afc
commit 4bf76e60b9
1 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c
View File

@ -1053,7 +1053,35 @@ static int arcturus_get_current_clk_freq_by_table(struct smu_context *smu,
if (ret)
return ret;
*value = metrics.CurrClock[clk_id];
switch (clk_id) {
case PPCLK_GFXCLK:
/*
* CurrClock[clk_id] can provide accurate
* output only when the dpm feature is enabled.
* We can use Average_* for dpm disabled case.
* But this is available for gfxclk/uclk/socclk.
*/
if (smu_feature_is_enabled(smu, SMU_FEATURE_DPM_GFXCLK_BIT))
*value = metrics.CurrClock[PPCLK_GFXCLK];
else
*value = metrics.AverageGfxclkFrequency;
break;
case PPCLK_UCLK:
if (smu_feature_is_enabled(smu, SMU_FEATURE_DPM_UCLK_BIT))
*value = metrics.CurrClock[PPCLK_UCLK];
else
*value = metrics.AverageUclkFrequency;
break;
case PPCLK_SOCCLK:
if (smu_feature_is_enabled(smu, SMU_FEATURE_DPM_SOCCLK_BIT))
*value = metrics.CurrClock[PPCLK_SOCCLK];
else
*value = metrics.AverageSocclkFrequency;
break;
default:
*value = metrics.CurrClock[clk_id];
break;
}
return ret;
}