drm/radeon: use IBs for VM page table updates v2

For very large page table updates, we can exceed the
size of the ring.  To avoid this, use an IB to perform
the page table update.

v2(ck): cleanup the IB infrastructure and the use it instead
        of filling the struct ourself.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Christian König <christian.koenig@amd.com>

1 files changed, 4 insertions, 15 deletions

diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c
index 1d214b66650f..70d38241b083 100644
--- a/drivers/gpu/drm/radeon/radeon_cs.c
+++ b/drivers/gpu/drm/radeon/radeon_cs.c
@@ -125,18 +125,6 @@ static int radeon_cs_get_ring(struct radeon_cs_parser *p, u32 ring, s32 priority
         return 0;
 }
 
-static void radeon_cs_sync_to(struct radeon_cs_parser *p,
-                              struct radeon_fence *fence)
-{
-        struct radeon_fence *other;
-
-        if (!fence)
-                return;
-
-        other = p->ib.sync_to[fence->ring];
-        p->ib.sync_to[fence->ring] = radeon_fence_later(fence, other);
-}
-
 static void radeon_cs_sync_rings(struct radeon_cs_parser *p)
 {
         int i;
@@ -145,7 +133,7 @@ static void radeon_cs_sync_rings(struct radeon_cs_parser *p)
                 if (!p->relocs[i].robj)
                         continue;
 
-                radeon_cs_sync_to(p, p->relocs[i].robj->tbo.sync_obj);
+                radeon_ib_sync_to(&p->ib, p->relocs[i].robj->tbo.sync_obj);
         }
 }
 
@@ -472,8 +460,9 @@ static int radeon_cs_ib_vm_chunk(struct radeon_device *rdev,
                 goto out;
         }
         radeon_cs_sync_rings(parser);
-        radeon_cs_sync_to(parser, vm->fence);
-        radeon_cs_sync_to(parser, radeon_vm_grab_id(rdev, vm, parser->ring));
+        radeon_ib_sync_to(&parser->ib, vm->fence);
+        radeon_ib_sync_to(&parser->ib, radeon_vm_grab_id(
+                rdev, vm, parser->ring));
 
         if ((rdev->family >= CHIP_TAHITI) &&
             (parser->chunk_const_ib_idx != -1)) {