drm/ttm: Clean usage of ttm_io_prot() with TTM_PL_FLAG_CACHED

[deliverable/linux.git] / drivers / gpu / drm / ttm / ttm_bo_vm.c

diff --git a/drivers/gpu/drm/ttm/ttm_bo_vm.c b/drivers/gpu/drm/ttm/ttm_bo_vm.c
index 0ce48e5a9cb4a70b56461f0ceb529e2c48ed58aa..8fb7213277cc9029d101f2006e7bc50289ab51df 100644 (file)
--- a/drivers/gpu/drm/ttm/ttm_bo_vm.c
+++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c
@@ -45,10 +45,8 @@ static int ttm_bo_vm_fault_idle(struct ttm_buffer_object *bo,
                                struct vm_area_struct *vma,
                                struct vm_fault *vmf)
 {
-       struct ttm_bo_device *bdev = bo->bdev;
        int ret = 0;
 
-       spin_lock(&bdev->fence_lock);
        if (likely(!test_bit(TTM_BO_PRIV_FLAG_MOVING, &bo->priv_flags)))
                goto out_unlock;
 
@@ -82,7 +80,6 @@ static int ttm_bo_vm_fault_idle(struct ttm_buffer_object *bo,
                        VM_FAULT_NOPAGE;
 
 out_unlock:
-       spin_unlock(&bdev->fence_lock);
        return ret;
 }
 
@@ -200,9 +197,8 @@ static int ttm_bo_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
                                                cvma.vm_page_prot);
        } else {
                ttm = bo->ttm;
-               if (!(bo->mem.placement & TTM_PL_FLAG_CACHED))
-                       cvma.vm_page_prot = ttm_io_prot(bo->mem.placement,
-                                                       cvma.vm_page_prot);
+               cvma.vm_page_prot = ttm_io_prot(bo->mem.placement,
+                                               cvma.vm_page_prot);
 
                /* Allocate all page at once, most common usage */
                if (ttm->bdev->driver->ttm_tt_populate(ttm)) {