1 files changed, 9 insertions, 39 deletions

diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
index c94a2257761f..5b71c716d83f 100644
--- a/drivers/gpu/drm/radeon/radeon_ttm.c
+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
@@ -222,15 +222,11 @@ static int radeon_move_blit(struct ttm_buffer_object *bo,
 {
         struct radeon_device *rdev;
         uint64_t old_start, new_start;
-        struct radeon_fence *fence, *old_fence;
-        struct radeon_semaphore *sem = NULL;
-        int r;
+        struct radeon_fence *fence;
+        int r, ridx;
 
         rdev = radeon_get_rdev(bo->bdev);
-        r = radeon_fence_create(rdev, &fence, radeon_copy_ring_index(rdev));
-        if (unlikely(r)) {
-                return r;
-        }
+        ridx = radeon_copy_ring_index(rdev);
         old_start = old_mem->start << PAGE_SHIFT;
         new_start = new_mem->start << PAGE_SHIFT;
 
@@ -243,7 +239,6 @@ static int radeon_move_blit(struct ttm_buffer_object *bo,
                 break;
         default:
                 DRM_ERROR("Unknown placement %d\n", old_mem->mem_type);
-                radeon_fence_unref(&fence);
                 return -EINVAL;
         }
         switch (new_mem->mem_type) {
@@ -255,46 +250,23 @@ static int radeon_move_blit(struct ttm_buffer_object *bo,
                 break;
         default:
                 DRM_ERROR("Unknown placement %d\n", old_mem->mem_type);
-                radeon_fence_unref(&fence);
                 return -EINVAL;
         }
-        if (!rdev->ring[radeon_copy_ring_index(rdev)].ready) {
+        if (!rdev->ring[ridx].ready) {
                 DRM_ERROR("Trying to move memory with ring turned off.\n");
-                radeon_fence_unref(&fence);
                 return -EINVAL;
         }
 
         BUILD_BUG_ON((PAGE_SIZE % RADEON_GPU_PAGE_SIZE) != 0);
 
         /* sync other rings */
-        old_fence = bo->sync_obj;
-        if (old_fence && old_fence->ring != fence->ring
-            && !radeon_fence_signaled(old_fence)) {
-                bool sync_to_ring[RADEON_NUM_RINGS] = { };
-                sync_to_ring[old_fence->ring] = true;
-
-                r = radeon_semaphore_create(rdev, &sem);
-                if (r) {
-                        radeon_fence_unref(&fence);
-                        return r;
-                }
-
-                r = radeon_semaphore_sync_rings(rdev, sem,
-                                                sync_to_ring, fence->ring);
-                if (r) {
-                        radeon_semaphore_free(rdev, sem, NULL);
-                        radeon_fence_unref(&fence);
-                        return r;
-                }
-        }
-
+        fence = bo->sync_obj;
         r = radeon_copy(rdev, old_start, new_start,
                         new_mem->num_pages * (PAGE_SIZE / RADEON_GPU_PAGE_SIZE), /* GPU pages */
-                        fence);
+                        &fence);
         /* FIXME: handle copy error */
         r = ttm_bo_move_accel_cleanup(bo, (void *)fence, NULL,
                                       evict, no_wait_reserve, no_wait_gpu, new_mem);
-        radeon_semaphore_free(rdev, sem, fence);
         radeon_fence_unref(&fence);
         return r;
 }
@@ -762,9 +734,7 @@ int radeon_ttm_init(struct radeon_device *rdev)
         }
         DRM_INFO("radeon: %uM of GTT memory ready.\n",
                  (unsigned)(rdev->mc.gtt_size / (1024 * 1024)));
-        if (unlikely(rdev->mman.bdev.dev_mapping == NULL)) {
-                rdev->mman.bdev.dev_mapping = rdev->ddev->dev_mapping;
-        }
+        rdev->mman.bdev.dev_mapping = rdev->ddev->dev_mapping;
 
         r = radeon_ttm_debugfs_init(rdev);
         if (r) {
@@ -825,9 +795,9 @@ static int radeon_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
                 return VM_FAULT_NOPAGE;
         }
         rdev = radeon_get_rdev(bo->bdev);
-        mutex_lock(&rdev->vram_mutex);
+        down_read(&rdev->pm.mclk_lock);
         r = ttm_vm_ops->fault(vma, vmf);
-        mutex_unlock(&rdev->vram_mutex);
+        up_read(&rdev->pm.mclk_lock);
         return r;
 }