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

drm/amd/powerplay: fix dpm freq unit error (10KHz -> Mhz)

Browse Source 
the interface smu_v11_0_get_current_clk_freq should be return 10Khz not
Mhz unit to adapt vega20 and navi10 asic at the same time.

Signed-off-by: Kevin Wang <kevin1.wang@amd.com>
Acked-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-08 14:37:08 +08:00 committed by Alex Deucher
parent 162aa5c31a
commit e36182490d
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/amd/powerplay/navi10_ppt.c
View File

@ -581,6 +581,8 @@ static int navi10_print_clk_levels(struct smu_context *smu,
ret = smu_get_current_clk_freq(smu, clk_type, &cur_value); ret = smu_get_current_clk_freq(smu, clk_type, &cur_value);
if (ret) if (ret)
return size; return size;
/* 10KHz -> MHz */
cur_value = cur_value / 100;
size += sprintf(buf, "current clk: %uMhz\n", cur_value); size += sprintf(buf, "current clk: %uMhz\n", cur_value);

19
drivers/gpu/drm/amd/powerplay/smu_v11_0.c
View File

@ -1098,16 +1098,17 @@ static int smu_v11_0_get_current_clk_freq(struct smu_context *smu,
/* if don't has GetDpmClockFreq Message, try get current clock by SmuMetrics_t */ /* if don't has GetDpmClockFreq Message, try get current clock by SmuMetrics_t */
if (smu_msg_get_index(smu, SMU_MSG_GetDpmClockFreq) == 0) if (smu_msg_get_index(smu, SMU_MSG_GetDpmClockFreq) == 0)
return smu_get_current_clk_freq_by_table(smu, clk_id, value); ret = smu_get_current_clk_freq_by_table(smu, clk_id, &freq);
else {
ret = smu_send_smc_msg_with_param(smu, SMU_MSG_GetDpmClockFreq,
(smu_clk_get_index(smu, clk_id) << 16));
if (ret)
return ret;
ret = smu_send_smc_msg_with_param(smu, SMU_MSG_GetDpmClockFreq, ret = smu_read_smc_arg(smu, &freq);
(smu_clk_get_index(smu, clk_id) << 16)); if (ret)
if (ret) return ret;
return ret; }
ret = smu_read_smc_arg(smu, &freq);
if (ret)
return ret;
freq *= 100; freq *= 100;
*value = freq; *value = freq;