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

Commit 92b712b7 authored by Ilija Hadzic's avatar Ilija Hadzic Committed by Alex Deucher
Browse files

drm/radeon: fix the crash in test functions 

radeon_copy_dma and radeon_copy_blit must be called with
a valid reservation object. Otherwise a crash will be provoked.
We borrow the object from vram BO.

bug:
https://bugs.freedesktop.org/show_bug.cgi?id=88464



Cc: stable@vger.kernel.org
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarIlija Hadzic <ihadzic@research.bell-labs.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 3f5e1b4f

drivers/gpu/drm/radeon/radeon_test.c

+4 −4
Original line number Diff line number Diff line
@@ -119,11 +119,11 @@ static void radeon_do_test_moves(struct radeon_device *rdev, int flag) 
		if (ring == R600_RING_TYPE_DMA_INDEX)

			fence = radeon_copy_dma(rdev, gtt_addr, vram_addr,

						size / RADEON_GPU_PAGE_SIZE,

						NULL);

						vram_obj->tbo.resv);

		else

			fence = radeon_copy_blit(rdev, gtt_addr, vram_addr,

						 size / RADEON_GPU_PAGE_SIZE,

						 NULL);

						 vram_obj->tbo.resv);

		if (IS_ERR(fence)) {

			DRM_ERROR("Failed GTT->VRAM copy %d\n", i);

			r = PTR_ERR(fence);
@@ -170,11 +170,11 @@ static void radeon_do_test_moves(struct radeon_device *rdev, int flag) 
		if (ring == R600_RING_TYPE_DMA_INDEX)

			fence = radeon_copy_dma(rdev, vram_addr, gtt_addr,

						size / RADEON_GPU_PAGE_SIZE,

						NULL);

						vram_obj->tbo.resv);

		else

			fence = radeon_copy_blit(rdev, vram_addr, gtt_addr,

						 size / RADEON_GPU_PAGE_SIZE,

						 NULL);

						 vram_obj->tbo.resv);

		if (IS_ERR(fence)) {

			DRM_ERROR("Failed VRAM->GTT copy %d\n", i);

			r = PTR_ERR(fence);