drm/radeon: rework ring syncing code

Move inter ring syncing with semaphores into the
existing ring allocations, with that we need to
lock the ring mutex only once.

Signed-off-by: Christian König <deathsimple@vodafone.de>
Reviewed-by: Jerome Glisse <jglisse@redhat.com>

1 files changed, 8 insertions, 30 deletions

diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c
index 142f89462aa..dd3e234294e 100644
--- a/drivers/gpu/drm/radeon/radeon_cs.c
+++ b/drivers/gpu/drm/radeon/radeon_cs.c
@@ -115,36 +115,20 @@ static int radeon_cs_get_ring(struct radeon_cs_parser *p, u32 ring, s32 priority
         return 0;
 }
 
-static int radeon_cs_sync_rings(struct radeon_cs_parser *p)
+static void radeon_cs_sync_rings(struct radeon_cs_parser *p)
 {
-        bool sync_to_ring[RADEON_NUM_RINGS] = { };
-        bool need_sync = false;
-        int i, r;
+        int i;
 
         for (i = 0; i < p->nrelocs; i++) {
-                struct radeon_fence *fence;
+                struct radeon_fence *a, *b;
 
                 if (!p->relocs[i].robj || !p->relocs[i].robj->tbo.sync_obj)
                         continue;
 
-                fence = p->relocs[i].robj->tbo.sync_obj;
-                if (fence->ring != p->ring && !radeon_fence_signaled(fence)) {
-                        sync_to_ring[fence->ring] = true;
-                        need_sync = true;
-                }
-        }
-
-        if (!need_sync) {
-                return 0;
-        }
-
-        r = radeon_semaphore_create(p->rdev, &p->ib.semaphore);
-        if (r) {
-                return r;
+                a = p->relocs[i].robj->tbo.sync_obj;
+                b = p->ib.sync_to[a->ring];
+                p->ib.sync_to[a->ring] = radeon_fence_later(a, b);
         }
-
-        return radeon_semaphore_sync_rings(p->rdev, p->ib.semaphore,
-                                           sync_to_ring, p->ring);
 }
 
 /* XXX: note that this is called from the legacy UMS CS ioctl as well */
@@ -368,10 +352,7 @@ static int radeon_cs_ib_chunk(struct radeon_device *rdev,
                 DRM_ERROR("Invalid command stream !\n");
                 return r;
         }
-        r = radeon_cs_sync_rings(parser);
-        if (r) {
-                DRM_ERROR("Failed to synchronize rings !\n");
-        }
+        radeon_cs_sync_rings(parser);
         parser->ib.vm_id = 0;
         r = radeon_ib_schedule(rdev, &parser->ib);
         if (r) {
@@ -468,10 +449,7 @@ static int radeon_cs_ib_vm_chunk(struct radeon_device *rdev,
         if (r) {
                 goto out;
         }
-        r = radeon_cs_sync_rings(parser);
-        if (r) {
-                DRM_ERROR("Failed to synchronize rings !\n");
-        }
+        radeon_cs_sync_rings(parser);
 
         if ((rdev->family >= CHIP_TAHITI) &&
             (parser->chunk_const_ib_idx != -1)) {