diff options
| author | Dave Airlie <airlied@redhat.com> | 2021-05-28 02:18:04 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2021-05-28 02:18:04 +0300 |
| commit | ac6e9e3d19e4fd14e1e6b9a5d65c5a847f3dff02 (patch) | |
| tree | 91a64c7766bc1c8cc6ab94bc8aa7a34c9c0c6e13 /drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | |
| parent | c4681547bcce777daf576925a966ffa824edd09d (diff) | |
| parent | 20ebbfd22f8115a1e4f60d3d289f66be4d47f1ec (diff) | |
| download | linux-ac6e9e3d19e4fd14e1e6b9a5d65c5a847f3dff02.tar.xz | |
Merge tag 'amd-drm-fixes-5.13-2021-05-26' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes
amd-drm-fixes-5.13-2021-05-26:
amdgpu:
- MultiGPU fan fix
- VCN powergating fixes
amdkfd:
- Fix SDMA register offset error
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210527031831.4057-1-alexander.deucher@amd.com
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c index 116b9643d5ba..8af567c546db 100644 --- a/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c @@ -262,6 +262,8 @@ static int vcn_v2_0_hw_fini(void *handle) { struct amdgpu_device *adev = (struct amdgpu_device *)handle; + cancel_delayed_work_sync(&adev->vcn.idle_work); + if ((adev->pg_flags & AMD_PG_SUPPORT_VCN_DPG) || (adev->vcn.cur_state != AMD_PG_STATE_GATE && RREG32_SOC15(VCN, 0, mmUVD_STATUS))) |