tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

drm/amd/pm: drop unnecessary manual mode check

As the fan control was guarded under manual mode before fan speed
RPM/PWM setting. Thus the extra check is totally redundant.

Signed-off-by: Evan Quan <evan.quan@amd.com>
Reviewed-by: Lijo Lazar <lijo.lazar@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Evan Quan and committed by
Alex Deucher bc08cab6 0d8318e1

+4 -12
+4 -12
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c
··· 1208 1208 1209 1209 speed = MIN(speed, 255); 1210 1210 1211 - if (smu_v11_0_auto_fan_control(smu, 0)) 1212 - return -EINVAL; 1213 - 1214 1211 duty100 = REG_GET_FIELD(RREG32_SOC15(THM, 0, mmCG_FDO_CTRL1), 1215 1212 CG_FDO_CTRL1, FMAX_DUTY100); 1216 1213 if (!duty100) ··· 1234 1237 */ 1235 1238 uint32_t crystal_clock_freq = 2500; 1236 1239 uint32_t tach_period; 1237 - int ret; 1238 - 1239 - ret = smu_v11_0_auto_fan_control(smu, 0); 1240 - if (ret) 1241 - return ret; 1242 1240 1243 1241 /* 1244 1242 * To prevent from possible overheat, some ASICs may have requirement ··· 1249 1257 CG_TACH_CTRL, TARGET_PERIOD, 1250 1258 tach_period)); 1251 1259 1252 - ret = smu_v11_0_set_fan_static_mode(smu, FDO_PWM_MODE_STATIC_RPM); 1253 - 1254 - return ret; 1260 + return smu_v11_0_set_fan_static_mode(smu, FDO_PWM_MODE_STATIC_RPM); 1255 1261 } 1256 1262 1257 1263 int smu_v11_0_get_fan_speed_pwm(struct smu_context *smu, ··· 1320 1330 1321 1331 switch (mode) { 1322 1332 case AMD_FAN_CTRL_NONE: 1323 - ret = smu_v11_0_set_fan_speed_pwm(smu, 255); 1333 + ret = smu_v11_0_auto_fan_control(smu, 0); 1334 + if (!ret) 1335 + ret = smu_v11_0_set_fan_speed_pwm(smu, 255); 1324 1336 break; 1325 1337 case AMD_FAN_CTRL_MANUAL: 1326 1338 ret = smu_v11_0_auto_fan_control(smu, 0);