github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-06 13:37:36 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

drm/amdgpu: Revert "drm/amdgpu: getting fan speed pwm for vega10 properly"

Browse Source 
This reverts commit 16fb4dca95.

Unfortunately, that commit causes fan monitors can't be read and written
properly.

Fixes: 16fb4dca95 ("drm/amdgpu: getting fan speed pwm for vega10 properly")
Signed-off-by: Asher Song <Asher.Song@amd.com>
Reviewed-by: Guchun Chen <guchun.chen@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Asher Song 2022-10-14 11:36:33 +08:00 committed by Alex Deucher
parent a31e62873f
commit 4545ae2ed3
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -67,21 +67,22 @@ int vega10_fan_ctrl_get_fan_speed_info(struct pp_hwmgr *hwmgr,
int vega10_fan_ctrl_get_fan_speed_pwm(struct pp_hwmgr *hwmgr, int vega10_fan_ctrl_get_fan_speed_pwm(struct pp_hwmgr *hwmgr,
uint32_t *speed) uint32_t *speed)
{ {
struct amdgpu_device *adev = hwmgr->adev; uint32_t current_rpm;
uint32_t duty100, duty; uint32_t percent = 0;
uint64_t tmp64;
duty100 = REG_GET_FIELD(RREG32_SOC15(THM, 0, mmCG_FDO_CTRL1), if (hwmgr->thermal_controller.fanInfo.bNoFan)
CG_FDO_CTRL1, FMAX_DUTY100); return 0;
duty = REG_GET_FIELD(RREG32_SOC15(THM, 0, mmCG_THERMAL_STATUS),
CG_THERMAL_STATUS, FDO_PWM_DUTY);
if (!duty100) if (vega10_get_current_rpm(hwmgr, &current_rpm))
return -EINVAL; return -1;
tmp64 = (uint64_t)duty * 255; if (hwmgr->thermal_controller.
do_div(tmp64, duty100); advanceFanControlParameters.usMaxFanRPM != 0)
*speed = MIN((uint32_t)tmp64, 255); percent = current_rpm * 255 /
hwmgr->thermal_controller.
advanceFanControlParameters.usMaxFanRPM;
*speed = MIN(percent, 255);
return 0; return 0;
} }