leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/amd/powerplay: Tidy up vega10_fan_ctrl_get_fan_speed_rpm()

Browse Source 
Signed-off-by: Tom St Denis <tom.stdenis@amd.com>
Reviewed-by: Rex Zhu <Rex.Zhu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Tom St Denis 2017-09-07 10:36:40 -04:00 committed by Alex Deucher
parent f85a49bdb6
commit 8c755d9abc
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c
View File

@ -104,14 +104,15 @@ int vega10_fan_ctrl_get_fan_speed_rpm(struct pp_hwmgr *hwmgr, uint32_t *speed)
if (hwmgr->thermal_controller.fanInfo.bNoFan)
return -1;
if (data->smu_features[GNLD_FAN_CONTROL].supported)
if (data->smu_features[GNLD_FAN_CONTROL].supported) {
result = vega10_get_current_rpm(hwmgr, speed);
else {
} else {
uint32_t reg = soc15_get_register_offset(THM_HWID, 0,
mmCG_TACH_STATUS_BASE_IDX, mmCG_TACH_STATUS);
tach_period = (cgs_read_register(hwmgr->device,
reg) & CG_TACH_STATUS__TACH_PERIOD_MASK) >>
CG_TACH_STATUS__TACH_PERIOD__SHIFT;
tach_period =
CGS_REG_GET_FIELD(cgs_read_register(hwmgr->device, reg),
CG_TACH_STATUS,
TACH_PERIOD);
if (tach_period == 0)
return -EINVAL;