Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d9654413 authored by Jerome Glisse's avatar Jerome Glisse Committed by Alex Deucher
Browse files

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: default avatarJérôme Glisse <jglisse@redhat.com>
Cc: stable@vger.kernel.org
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 9ef4e1d0

drivers/gpu/drm/radeon/evergreen.c

+1 −1
Original line number Diff line number Diff line
@@ -5475,9 +5475,9 @@ void evergreen_fini(struct radeon_device *rdev) 
	radeon_wb_fini(rdev);

	radeon_ib_pool_fini(rdev);

	radeon_irq_kms_fini(rdev);

	evergreen_pcie_gart_fini(rdev);

	uvd_v1_0_fini(rdev);

	radeon_uvd_fini(rdev);

	evergreen_pcie_gart_fini(rdev);

	r600_vram_scratch_fini(rdev);

	radeon_gem_fini(rdev);

	radeon_fence_driver_fini(rdev);

drivers/gpu/drm/radeon/radeon_uvd.c

+2 −0
Original line number Diff line number Diff line
@@ -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);

}

drivers/gpu/drm/radeon/rv770.c

+1 −1
Original line number Diff line number Diff line
@@ -1955,9 +1955,9 @@ void rv770_fini(struct radeon_device *rdev) 
	radeon_wb_fini(rdev);

	radeon_ib_pool_fini(rdev);

	radeon_irq_kms_fini(rdev);

	rv770_pcie_gart_fini(rdev);

	uvd_v1_0_fini(rdev);

	radeon_uvd_fini(rdev);

	rv770_pcie_gart_fini(rdev);

	r600_vram_scratch_fini(rdev);

	radeon_gem_fini(rdev);

	radeon_fence_driver_fini(rdev);