4 files changed, 38 insertions, 16 deletions

diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
index 40ab8a28c998..644d922990ef 100644
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
@@ -2804,6 +2804,9 @@ int radeon_vm_alloc_pt(struct radeon_device *rdev, struct radeon_vm *vm);
 void radeon_vm_add_to_lru(struct radeon_device *rdev, struct radeon_vm *vm);
 struct radeon_fence *radeon_vm_grab_id(struct radeon_device *rdev,
                                        struct radeon_vm *vm, int ring);
+void radeon_vm_flush(struct radeon_device *rdev,
+                     struct radeon_vm *vm,
+                     int ring);
 void radeon_vm_fence(struct radeon_device *rdev,
                      struct radeon_vm *vm,
                      struct radeon_fence *fence);
diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c
index 5abae403ea4f..f92df2e8ebdd 100644
--- a/drivers/gpu/drm/radeon/radeon_cs.c
+++ b/drivers/gpu/drm/radeon/radeon_cs.c
@@ -511,10 +511,6 @@ static int radeon_cs_ib_vm_chunk(struct radeon_device *rdev,
                 r = radeon_ib_schedule(rdev, &parser->ib, NULL);
         }
 
-        if (!r) {
-                radeon_vm_fence(rdev, vm, parser->ib.fence);
-        }
-
 out:
         radeon_vm_add_to_lru(rdev, vm);
         mutex_unlock(&vm->mutex);
diff --git a/drivers/gpu/drm/radeon/radeon_ring.c b/drivers/gpu/drm/radeon/radeon_ring.c
index fa140119cdb6..665591a7faad 100644
--- a/drivers/gpu/drm/radeon/radeon_ring.c
+++ b/drivers/gpu/drm/radeon/radeon_ring.c
@@ -153,11 +153,9 @@ int radeon_ib_schedule(struct radeon_device *rdev, struct radeon_ib *ib,
                 return r;
         }
 
-        /* if we can't remember our last VM flush then flush now! */
-        /* XXX figure out why we have to flush for every IB */
-        if (ib->vm /*&& !ib->vm->last_flush*/) {
-                radeon_ring_vm_flush(rdev, ib->ring, ib->vm);
-        }
+        if (ib->vm)
+                radeon_vm_flush(rdev, ib->vm, ib->ring);
+
         if (const_ib) {
                 radeon_ring_ib_execute(rdev, const_ib->ring, const_ib);
                 radeon_semaphore_free(rdev, &const_ib->semaphore, NULL);
@@ -172,10 +170,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);
-        }
+
+        if (ib->vm)
+                radeon_vm_fence(rdev, ib->vm, ib->fence);
+
         radeon_ring_unlock_commit(rdev, ring);
         return 0;
 }
diff --git a/drivers/gpu/drm/radeon/radeon_vm.c b/drivers/gpu/drm/radeon/radeon_vm.c
index 433b1ebd07ea..516017689793 100644
--- a/drivers/gpu/drm/radeon/radeon_vm.c
+++ b/drivers/gpu/drm/radeon/radeon_vm.c
@@ -379,6 +379,27 @@ struct radeon_fence *radeon_vm_grab_id(struct radeon_device *rdev,
 }
 
 /**
+ * radeon_vm_flush - hardware flush the vm
+ *
+ * @rdev: radeon_device pointer
+ * @vm: vm we want to flush
+ * @ring: ring to use for flush
+ *
+ * Flush the vm (cayman+).
+ *
+ * Global and local mutex must be locked!
+ */
+void radeon_vm_flush(struct radeon_device *rdev,
+                     struct radeon_vm *vm,
+                     int ring)
+{
+        /* if we can't remember our last VM flush then flush now! */
+        /* XXX figure out why we have to flush all the time */
+        if (!vm->last_flush || true)
+                radeon_ring_vm_flush(rdev, ring, vm);
+}
+
+/**
  * radeon_vm_fence - remember fence for vm
  *
  * @rdev: radeon_device pointer
@@ -394,14 +415,18 @@ void radeon_vm_fence(struct radeon_device *rdev,
                      struct radeon_vm *vm,
                      struct radeon_fence *fence)
 {
-        radeon_fence_unref(&rdev->vm_manager.active[vm->id]);
-        rdev->vm_manager.active[vm->id] = radeon_fence_ref(fence);
-
         radeon_fence_unref(&vm->fence);
         vm->fence = radeon_fence_ref(fence);
 
+        radeon_fence_unref(&rdev->vm_manager.active[vm->id]);
+        rdev->vm_manager.active[vm->id] = radeon_fence_ref(fence);
+
         radeon_fence_unref(&vm->last_id_use);
         vm->last_id_use = radeon_fence_ref(fence);
+
+        /* we just flushed the VM, remember that */
+        if (!vm->last_flush)
+                vm->last_flush = radeon_fence_ref(fence);
 }
 
 /**