Commit ae9fd76f authored by Jack Xiao's avatar Jack Xiao Committed by Alex Deucher
Browse files

drm/amdgpu: assign the cpu/gpu address of fence from ring 



assign the cpu/gpu address of fence for the normal or mes ring
from ring structure.

Signed-off-by: default avatarJack Xiao <Jack.Xiao@amd.com>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 502b6cef

drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -422,8 +422,8 @@ int amdgpu_fence_driver_start_ring(struct amdgpu_ring *ring, 
	uint64_t index;

	uint64_t index;





	if (ring->funcs->type != AMDGPU_RING_TYPE_UVD) {

	if (ring->funcs->type != AMDGPU_RING_TYPE_UVD) {

		ring->fence_drv.cpu_addr = &adev->wb.wb[ring->fence_offs];

		ring->fence_drv.cpu_addr = ring->fence_cpu_addr;

		ring->fence_drv.gpu_addr = adev->wb.gpu_addr + (ring->fence_offs * 4);

		ring->fence_drv.gpu_addr = ring->fence_gpu_addr;

	} else {

	} else {

		/* put fence directly behind firmware */

		/* put fence directly behind firmware */

		index = ALIGN(adev->uvd.fw->size, 8);

		index = ALIGN(adev->uvd.fw->size, 8);