diff options
| author | Tom St Denis | 2017-09-07 18:59:32 +0200 |
|---|---|---|
| committer | Alex Deucher | 2017-09-12 20:32:22 +0200 |
| commit | 657b1f469744ea7fe891dbd037bdd7af2fc8f777 (patch) | |
| tree | 28cc1f5025c03ad3d3216c1bf1d1d09589ec8a71 /drivers/gpu/drm/amd/powerplay | |
| parent | drm/amd/powerplay: Fix indentation in vega10_fan_ctrl_reset_fan_speed_to_defa... (diff) | |
| download | kernel-qcow2-linux-657b1f469744ea7fe891dbd037bdd7af2fc8f777.tar.gz kernel-qcow2-linux-657b1f469744ea7fe891dbd037bdd7af2fc8f777.tar.xz kernel-qcow2-linux-657b1f469744ea7fe891dbd037bdd7af2fc8f777.zip | |
drm/amd/powerplay: Tidy up vega10_fan_ctrl_set_fan_speed_rpm()
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>
Diffstat (limited to 'drivers/gpu/drm/amd/powerplay')
| -rw-r--r-- | drivers/gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c index 664133eeb59c..ff0a89ca72c2 100644 --- a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c @@ -330,8 +330,8 @@ int vega10_fan_ctrl_set_fan_speed_rpm(struct pp_hwmgr *hwmgr, uint32_t speed) uint32_t reg; if (hwmgr->thermal_controller.fanInfo.bNoFan || - (speed < hwmgr->thermal_controller.fanInfo.ulMinRPM) || - (speed > hwmgr->thermal_controller.fanInfo.ulMaxRPM)) + (speed < hwmgr->thermal_controller.fanInfo.ulMinRPM) || + (speed > hwmgr->thermal_controller.fanInfo.ulMaxRPM)) return -1; if (PP_CAP(PHM_PlatformCaps_MicrocodeFanControl)) @@ -343,9 +343,9 @@ int vega10_fan_ctrl_set_fan_speed_rpm(struct pp_hwmgr *hwmgr, uint32_t speed) reg = soc15_get_register_offset(THM_HWID, 0, mmCG_TACH_STATUS_BASE_IDX, mmCG_TACH_STATUS); cgs_write_register(hwmgr->device, reg, - (cgs_read_register(hwmgr->device, reg) & - ~CG_TACH_STATUS__TACH_PERIOD_MASK) | - (tach_period << CG_TACH_STATUS__TACH_PERIOD__SHIFT)); + CGS_REG_SET_FIELD(cgs_read_register(hwmgr->device, reg), + CG_TACH_STATUS, TACH_PERIOD, + tach_period)); } return vega10_fan_ctrl_set_static_mode(hwmgr, FDO_PWM_MODE_STATIC_RPM); } |