summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/radeon/radeon_uvd.c
diff options
context:
space:
mode:
authorJerome Glisse <jglisse@redhat.com>2014-02-27 04:22:47 +0400
committerAlex Deucher <alexander.deucher@amd.com>2014-02-27 23:10:35 +0400
commitd965441342f3b7d63db784cad852328d17d47942 (patch)
tree06f0f34f7b511555e70cf2676a5128b53b614e15 /drivers/gpu/drm/radeon/radeon_uvd.c
parent9ef4e1d000a5b335fcebfcf8aef3405e59574c89 (diff)
downloadlinux-d965441342f3b7d63db784cad852328d17d47942.tar.xz
drm/radeon: free uvd ring on unload
Need to free the uvd ring. Also reshuffle gart tear down to happen after uvd tear down. Signed-off-by: Jérôme Glisse <jglisse@redhat.com> Cc: stable@vger.kernel.org Reviewed-by: Christian König <christian.koenig@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_uvd.c')
-rw-r--r--drivers/gpu/drm/radeon/radeon_uvd.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_uvd.c b/drivers/gpu/drm/radeon/radeon_uvd.c
index 6781fee1eaad..3e6804b2b2ef 100644
--- a/drivers/gpu/drm/radeon/radeon_uvd.c
+++ b/drivers/gpu/drm/radeon/radeon_uvd.c
@@ -171,6 +171,8 @@ void radeon_uvd_fini(struct radeon_device *rdev)
radeon_bo_unref(&rdev->uvd.vcpu_bo);
+ radeon_ring_fini(rdev, &rdev->ring[R600_RING_TYPE_UVD_INDEX]);
+
release_firmware(rdev->uvd_fw);
}