aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/ttm/ttm_bo_vm.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/ttm/ttm_bo_vm.c')
-rw-r--r--drivers/gpu/drm/ttm/ttm_bo_vm.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_bo_vm.c b/drivers/gpu/drm/ttm/ttm_bo_vm.c
index fe6cb77899f..8dd446cb778 100644
--- a/drivers/gpu/drm/ttm/ttm_bo_vm.c
+++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c
@@ -118,17 +118,17 @@ static int ttm_bo_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
118 * move. 118 * move.
119 */ 119 */
120 120
121 spin_lock(&bo->lock); 121 spin_lock(&bdev->fence_lock);
122 if (test_bit(TTM_BO_PRIV_FLAG_MOVING, &bo->priv_flags)) { 122 if (test_bit(TTM_BO_PRIV_FLAG_MOVING, &bo->priv_flags)) {
123 ret = ttm_bo_wait(bo, false, true, false); 123 ret = ttm_bo_wait(bo, false, true, false);
124 spin_unlock(&bo->lock); 124 spin_unlock(&bdev->fence_lock);
125 if (unlikely(ret != 0)) { 125 if (unlikely(ret != 0)) {
126 retval = (ret != -ERESTARTSYS) ? 126 retval = (ret != -ERESTARTSYS) ?
127 VM_FAULT_SIGBUS : VM_FAULT_NOPAGE; 127 VM_FAULT_SIGBUS : VM_FAULT_NOPAGE;
128 goto out_unlock; 128 goto out_unlock;
129 } 129 }
130 } else 130 } else
131 spin_unlock(&bo->lock); 131 spin_unlock(&bdev->fence_lock);
132 132
133 133
134 ret = ttm_mem_io_reserve(bdev, &bo->mem); 134 ret = ttm_mem_io_reserve(bdev, &bo->mem);