diff options
| author | Dave Airlie <[email protected]> | 2021-03-25 20:28:17 +0000 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2021-03-25 20:28:18 +0000 |
| commit | 4e8d123fca536d1b55f5f9927ad9ee5a444ac41b (patch) | |
| tree | 56cb460b22aab3f294655a4a25a5d971e24ebcb3 /drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | |
| parent | Merge branch 'linux-5.12' of git://github.com/skeggsb/linux into drm-fixes (diff) | |
| parent | drm/amdgpu/display: restore AUX_DPHY_TX_CONTROL for DCN2.x (diff) | |
| download | kernel-4e8d123fca536d1b55f5f9927ad9ee5a444ac41b.tar.gz kernel-4e8d123fca536d1b55f5f9927ad9ee5a444ac41b.zip | |
Merge tag 'amd-drm-fixes-5.12-2021-03-24' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes
amd-drm-fixes-5.12-2021-03-24:
amdgpu:
- S0ix fixes
- Add PCI ID
- Polaris PCIe DPM fix
- Display fix for high refresh rate monitors
Signed-off-by: Dave Airlie <[email protected]>
From: Alex Deucher <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/dce_v6_0.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c index 83a88385b762..13322000ebd6 100644 --- a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +++ b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c @@ -2770,7 +2770,11 @@ static int dce_v6_0_hw_fini(void *handle) static int dce_v6_0_suspend(void *handle) { struct amdgpu_device *adev = (struct amdgpu_device *)handle; + int r; + r = amdgpu_display_suspend_helper(adev); + if (r) + return r; adev->mode_info.bl_level = amdgpu_atombios_encoder_get_backlight_level_from_reg(adev); @@ -2794,8 +2798,10 @@ static int dce_v6_0_resume(void *handle) amdgpu_display_backlight_set_level(adev, adev->mode_info.bl_encoder, bl_level); } + if (ret) + return ret; - return ret; + return amdgpu_display_resume_helper(adev); } static bool dce_v6_0_is_idle(void *handle) |