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

drm/amd/powerplay: fix fan speed show error (for hwmon pwm)

Browse Source 
the navi asic can't get current rpm by MSG_GetCurrentRpm,
it will cause show fan rpm error, use Metrics_t to replace it.

Signed-off-by: Kevin Wang <kevin1.wang@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Kevin Wang 2019-06-06 17:12:34 +08:00 committed by Alex Deucher
parent 709527c77a
commit ab43c4bf1c
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -885,15 +885,33 @@ static bool navi10_is_dpm_running(struct smu_context *smu)
return !!(feature_enabled & SMC_DPM_FEATURE); return !!(feature_enabled & SMC_DPM_FEATURE);
} }
static int navi10_get_fan_speed(struct smu_context *smu, uint16_t *value)
{
SmuMetrics_t metrics = {0};
int ret = 0;
if (!value)
return -EINVAL;
ret = smu_update_table(smu, SMU_TABLE_SMU_METRICS,
(void *)&metrics, false);
if (ret)
return ret;
*value = metrics.CurrFanSpeed;
return ret;
}
static int navi10_get_fan_speed_percent(struct smu_context *smu, static int navi10_get_fan_speed_percent(struct smu_context *smu,
uint32_t *speed) uint32_t *speed)
{ {
int ret = 0; int ret = 0;
uint32_t percent = 0; uint32_t percent = 0;
uint32_t current_rpm; uint16_t current_rpm;
PPTable_t *pptable = smu->smu_table.driver_pptable; PPTable_t *pptable = smu->smu_table.driver_pptable;
ret = smu_get_current_rpm(smu, &current_rpm); ret = navi10_get_fan_speed(smu, &current_rpm);
if (ret) if (ret)
return ret; return ret;