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, 3 insertions, 2 deletions

diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
index a80e61e138db..aced97bb79e0 100644
--- a/drivers/gpu/drm/radeon/r600.c
+++ b/drivers/gpu/drm/radeon/r600.c
@@ -2311,15 +2311,16 @@ int r600_copy_blit(struct radeon_device *rdev,
                    unsigned num_gpu_pages,
                    struct radeon_fence **fence)
 {
+        struct radeon_semaphore *sem = NULL;
         struct radeon_sa_bo *vb = NULL;
         int r;
 
-        r = r600_blit_prepare_copy(rdev, num_gpu_pages, &vb);
+        r = r600_blit_prepare_copy(rdev, num_gpu_pages, fence, &vb, &sem);
         if (r) {
                 return r;
         }
         r600_kms_blit_copy(rdev, src_offset, dst_offset, num_gpu_pages, vb);
-        r600_blit_done_copy(rdev, fence, vb);
+        r600_blit_done_copy(rdev, fence, vb, sem);
         return 0;
 }