drm/radeon: make VM flushs a ring operation

Move flushing the VMs as function into the rings.
First step to make VM operations async.

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

1 files changed, 8 insertions, 0 deletions

diff --git a/drivers/gpu/drm/radeon/radeon_ring.c b/drivers/gpu/drm/radeon/radeon_ring.c
index b9b1eddcd097..b4df25e2ac88 100644
--- a/drivers/gpu/drm/radeon/radeon_ring.c
+++ b/drivers/gpu/drm/radeon/radeon_ring.c
@@ -160,6 +160,10 @@ int radeon_ib_schedule(struct radeon_device *rdev, struct radeon_ib *ib,
         if (!need_sync) {
                 radeon_semaphore_free(rdev, &ib->semaphore, NULL);
         }
+        /* if we can't remember our last VM flush then flush now! */
+        if (ib->vm && !ib->vm->last_flush) {
+                radeon_ring_vm_flush(rdev, ib->ring, ib);
+        }
         if (const_ib) {
                 radeon_ring_ib_execute(rdev, const_ib->ring, const_ib);
                 radeon_semaphore_free(rdev, &const_ib->semaphore, NULL);
@@ -174,6 +178,10 @@ int radeon_ib_schedule(struct radeon_device *rdev, struct radeon_ib *ib,
         if (const_ib) {
                 const_ib->fence = radeon_fence_ref(ib->fence);
         }
+        /* we just flushed the VM, remember that */
+        if (ib->vm && !ib->vm->last_flush) {
+                ib->vm->last_flush = radeon_fence_ref(ib->fence);
+        }
         radeon_ring_unlock_commit(rdev, ring);
         return 0;
 }