Commit bc08cab6 authored by Evan Quan's avatar Evan Quan Committed by Alex Deucher
Browse files

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: default avatarEvan Quan <evan.quan@amd.com>
Reviewed-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 0d8318e1

drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c

+4 −12
Original line number Diff line number Diff line
@@ -1208,9 +1208,6 @@ smu_v11_0_set_fan_speed_pwm(struct smu_context *smu, uint32_t speed) 


	speed = MIN(speed, 255);



	if (smu_v11_0_auto_fan_control(smu, 0))

		return -EINVAL;



	duty100 = REG_GET_FIELD(RREG32_SOC15(THM, 0, mmCG_FDO_CTRL1),

				CG_FDO_CTRL1, FMAX_DUTY100);

	if (!duty100)
@@ -1237,11 +1234,6 @@ int smu_v11_0_set_fan_speed_rpm(struct smu_context *smu, 
	 */

	uint32_t crystal_clock_freq = 2500;

	uint32_t tach_period;

	int ret;



	ret = smu_v11_0_auto_fan_control(smu, 0);

	if (ret)

		return ret;



	/*

	 * To prevent from possible overheat, some ASICs may have requirement
@@ -1257,9 +1249,7 @@ int smu_v11_0_set_fan_speed_rpm(struct smu_context *smu, 
				   CG_TACH_CTRL, TARGET_PERIOD,

				   tach_period));



	ret = smu_v11_0_set_fan_static_mode(smu, FDO_PWM_MODE_STATIC_RPM);



	return ret;

	return smu_v11_0_set_fan_static_mode(smu, FDO_PWM_MODE_STATIC_RPM);

}



int smu_v11_0_get_fan_speed_pwm(struct smu_context *smu,
@@ -1330,6 +1320,8 @@ smu_v11_0_set_fan_control_mode(struct smu_context *smu, 


	switch (mode) {

	case AMD_FAN_CTRL_NONE:

		ret = smu_v11_0_auto_fan_control(smu, 0);

		if (!ret)

			ret = smu_v11_0_set_fan_speed_pwm(smu, 255);

		break;

	case AMD_FAN_CTRL_MANUAL: