Series is:
Reviewed-by: Alex Deucher <alexander.deucher@xxxxxxx>
On Tue, Aug 10, 2021 at 3:15 PM Ryan Taylor <Ryan.Taylor@xxxxxxx> wrote:
>
> 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 <lijo.lazar@xxxxxxx>
> Signed-off-by: Ryan Taylor <Ryan.Taylor@xxxxxxx>
> ---
> drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
> index b4b4d615bcbc..00d594e6dd85 100644
> --- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
> +++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
> @@ -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
>
