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: Jack Xiao <Jack.Xiao@amd.com>
Acked-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
index 5d13ed3..d16c8c1 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
@@ -422,8 +422,8 @@ int amdgpu_fence_driver_start_ring(struct amdgpu_ring *ring,
        uint64_t index;
 
        if (ring->funcs->type != AMDGPU_RING_TYPE_UVD) {
-               ring->fence_drv.cpu_addr = &adev->wb.wb[ring->fence_offs];
-               ring->fence_drv.gpu_addr = adev->wb.gpu_addr + (ring->fence_offs * 4);
+               ring->fence_drv.cpu_addr = ring->fence_cpu_addr;
+               ring->fence_drv.gpu_addr = ring->fence_gpu_addr;
        } else {
                /* put fence directly behind firmware */
                index = ALIGN(adev->uvd.fw->size, 8);