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

drm/amd/pm: restore fan_mode AMD_FAN_CTRL_NONE on resume (v2) 



Adds missing edge case to smu_restore_dpm_user_profile.

v2: Don't restore fan mode auto (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 fdf8eea5

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

+3 −1
Original line number Diff line number Diff line
@@ -403,7 +403,8 @@ static void smu_restore_dpm_user_profile(struct smu_context *smu) 
	}



	/* set the user dpm fan configurations */

	if (smu->user_dpm_profile.fan_mode == AMD_FAN_CTRL_MANUAL) {

	if (smu->user_dpm_profile.fan_mode == AMD_FAN_CTRL_MANUAL ||

	    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) {

			dev_err(smu->adev->dev, "Failed to set manual fan control mode\n");
@@ -620,6 +621,7 @@ static int smu_early_init(void *handle) 
	mutex_init(&smu->smu_baco.mutex);

	smu->smu_baco.state = SMU_BACO_STATE_EXIT;

	smu->smu_baco.platform_support = false;

	smu->user_dpm_profile.fan_mode = -1;



	adev->powerplay.pp_handle = smu;

	adev->powerplay.pp_funcs = &swsmu_pm_funcs;