Commit d7c605a2 authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/radeon: fix alignment of UVD fence 



Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent a92c7d55

drivers/gpu/drm/radeon/radeon_fence.c

+3 −4
Original line number Diff line number Diff line
@@ -776,10 +776,9 @@ int radeon_fence_driver_start_ring(struct radeon_device *rdev, int ring) 


		} else {

			/* put fence directly behind firmware */

			rdev->fence_drv[ring].cpu_addr = rdev->uvd.cpu_addr +

							 rdev->uvd_fw->size;

			rdev->fence_drv[ring].gpu_addr = rdev->uvd.gpu_addr +

							 rdev->uvd_fw->size;

			index = ALIGN(rdev->uvd_fw->size, 8);

			rdev->fence_drv[ring].cpu_addr = rdev->uvd.cpu_addr + index;

			rdev->fence_drv[ring].gpu_addr = rdev->uvd.gpu_addr + index;

		}



	} else {

drivers/gpu/drm/radeon/radeon_uvd.c

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ int radeon_uvd_init(struct radeon_device *rdev) 


	platform_device_unregister(pdev);



	bo_size = RADEON_GPU_PAGE_ALIGN(rdev->uvd_fw->size + 4) +

	bo_size = RADEON_GPU_PAGE_ALIGN(rdev->uvd_fw->size + 8) +

		  RADEON_UVD_STACK_SIZE + RADEON_UVD_HEAP_SIZE;

	r = radeon_bo_create(rdev, bo_size, PAGE_SIZE, true,

			     RADEON_GEM_DOMAIN_VRAM, NULL, &rdev->uvd.vcpu_bo);