Commit f5bd5239 authored by Ryan Taylor's avatar Ryan Taylor Committed by Alex Deucher
Browse files

drm/amd/pm: graceful exit on restore fan mode failure (v2) 



Attempt od settings restore and disable restore flag on restore fan mode
failure.

v2: Update fan mode to auto and fan speed to zero (Lijo)

Reviewed-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarRyan Taylor <Ryan.Taylor@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 5d58f1a5

drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c

+3 −2
Original line number Diff line number Diff line
@@ -407,11 +407,12 @@ static void smu_restore_dpm_user_profile(struct smu_context *smu) 
	    smu->user_dpm_profile.fan_mode == AMD_FAN_CTRL_NONE) {

		ret = smu_set_fan_control_mode(smu, smu->user_dpm_profile.fan_mode);

		if (ret) {

			smu->user_dpm_profile.fan_speed_percent = 0;

			smu->user_dpm_profile.fan_mode = AMD_FAN_CTRL_AUTO;

			dev_err(smu->adev->dev, "Failed to set manual fan control mode\n");

			return;

		}



		if (!ret && smu->user_dpm_profile.fan_speed_percent) {

		if (smu->user_dpm_profile.fan_speed_percent) {

			ret = smu_set_fan_speed_percent(smu, smu->user_dpm_profile.fan_speed_percent);

			if (ret)

				dev_err(smu->adev->dev, "Failed to set manual fan speed\n");