diff options
| author | Dave Airlie <[email protected]> | 2021-08-29 23:06:01 +0000 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2021-08-29 23:06:03 +0000 |
| commit | 8f0284f190e6a0aa09015090568c03f18288231a (patch) | |
| tree | 9d7d461695d4ef4ffed8121129404c0658d7ee98 /drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | |
| parent | Merge tag 'drm-intel-next-fixes-2021-08-26' of git://anongit.freedesktop.org/... (diff) | |
| parent | drm/amd/display: Move AllowDRAMSelfRefreshOrDRAMClockChangeInVblank to boundi... (diff) | |
| download | kernel-8f0284f190e6a0aa09015090568c03f18288231a.tar.gz kernel-8f0284f190e6a0aa09015090568c03f18288231a.zip | |
Merge tag 'amd-drm-next-5.15-2021-08-27' of https://gitlab.freedesktop.org/agd5f/linux into drm-next
amd-drm-next-5.15-2021-08-27:
amdgpu:
- PLL fix for SI
- Misc code cleanups
- RAS fixes
- PSP cleanups
- Polaris UVD/VCE suspend fixes
- aldebaran fixes
- DCN3.x mclk fixes
amdkfd:
- CWSR fixes for arcturus and aldebaran
- SVM fixes
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/amdgpu_uvd.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c index 0f576f294d8a..d451c359606a 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c @@ -326,7 +326,6 @@ int amdgpu_uvd_sw_fini(struct amdgpu_device *adev) { int i, j; - cancel_delayed_work_sync(&adev->uvd.idle_work); drm_sched_entity_destroy(&adev->uvd.entity); for (j = 0; j < adev->uvd.num_uvd_inst; ++j) { |