diff options
| author |   Ryan Taylor <Ryan.Taylor@amd.com> | 2021-08-06 14:19:40 -0700 |
|---|---|---|
| committer |   Alex Deucher <alexander.deucher@amd.com> | 2021-08-11 17:18:26 -0400 |
| commit | f5bd523988c8c498ab18a35d729999894e4d2cf5 (patch) | |
| tree | 656242fb90eaca3d698e971ce0d8d25637325154 | |
| parent | drm/amd/pm: restore fan_mode AMD_FAN_CTRL_NONE on resume (v2) (diff) | |
| download | linux-dev-f5bd523988c8c498ab18a35d729999894e4d2cf5.tar.xz linux-dev-f5bd523988c8c498ab18a35d729999894e4d2cf5.zip | |
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 <lijo.lazar@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Ryan Taylor <Ryan.Taylor@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
| -rw-r--r-- | drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 5 |
1 files 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"); |