drm/amd/pm: restore fan_mode AMD_FAN_CTRL_NONE on resume (v2)
Subsystems (3)
PATCH 1/2 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 Lijo Lazar <[email protected]>
Signed-off-by Ryan Taylor <[email protected]>
--- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +3 -1
@@ -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;
Signature · 1 line
2.32.0
PATCH 2/2 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 Lijo Lazar <[email protected]>
Signed-off-by Ryan Taylor <[email protected]>
--- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +3 -2
@@ -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" );
Signature · 1 line
2.32.0
Re: [PATCH 2/2] drm/amd/pm: graceful exit on restore fan mode failure (v2)
Series is:
Reviewed-by Alex Deucher <[email protected]>
Quoted 34 lines · Ryan Taylor
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 Lijo Lazar <[email protected]>Signed-off-by Ryan Taylor <[email protected]>--- drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +3
-3@@ -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" ); --2.32.0