drm/ttm: remove no_wait_reserve, v3

[deliverable/linux.git] / drivers / gpu / drm / vmwgfx / vmwgfx_dmabuf.c

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c b/drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c
index e88b0eb1a179359c8c5667e49ea35f0940cd16f4..5fae06ad7e251e609b22af372354f0385f123165 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c
@@ -66,7 +66,7 @@ int vmw_dmabuf_to_placement(struct vmw_private *dev_priv,
        if (unlikely(ret != 0))
                goto err;
 
-       ret = ttm_bo_validate(bo, placement, interruptible, false, false);
+       ret = ttm_bo_validate(bo, placement, interruptible, false);
 
        ttm_bo_unreserve(bo);
 
@@ -123,7 +123,7 @@ int vmw_dmabuf_to_vram_or_gmr(struct vmw_private *dev_priv,
        else
                placement = &vmw_vram_gmr_placement;
 
-       ret = ttm_bo_validate(bo, placement, interruptible, false, false);
+       ret = ttm_bo_validate(bo, placement, interruptible, false);
        if (likely(ret == 0) || ret == -ERESTARTSYS)
                goto err_unreserve;
 
@@ -138,7 +138,7 @@ int vmw_dmabuf_to_vram_or_gmr(struct vmw_private *dev_priv,
        else
                placement = &vmw_vram_placement;
 
-       ret = ttm_bo_validate(bo, placement, interruptible, false, false);
+       ret = ttm_bo_validate(bo, placement, interruptible, false);
 
 err_unreserve:
        ttm_bo_unreserve(bo);
@@ -223,10 +223,9 @@ int vmw_dmabuf_to_start_of_vram(struct vmw_private *dev_priv,
        if (bo->mem.mem_type == TTM_PL_VRAM &&
            bo->mem.start < bo->num_pages &&
            bo->mem.start > 0)
-               (void) ttm_bo_validate(bo, &vmw_sys_placement, false,
-                                      false, false);
+               (void) ttm_bo_validate(bo, &vmw_sys_placement, false, false);
 
-       ret = ttm_bo_validate(bo, &placement, interruptible, false, false);
+       ret = ttm_bo_validate(bo, &placement, interruptible, false);
 
        /* For some reason we didn't up at the start of vram */
        WARN_ON(ret == 0 && bo->offset != 0);
@@ -315,7 +314,7 @@ void vmw_bo_pin(struct ttm_buffer_object *bo, bool pin)
        placement.num_placement = 1;
        placement.placement = &pl_flags;
 
-       ret = ttm_bo_validate(bo, &placement, false, true, true);
+       ret = ttm_bo_validate(bo, &placement, false, true);
 
        BUG_ON(ret != 0 || bo->mem.mem_type != old_mem_type);
 }