aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorNirmoy Das <nirmoy.das@amd.com>2021-05-28 16:54:16 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-06-10 13:37:12 +0200
commitb0c0d8b5bf94f57e163e3ff1ae9edc2a20a66b30 (patch)
tree63d1245b6cc8f48b1d1e7213b596cf5c851eaece
parentdrm/amdgpu: Don't query CE and UE errors (diff)
downloadwireguard-linux-b0c0d8b5bf94f57e163e3ff1ae9edc2a20a66b30.tar.xz
wireguard-linux-b0c0d8b5bf94f57e163e3ff1ae9edc2a20a66b30.zip
drm/amdgpu: make sure we unpin the UVD BO
commit 07438603a07e52f1c6aa731842bd298d2725b7be upstream. Releasing pinned BOs is illegal now. UVD 6 was missing from: commit 2f40801dc553 ("drm/amdgpu: make sure we unpin the UVD BO") Fixes: 2f40801dc553 ("drm/amdgpu: make sure we unpin the UVD BO") Cc: stable@vger.kernel.org Signed-off-by: Nirmoy Das <nirmoy.das@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c b/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
index 217084d56ab8..9deef20a0269 100644
--- a/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
@@ -354,6 +354,7 @@ static int uvd_v6_0_enc_ring_test_ib(struct amdgpu_ring *ring, long timeout)
error:
dma_fence_put(fence);
+ amdgpu_bo_unpin(bo);
amdgpu_bo_unreserve(bo);
amdgpu_bo_unref(&bo);
return r;