15 files changed, 107 insertions, 114 deletions

diff --git a/drivers/gpu/drm/ast/ast_ttm.c b/drivers/gpu/drm/ast/ast_ttm.c
index 0a54f65a8ebb..3602731a6112 100644
--- a/drivers/gpu/drm/ast/ast_ttm.c
+++ b/drivers/gpu/drm/ast/ast_ttm.c
@@ -186,11 +186,11 @@ static void ast_ttm_io_mem_free(struct ttm_bo_device *bdev, struct ttm_mem_reg *
 
 static int ast_bo_move(struct ttm_buffer_object *bo,
                        bool evict, bool interruptible,
-                       bool no_wait_reserve, bool no_wait_gpu,
+                       bool no_wait_gpu,
                        struct ttm_mem_reg *new_mem)
 {
         int r;
-        r = ttm_bo_move_memcpy(bo, evict, no_wait_reserve, no_wait_gpu, new_mem);
+        r = ttm_bo_move_memcpy(bo, evict, no_wait_gpu, new_mem);
         return r;
 }
 
@@ -383,7 +383,7 @@ int ast_bo_pin(struct ast_bo *bo, u32 pl_flag, u64 *gpu_addr)
         ast_ttm_placement(bo, pl_flag);
         for (i = 0; i < bo->placement.num_placement; i++)
                 bo->placements[i] |= TTM_PL_FLAG_NO_EVICT;
-        ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false, false);
+        ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);
         if (ret)
                 return ret;
 
@@ -406,7 +406,7 @@ int ast_bo_unpin(struct ast_bo *bo)
 
         for (i = 0; i < bo->placement.num_placement ; i++)
                 bo->placements[i] &= ~TTM_PL_FLAG_NO_EVICT;
-        ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false, false);
+        ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);
         if (ret)
                 return ret;
 
@@ -431,7 +431,7 @@ int ast_bo_push_sysram(struct ast_bo *bo)
         for (i = 0; i < bo->placement.num_placement ; i++)
                 bo->placements[i] |= TTM_PL_FLAG_NO_EVICT;
 
-        ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false, false);
+        ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);
         if (ret) {
                 DRM_ERROR("pushing to VRAM failed\n");
                 return ret;
diff --git a/drivers/gpu/drm/cirrus/cirrus_ttm.c b/drivers/gpu/drm/cirrus/cirrus_ttm.c
index 90d770143cc2..1413a26e4905 100644
--- a/drivers/gpu/drm/cirrus/cirrus_ttm.c
+++ b/drivers/gpu/drm/cirrus/cirrus_ttm.c
@@ -186,11 +186,11 @@ static void cirrus_ttm_io_mem_free(struct ttm_bo_device *bdev, struct ttm_mem_re
 
 static int cirrus_bo_move(struct ttm_buffer_object *bo,
                        bool evict, bool interruptible,
-                       bool no_wait_reserve, bool no_wait_gpu,
+                       bool no_wait_gpu,
                        struct ttm_mem_reg *new_mem)
 {
         int r;
-        r = ttm_bo_move_memcpy(bo, evict, no_wait_reserve, no_wait_gpu, new_mem);
+        r = ttm_bo_move_memcpy(bo, evict, no_wait_gpu, new_mem);
         return r;
 }
 
@@ -388,7 +388,7 @@ int cirrus_bo_pin(struct cirrus_bo *bo, u32 pl_flag, u64 *gpu_addr)
         cirrus_ttm_placement(bo, pl_flag);
         for (i = 0; i < bo->placement.num_placement; i++)
                 bo->placements[i] |= TTM_PL_FLAG_NO_EVICT;
-        ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false, false);
+        ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);
         if (ret)
                 return ret;
 
@@ -411,7 +411,7 @@ int cirrus_bo_unpin(struct cirrus_bo *bo)
 
         for (i = 0; i < bo->placement.num_placement ; i++)
                 bo->placements[i] &= ~TTM_PL_FLAG_NO_EVICT;
-        ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false, false);
+        ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);
         if (ret)
                 return ret;
 
@@ -436,7 +436,7 @@ int cirrus_bo_push_sysram(struct cirrus_bo *bo)
         for (i = 0; i < bo->placement.num_placement ; i++)
                 bo->placements[i] |= TTM_PL_FLAG_NO_EVICT;
 
-        ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false, false);
+        ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);
         if (ret) {
                 DRM_ERROR("pushing to VRAM failed\n");
                 return ret;
diff --git a/drivers/gpu/drm/mgag200/mgag200_ttm.c b/drivers/gpu/drm/mgag200/mgag200_ttm.c
index 49d60a620122..8fc9d9201945 100644
--- a/drivers/gpu/drm/mgag200/mgag200_ttm.c
+++ b/drivers/gpu/drm/mgag200/mgag200_ttm.c
@@ -186,11 +186,11 @@ static void mgag200_ttm_io_mem_free(struct ttm_bo_device *bdev, struct ttm_mem_r
 
 static int mgag200_bo_move(struct ttm_buffer_object *bo,
                        bool evict, bool interruptible,
-                       bool no_wait_reserve, bool no_wait_gpu,
+                       bool no_wait_gpu,
                        struct ttm_mem_reg *new_mem)
 {
         int r;
-        r = ttm_bo_move_memcpy(bo, evict, no_wait_reserve, no_wait_gpu, new_mem);
+        r = ttm_bo_move_memcpy(bo, evict, no_wait_gpu, new_mem);
         return r;
 }
 
@@ -382,7 +382,7 @@ int mgag200_bo_pin(struct mgag200_bo *bo, u32 pl_flag, u64 *gpu_addr)
         mgag200_ttm_placement(bo, pl_flag);
         for (i = 0; i < bo->placement.num_placement; i++)
                 bo->placements[i] |= TTM_PL_FLAG_NO_EVICT;
-        ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false, false);
+        ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);
         if (ret)
                 return ret;
 
@@ -405,7 +405,7 @@ int mgag200_bo_unpin(struct mgag200_bo *bo)
 
         for (i = 0; i < bo->placement.num_placement ; i++)
                 bo->placements[i] &= ~TTM_PL_FLAG_NO_EVICT;
-        ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false, false);
+        ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);
         if (ret)
                 return ret;
 
@@ -430,7 +430,7 @@ int mgag200_bo_push_sysram(struct mgag200_bo *bo)
         for (i = 0; i < bo->placement.num_placement ; i++)
                 bo->placements[i] |= TTM_PL_FLAG_NO_EVICT;
 
-        ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false, false);
+        ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);
         if (ret) {
                 DRM_ERROR("pushing to VRAM failed\n");
                 return ret;
diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
index 4c950b4cf416..5614c89148cb 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bo.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
@@ -315,7 +315,7 @@ nouveau_bo_pin(struct nouveau_bo *nvbo, uint32_t memtype)
 
         nouveau_bo_placement_set(nvbo, memtype, 0);
 
-        ret = nouveau_bo_validate(nvbo, false, false, false);
+        ret = nouveau_bo_validate(nvbo, false, false);
         if (ret == 0) {
                 switch (bo->mem.mem_type) {
                 case TTM_PL_VRAM:
@@ -351,7 +351,7 @@ nouveau_bo_unpin(struct nouveau_bo *nvbo)
 
         nouveau_bo_placement_set(nvbo, bo->mem.placement, 0);
 
-        ret = nouveau_bo_validate(nvbo, false, false, false);
+        ret = nouveau_bo_validate(nvbo, false, false);
         if (ret == 0) {
                 switch (bo->mem.mem_type) {
                 case TTM_PL_VRAM:
@@ -392,12 +392,12 @@ nouveau_bo_unmap(struct nouveau_bo *nvbo)
 
 int
 nouveau_bo_validate(struct nouveau_bo *nvbo, bool interruptible,
-                    bool no_wait_reserve, bool no_wait_gpu)
+                    bool no_wait_gpu)
 {
         int ret;
 
-        ret = ttm_bo_validate(&nvbo->bo, &nvbo->placement, interruptible,
-                              no_wait_reserve, no_wait_gpu);
+        ret = ttm_bo_validate(&nvbo->bo, &nvbo->placement,
+                              interruptible, no_wait_gpu);
         if (ret)
                 return ret;
 
@@ -556,8 +556,7 @@ nouveau_bo_evict_flags(struct ttm_buffer_object *bo, struct ttm_placement *pl)
 static int
 nouveau_bo_move_accel_cleanup(struct nouveau_channel *chan,
                               struct nouveau_bo *nvbo, bool evict,
-                              bool no_wait_reserve, bool no_wait_gpu,
-                              struct ttm_mem_reg *new_mem)
+                              bool no_wait_gpu, struct ttm_mem_reg *new_mem)
 {
         struct nouveau_fence *fence = NULL;
         int ret;
@@ -567,7 +566,7 @@ nouveau_bo_move_accel_cleanup(struct nouveau_channel *chan,
                 return ret;
 
         ret = ttm_bo_move_accel_cleanup(&nvbo->bo, fence, evict,
-                                        no_wait_reserve, no_wait_gpu, new_mem);
+                                        no_wait_gpu, new_mem);
         nouveau_fence_unref(&fence);
         return ret;
 }
@@ -965,8 +964,7 @@ nouveau_vma_getmap(struct nouveau_channel *chan, struct nouveau_bo *nvbo,
 
 static int
 nouveau_bo_move_m2mf(struct ttm_buffer_object *bo, int evict, bool intr,
-                     bool no_wait_reserve, bool no_wait_gpu,
-                     struct ttm_mem_reg *new_mem)
+                     bool no_wait_gpu, struct ttm_mem_reg *new_mem)
 {
         struct nouveau_drm *drm = nouveau_bdev(bo->bdev);
         struct nouveau_channel *chan = chan = drm->channel;
@@ -995,7 +993,6 @@ nouveau_bo_move_m2mf(struct ttm_buffer_object *bo, int evict, bool intr,
         ret = drm->ttm.move(chan, bo, &bo->mem, new_mem);
         if (ret == 0) {
                 ret = nouveau_bo_move_accel_cleanup(chan, nvbo, evict,
-                                                    no_wait_reserve,
                                                     no_wait_gpu, new_mem);
         }
 
@@ -1064,8 +1061,7 @@ nouveau_bo_move_init(struct nouveau_drm *drm)
 
 static int
 nouveau_bo_move_flipd(struct ttm_buffer_object *bo, bool evict, bool intr,
-                      bool no_wait_reserve, bool no_wait_gpu,
-                      struct ttm_mem_reg *new_mem)
+                      bool no_wait_gpu, struct ttm_mem_reg *new_mem)
 {
         u32 placement_memtype = TTM_PL_FLAG_TT | TTM_PL_MASK_CACHING;
         struct ttm_placement placement;
@@ -1078,7 +1074,7 @@ nouveau_bo_move_flipd(struct ttm_buffer_object *bo, bool evict, bool intr,
 
         tmp_mem = *new_mem;
         tmp_mem.mm_node = NULL;
-        ret = ttm_bo_mem_space(bo, &placement, &tmp_mem, intr, no_wait_reserve, no_wait_gpu);
+        ret = ttm_bo_mem_space(bo, &placement, &tmp_mem, intr, no_wait_gpu);
         if (ret)
                 return ret;
 
@@ -1086,11 +1082,11 @@ nouveau_bo_move_flipd(struct ttm_buffer_object *bo, bool evict, bool intr,
         if (ret)
                 goto out;
 
-        ret = nouveau_bo_move_m2mf(bo, true, intr, no_wait_reserve, no_wait_gpu, &tmp_mem);
+        ret = nouveau_bo_move_m2mf(bo, true, intr, no_wait_gpu, &tmp_mem);
         if (ret)
                 goto out;
 
-        ret = ttm_bo_move_ttm(bo, true, no_wait_reserve, no_wait_gpu, new_mem);
+        ret = ttm_bo_move_ttm(bo, true, no_wait_gpu, new_mem);
 out:
         ttm_bo_mem_put(bo, &tmp_mem);
         return ret;
@@ -1098,8 +1094,7 @@ out:
 
 static int
 nouveau_bo_move_flips(struct ttm_buffer_object *bo, bool evict, bool intr,
-                      bool no_wait_reserve, bool no_wait_gpu,
-                      struct ttm_mem_reg *new_mem)
+                      bool no_wait_gpu, struct ttm_mem_reg *new_mem)
 {
         u32 placement_memtype = TTM_PL_FLAG_TT | TTM_PL_MASK_CACHING;
         struct ttm_placement placement;
@@ -1112,15 +1107,15 @@ nouveau_bo_move_flips(struct ttm_buffer_object *bo, bool evict, bool intr,
 
         tmp_mem = *new_mem;
         tmp_mem.mm_node = NULL;
-        ret = ttm_bo_mem_space(bo, &placement, &tmp_mem, intr, no_wait_reserve, no_wait_gpu);
+        ret = ttm_bo_mem_space(bo, &placement, &tmp_mem, intr, no_wait_gpu);
         if (ret)
                 return ret;
 
-        ret = ttm_bo_move_ttm(bo, true, no_wait_reserve, no_wait_gpu, &tmp_mem);
+        ret = ttm_bo_move_ttm(bo, true, no_wait_gpu, &tmp_mem);
         if (ret)
                 goto out;
 
-        ret = nouveau_bo_move_m2mf(bo, true, intr, no_wait_reserve, no_wait_gpu, new_mem);
+        ret = nouveau_bo_move_m2mf(bo, true, intr, no_wait_gpu, new_mem);
         if (ret)
                 goto out;
 
@@ -1195,8 +1190,7 @@ nouveau_bo_vm_cleanup(struct ttm_buffer_object *bo,
 
 static int
 nouveau_bo_move(struct ttm_buffer_object *bo, bool evict, bool intr,
-                bool no_wait_reserve, bool no_wait_gpu,
-                struct ttm_mem_reg *new_mem)
+                bool no_wait_gpu, struct ttm_mem_reg *new_mem)
 {
         struct nouveau_drm *drm = nouveau_bdev(bo->bdev);
         struct nouveau_bo *nvbo = nouveau_bo(bo);
@@ -1220,23 +1214,26 @@ nouveau_bo_move(struct ttm_buffer_object *bo, bool evict, bool intr,
 
         /* CPU copy if we have no accelerated method available */
         if (!drm->ttm.move) {
-                ret = ttm_bo_move_memcpy(bo, evict, no_wait_reserve, no_wait_gpu, new_mem);
+                ret = ttm_bo_move_memcpy(bo, evict, no_wait_gpu, new_mem);
                 goto out;
         }
 
         /* Hardware assisted copy. */
         if (new_mem->mem_type == TTM_PL_SYSTEM)
-                ret = nouveau_bo_move_flipd(bo, evict, intr, no_wait_reserve, no_wait_gpu, new_mem);
+                ret = nouveau_bo_move_flipd(bo, evict, intr,
+                                            no_wait_gpu, new_mem);
         else if (old_mem->mem_type == TTM_PL_SYSTEM)
-                ret = nouveau_bo_move_flips(bo, evict, intr, no_wait_reserve, no_wait_gpu, new_mem);
+                ret = nouveau_bo_move_flips(bo, evict, intr,
+                                            no_wait_gpu, new_mem);
         else
-                ret = nouveau_bo_move_m2mf(bo, evict, intr, no_wait_reserve, no_wait_gpu, new_mem);
+                ret = nouveau_bo_move_m2mf(bo, evict, intr,
+                                           no_wait_gpu, new_mem);
 
         if (!ret)
                 goto out;
 
         /* Fallback to software copy. */
-        ret = ttm_bo_move_memcpy(bo, evict, no_wait_reserve, no_wait_gpu, new_mem);
+        ret = ttm_bo_move_memcpy(bo, evict, no_wait_gpu, new_mem);
 
 out:
         if (nv_device(drm->device)->card_type < NV_50) {
@@ -1343,7 +1340,7 @@ nouveau_ttm_fault_reserve_notify(struct ttm_buffer_object *bo)
         nvbo->placement.fpfn = 0;
         nvbo->placement.lpfn = mappable;
         nouveau_bo_placement_set(nvbo, TTM_PL_FLAG_VRAM, 0);
-        return nouveau_bo_validate(nvbo, false, true, false);
+        return nouveau_bo_validate(nvbo, false, false);
 }
 
 static int
diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.h b/drivers/gpu/drm/nouveau/nouveau_bo.h
index dec51b1098fe..25ca37989d2c 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bo.h
+++ b/drivers/gpu/drm/nouveau/nouveau_bo.h
@@ -76,7 +76,7 @@ u32  nouveau_bo_rd32(struct nouveau_bo *, unsigned index);
 void nouveau_bo_wr32(struct nouveau_bo *, unsigned index, u32 val);
 void nouveau_bo_fence(struct nouveau_bo *, struct nouveau_fence *);
 int  nouveau_bo_validate(struct nouveau_bo *, bool interruptible,
-                         bool no_wait_reserve, bool no_wait_gpu);
+                         bool no_wait_gpu);
 
 struct nouveau_vma *
 nouveau_bo_vma_find(struct nouveau_bo *, struct nouveau_vm *);
diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c
index 5e2f52158f19..8bf695c52f95 100644
--- a/drivers/gpu/drm/nouveau/nouveau_gem.c
+++ b/drivers/gpu/drm/nouveau/nouveau_gem.c
@@ -433,7 +433,7 @@ validate_list(struct nouveau_channel *chan, struct list_head *list,
                         return ret;
                 }
 
-                ret = nouveau_bo_validate(nvbo, true, false, false);
+                ret = nouveau_bo_validate(nvbo, true, false);
                 if (unlikely(ret)) {
                         if (ret != -ERESTARTSYS)
                                 NV_ERROR(drm, "fail ttm_validate\n");
diff --git a/drivers/gpu/drm/radeon/radeon_object.c b/drivers/gpu/drm/radeon/radeon_object.c
index e6ee65cdfb5c..bfb332e616dc 100644
--- a/drivers/gpu/drm/radeon/radeon_object.c
+++ b/drivers/gpu/drm/radeon/radeon_object.c
@@ -250,7 +250,7 @@ int radeon_bo_pin_restricted(struct radeon_bo *bo, u32 domain, u64 max_offset,
         }
         for (i = 0; i < bo->placement.num_placement; i++)
                 bo->placements[i] |= TTM_PL_FLAG_NO_EVICT;
-        r = ttm_bo_validate(&bo->tbo, &bo->placement, false, false, false);
+        r = ttm_bo_validate(&bo->tbo, &bo->placement, false, false);
         if (likely(r == 0)) {
                 bo->pin_count = 1;
                 if (gpu_addr != NULL)
@@ -279,7 +279,7 @@ int radeon_bo_unpin(struct radeon_bo *bo)
                 return 0;
         for (i = 0; i < bo->placement.num_placement; i++)
                 bo->placements[i] &= ~TTM_PL_FLAG_NO_EVICT;
-        r = ttm_bo_validate(&bo->tbo, &bo->placement, false, false, false);
+        r = ttm_bo_validate(&bo->tbo, &bo->placement, false, false);
         if (unlikely(r != 0))
                 dev_err(bo->rdev->dev, "%p validate failed for unpin\n", bo);
         return r;
@@ -365,7 +365,7 @@ int radeon_bo_list_validate(struct list_head *head)
                 retry:
                         radeon_ttm_placement_from_domain(bo, domain);
                         r = ttm_bo_validate(&bo->tbo, &bo->placement,
-                                                true, false, false);
+                                                true, false);
                         if (unlikely(r)) {
                                 if (r != -ERESTARTSYS && domain == RADEON_GEM_DOMAIN_VRAM) {
                                         domain |= RADEON_GEM_DOMAIN_GTT;
@@ -585,7 +585,7 @@ int radeon_bo_fault_reserve_notify(struct ttm_buffer_object *bo)
                         /* hurrah the memory is not visible ! */
                         radeon_ttm_placement_from_domain(rbo, RADEON_GEM_DOMAIN_VRAM);
                         rbo->placement.lpfn = rdev->mc.visible_vram_size >> PAGE_SHIFT;
-                        r = ttm_bo_validate(bo, &rbo->placement, false, true, false);
+                        r = ttm_bo_validate(bo, &rbo->placement, false, false);
                         if (unlikely(r != 0))
                                 return r;
                         offset = bo->mem.start << PAGE_SHIFT;
diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
index 563c8edcb03b..1d8ff2f850ba 100644
--- a/drivers/gpu/drm/radeon/radeon_ttm.c
+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
@@ -216,7 +216,7 @@ static void radeon_move_null(struct ttm_buffer_object *bo,
 }
 
 static int radeon_move_blit(struct ttm_buffer_object *bo,
-                        bool evict, int no_wait_reserve, bool no_wait_gpu,
+                        bool evict, bool no_wait_gpu,
                         struct ttm_mem_reg *new_mem,
                         struct ttm_mem_reg *old_mem)
 {
@@ -266,14 +266,14 @@ static int radeon_move_blit(struct ttm_buffer_object *bo,
                         &fence);
         /* FIXME: handle copy error */
         r = ttm_bo_move_accel_cleanup(bo, (void *)fence,
-                                      evict, no_wait_reserve, no_wait_gpu, new_mem);
+                                      evict, no_wait_gpu, new_mem);
         radeon_fence_unref(&fence);
         return r;
 }
 
 static int radeon_move_vram_ram(struct ttm_buffer_object *bo,
                                 bool evict, bool interruptible,
-                                bool no_wait_reserve, bool no_wait_gpu,
+                                bool no_wait_gpu,
                                 struct ttm_mem_reg *new_mem)
 {
         struct radeon_device *rdev;
@@ -294,7 +294,7 @@ static int radeon_move_vram_ram(struct ttm_buffer_object *bo,
         placement.busy_placement = &placements;
         placements = TTM_PL_MASK_CACHING | TTM_PL_FLAG_TT;
         r = ttm_bo_mem_space(bo, &placement, &tmp_mem,
-                             interruptible, no_wait_reserve, no_wait_gpu);
+                             interruptible, no_wait_gpu);
         if (unlikely(r)) {
                 return r;
         }
@@ -308,11 +308,11 @@ static int radeon_move_vram_ram(struct ttm_buffer_object *bo,
         if (unlikely(r)) {
                 goto out_cleanup;
         }
-        r = radeon_move_blit(bo, true, no_wait_reserve, no_wait_gpu, &tmp_mem, old_mem);
+        r = radeon_move_blit(bo, true, no_wait_gpu, &tmp_mem, old_mem);
         if (unlikely(r)) {
                 goto out_cleanup;
         }
-        r = ttm_bo_move_ttm(bo, true, no_wait_reserve, no_wait_gpu, new_mem);
+        r = ttm_bo_move_ttm(bo, true, no_wait_gpu, new_mem);
 out_cleanup:
         ttm_bo_mem_put(bo, &tmp_mem);
         return r;
@@ -320,7 +320,7 @@ out_cleanup:
 
 static int radeon_move_ram_vram(struct ttm_buffer_object *bo,
                                 bool evict, bool interruptible,
-                                bool no_wait_reserve, bool no_wait_gpu,
+                                bool no_wait_gpu,
                                 struct ttm_mem_reg *new_mem)
 {
         struct radeon_device *rdev;
@@ -340,15 +340,16 @@ static int radeon_move_ram_vram(struct ttm_buffer_object *bo,
         placement.num_busy_placement = 1;
         placement.busy_placement = &placements;
         placements = TTM_PL_MASK_CACHING | TTM_PL_FLAG_TT;
-        r = ttm_bo_mem_space(bo, &placement, &tmp_mem, interruptible, no_wait_reserve, no_wait_gpu);
+        r = ttm_bo_mem_space(bo, &placement, &tmp_mem,
+                             interruptible, no_wait_gpu);
         if (unlikely(r)) {
                 return r;
         }
-        r = ttm_bo_move_ttm(bo, true, no_wait_reserve, no_wait_gpu, &tmp_mem);
+        r = ttm_bo_move_ttm(bo, true, no_wait_gpu, &tmp_mem);
         if (unlikely(r)) {
                 goto out_cleanup;
         }
-        r = radeon_move_blit(bo, true, no_wait_reserve, no_wait_gpu, new_mem, old_mem);
+        r = radeon_move_blit(bo, true, no_wait_gpu, new_mem, old_mem);
         if (unlikely(r)) {
                 goto out_cleanup;
         }
@@ -359,7 +360,7 @@ out_cleanup:
 
 static int radeon_bo_move(struct ttm_buffer_object *bo,
                         bool evict, bool interruptible,
-                        bool no_wait_reserve, bool no_wait_gpu,
+                        bool no_wait_gpu,
                         struct ttm_mem_reg *new_mem)
 {
         struct radeon_device *rdev;
@@ -388,18 +389,18 @@ static int radeon_bo_move(struct ttm_buffer_object *bo,
         if (old_mem->mem_type == TTM_PL_VRAM &&
             new_mem->mem_type == TTM_PL_SYSTEM) {
                 r = radeon_move_vram_ram(bo, evict, interruptible,
-                                        no_wait_reserve, no_wait_gpu, new_mem);
+                                        no_wait_gpu, new_mem);
         } else if (old_mem->mem_type == TTM_PL_SYSTEM &&
                    new_mem->mem_type == TTM_PL_VRAM) {
                 r = radeon_move_ram_vram(bo, evict, interruptible,
-                                            no_wait_reserve, no_wait_gpu, new_mem);
+                                            no_wait_gpu, new_mem);
         } else {
-                r = radeon_move_blit(bo, evict, no_wait_reserve, no_wait_gpu, new_mem, old_mem);
+                r = radeon_move_blit(bo, evict, no_wait_gpu, new_mem, old_mem);
         }
 
         if (r) {
 memcpy:
-                r = ttm_bo_move_memcpy(bo, evict, no_wait_reserve, no_wait_gpu, new_mem);
+                r = ttm_bo_move_memcpy(bo, evict, no_wait_gpu, new_mem);
         }
         return r;
 }
diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
index 6059771d506e..a9151337d5b9 100644
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@ -366,7 +366,7 @@ static int ttm_bo_add_ttm(struct ttm_buffer_object *bo, bool zero_alloc)
 static int ttm_bo_handle_move_mem(struct ttm_buffer_object *bo,
                                   struct ttm_mem_reg *mem,
                                   bool evict, bool interruptible,
-                                  bool no_wait_reserve, bool no_wait_gpu)
+                                  bool no_wait_gpu)
 {
         struct ttm_bo_device *bdev = bo->bdev;
         bool old_is_pci = ttm_mem_reg_is_pci(bdev, &bo->mem);
@@ -420,12 +420,12 @@ static int ttm_bo_handle_move_mem(struct ttm_buffer_object *bo,
 
         if (!(old_man->flags & TTM_MEMTYPE_FLAG_FIXED) &&
             !(new_man->flags & TTM_MEMTYPE_FLAG_FIXED))
-                ret = ttm_bo_move_ttm(bo, evict, no_wait_reserve, no_wait_gpu, mem);
+                ret = ttm_bo_move_ttm(bo, evict, no_wait_gpu, mem);
         else if (bdev->driver->move)
                 ret = bdev->driver->move(bo, evict, interruptible,
-                                         no_wait_reserve, no_wait_gpu, mem);
+                                         no_wait_gpu, mem);
         else
-                ret = ttm_bo_move_memcpy(bo, evict, no_wait_reserve, no_wait_gpu, mem);
+                ret = ttm_bo_move_memcpy(bo, evict, no_wait_gpu, mem);
 
         if (ret) {
                 if (bdev->driver->move_notify) {
@@ -749,7 +749,7 @@ void ttm_bo_unlock_delayed_workqueue(struct ttm_bo_device *bdev, int resched)
 EXPORT_SYMBOL(ttm_bo_unlock_delayed_workqueue);
 
 static int ttm_bo_evict(struct ttm_buffer_object *bo, bool interruptible,
-                        bool no_wait_reserve, bool no_wait_gpu)
+                        bool no_wait_gpu)
 {
         struct ttm_bo_device *bdev = bo->bdev;
         struct ttm_mem_reg evict_mem;
@@ -780,7 +780,7 @@ static int ttm_bo_evict(struct ttm_buffer_object *bo, bool interruptible,
         placement.num_busy_placement = 0;
         bdev->driver->evict_flags(bo, &placement);
         ret = ttm_bo_mem_space(bo, &placement, &evict_mem, interruptible,
-                                no_wait_reserve, no_wait_gpu);
+                                no_wait_gpu);
         if (ret) {
                 if (ret != -ERESTARTSYS) {
                         pr_err("Failed to find memory space for buffer 0x%p eviction\n",
@@ -791,7 +791,7 @@ static int ttm_bo_evict(struct ttm_buffer_object *bo, bool interruptible,
         }
 
         ret = ttm_bo_handle_move_mem(bo, &evict_mem, true, interruptible,
-                                     no_wait_reserve, no_wait_gpu);
+                                     no_wait_gpu);
         if (ret) {
                 if (ret != -ERESTARTSYS)
                         pr_err("Buffer eviction failed\n");
@@ -805,7 +805,7 @@ out:
 
 static int ttm_mem_evict_first(struct ttm_bo_device *bdev,
                                 uint32_t mem_type,
-                                bool interruptible, bool no_wait_reserve,
+                                bool interruptible,
                                 bool no_wait_gpu)
 {
         struct ttm_bo_global *glob = bdev->glob;
@@ -841,7 +841,7 @@ static int ttm_mem_evict_first(struct ttm_bo_device *bdev,
 
         ttm_bo_list_ref_sub(bo, put_count, true);
 
-        ret = ttm_bo_evict(bo, interruptible, no_wait_reserve, no_wait_gpu);
+        ret = ttm_bo_evict(bo, interruptible, no_wait_gpu);
         ttm_bo_unreserve(bo);
 
         kref_put(&bo->list_kref, ttm_bo_release_list);
@@ -866,7 +866,6 @@ static int ttm_bo_mem_force_space(struct ttm_buffer_object *bo,
                                         struct ttm_placement *placement,
                                         struct ttm_mem_reg *mem,
                                         bool interruptible,
-                                        bool no_wait_reserve,
                                         bool no_wait_gpu)
 {
         struct ttm_bo_device *bdev = bo->bdev;
@@ -879,8 +878,8 @@ static int ttm_bo_mem_force_space(struct ttm_buffer_object *bo,
                         return ret;
                 if (mem->mm_node)
                         break;
-                ret = ttm_mem_evict_first(bdev, mem_type, interruptible,
-                                                no_wait_reserve, no_wait_gpu);
+                ret = ttm_mem_evict_first(bdev, mem_type,
+                                          interruptible, no_wait_gpu);
                 if (unlikely(ret != 0))
                         return ret;
         } while (1);
@@ -945,7 +944,7 @@ static bool ttm_bo_mt_compatible(struct ttm_mem_type_manager *man,
 int ttm_bo_mem_space(struct ttm_buffer_object *bo,
                         struct ttm_placement *placement,
                         struct ttm_mem_reg *mem,
-                        bool interruptible, bool no_wait_reserve,
+                        bool interruptible,
                         bool no_wait_gpu)
 {
         struct ttm_bo_device *bdev = bo->bdev;
@@ -1036,7 +1035,7 @@ int ttm_bo_mem_space(struct ttm_buffer_object *bo,
                 }
 
                 ret = ttm_bo_mem_force_space(bo, mem_type, placement, mem,
-                                                interruptible, no_wait_reserve, no_wait_gpu);
+                                                interruptible, no_wait_gpu);
                 if (ret == 0 && mem->mm_node) {
                         mem->placement = cur_flags;
                         return 0;
@@ -1051,7 +1050,7 @@ EXPORT_SYMBOL(ttm_bo_mem_space);
 
 int ttm_bo_move_buffer(struct ttm_buffer_object *bo,
                         struct ttm_placement *placement,
-                        bool interruptible, bool no_wait_reserve,
+                        bool interruptible,
                         bool no_wait_gpu)
 {
         int ret = 0;
@@ -1078,10 +1077,12 @@ int ttm_bo_move_buffer(struct ttm_buffer_object *bo,
         /*
          * Determine where to move the buffer.
          */
-        ret = ttm_bo_mem_space(bo, placement, &mem, interruptible, no_wait_reserve, no_wait_gpu);
+        ret = ttm_bo_mem_space(bo, placement, &mem,
+                               interruptible, no_wait_gpu);
         if (ret)
                 goto out_unlock;
-        ret = ttm_bo_handle_move_mem(bo, &mem, false, interruptible, no_wait_reserve, no_wait_gpu);
+        ret = ttm_bo_handle_move_mem(bo, &mem, false,
+                                     interruptible, no_wait_gpu);
 out_unlock:
         if (ret && mem.mm_node)
                 ttm_bo_mem_put(bo, &mem);
@@ -1110,7 +1111,7 @@ static int ttm_bo_mem_compat(struct ttm_placement *placement,
 
 int ttm_bo_validate(struct ttm_buffer_object *bo,
                         struct ttm_placement *placement,
-                        bool interruptible, bool no_wait_reserve,
+                        bool interruptible,
                         bool no_wait_gpu)
 {
         int ret;
@@ -1126,7 +1127,8 @@ int ttm_bo_validate(struct ttm_buffer_object *bo,
          */
         ret = ttm_bo_mem_compat(placement, &bo->mem);
         if (ret < 0) {
-                ret = ttm_bo_move_buffer(bo, placement, interruptible, no_wait_reserve, no_wait_gpu);
+                ret = ttm_bo_move_buffer(bo, placement, interruptible,
+                                         no_wait_gpu);
                 if (ret)
                         return ret;
         } else {
@@ -1239,7 +1241,7 @@ int ttm_bo_init(struct ttm_bo_device *bdev,
                         goto out_err;
         }
 
-        ret = ttm_bo_validate(bo, placement, interruptible, false, false);
+        ret = ttm_bo_validate(bo, placement, interruptible, false);
         if (ret)
                 goto out_err;
 
@@ -1325,7 +1327,7 @@ static int ttm_bo_force_list_clean(struct ttm_bo_device *bdev,
         spin_lock(&glob->lru_lock);
         while (!list_empty(&man->lru)) {
                 spin_unlock(&glob->lru_lock);
-                ret = ttm_mem_evict_first(bdev, mem_type, false, false, false);
+                ret = ttm_mem_evict_first(bdev, mem_type, false, false);
                 if (ret) {
                         if (allow_errors) {
                                 return ret;
@@ -1837,7 +1839,7 @@ static int ttm_bo_swapout(struct ttm_mem_shrink *shrink)
                 evict_mem.mem_type = TTM_PL_SYSTEM;
 
                 ret = ttm_bo_handle_move_mem(bo, &evict_mem, true,
-                                             false, false, false);
+                                             false, false);
                 if (unlikely(ret != 0))
                         goto out;
         }
diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c
index b9c4e515b1d8..9e9c5d2a5c74 100644
--- a/drivers/gpu/drm/ttm/ttm_bo_util.c
+++ b/drivers/gpu/drm/ttm/ttm_bo_util.c
@@ -43,7 +43,7 @@ void ttm_bo_free_old_node(struct ttm_buffer_object *bo)
 }
 
 int ttm_bo_move_ttm(struct ttm_buffer_object *bo,
-                    bool evict, bool no_wait_reserve,
+                    bool evict,
                     bool no_wait_gpu, struct ttm_mem_reg *new_mem)
 {
         struct ttm_tt *ttm = bo->ttm;
@@ -314,7 +314,7 @@ static int ttm_copy_ttm_io_page(struct ttm_tt *ttm, void *dst,
 }
 
 int ttm_bo_move_memcpy(struct ttm_buffer_object *bo,
-                       bool evict, bool no_wait_reserve, bool no_wait_gpu,
+                       bool evict, bool no_wait_gpu,
                        struct ttm_mem_reg *new_mem)
 {
         struct ttm_bo_device *bdev = bo->bdev;
@@ -611,7 +611,7 @@ EXPORT_SYMBOL(ttm_bo_kunmap);
 
 int ttm_bo_move_accel_cleanup(struct ttm_buffer_object *bo,
                               void *sync_obj,
-                              bool evict, bool no_wait_reserve,
+                              bool evict,
                               bool no_wait_gpu,
                               struct ttm_mem_reg *new_mem)
 {
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c b/drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c
index e88b0eb1a179..5fae06ad7e25 100644
--- 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);
 }
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
index 534c96703c3f..394e6476105b 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
@@ -1245,7 +1245,7 @@ static int vmw_validate_single_buffer(struct vmw_private *dev_priv,
          * used as a GMR, this will return -ENOMEM.
          */
 
-        ret = ttm_bo_validate(bo, &vmw_vram_gmr_placement, true, false, false);
+        ret = ttm_bo_validate(bo, &vmw_vram_gmr_placement, true, false);
         if (likely(ret == 0 || ret == -ERESTARTSYS))
                 return ret;
 
@@ -1255,7 +1255,7 @@ static int vmw_validate_single_buffer(struct vmw_private *dev_priv,
          */
 
         DRM_INFO("Falling through to VRAM.\n");
-        ret = ttm_bo_validate(bo, &vmw_vram_placement, true, false, false);
+        ret = ttm_bo_validate(bo, &vmw_vram_placement, true, false);
         return ret;
 }
 
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c
index 0def4ff5b621..e01a17b407b2 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c
@@ -1018,7 +1018,7 @@ int vmw_resource_check_buffer(struct vmw_resource *res,
         backup_dirty = res->backup_dirty;
         ret = ttm_bo_validate(&res->backup->base,
                               res->func->backup_placement,
-                              true, false, false);
+                              true, false);
 
         if (unlikely(ret != 0))
                 goto out_no_validate;
diff --git a/include/drm/ttm/ttm_bo_api.h b/include/drm/ttm/ttm_bo_api.h
index c6cae733ddef..3cb5d848fb66 100644
--- a/include/drm/ttm/ttm_bo_api.h
+++ b/include/drm/ttm/ttm_bo_api.h
@@ -337,7 +337,6 @@ extern int ttm_bo_wait(struct ttm_buffer_object *bo, bool lazy,
  * @bo: The buffer object.
  * @placement: Proposed placement for the buffer object.
  * @interruptible: Sleep interruptible if sleeping.
- * @no_wait_reserve: Return immediately if other buffers are busy.
  * @no_wait_gpu: Return immediately if the GPU is busy.
  *
  * Changes placement and caching policy of the buffer object
@@ -350,7 +349,7 @@ extern int ttm_bo_wait(struct ttm_buffer_object *bo, bool lazy,
  */
 extern int ttm_bo_validate(struct ttm_buffer_object *bo,
                                 struct ttm_placement *placement,
-                                bool interruptible, bool no_wait_reserve,
+                                bool interruptible,
                                 bool no_wait_gpu);
 
 /**
diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h
index dd96442cdc2a..e3a43a47d78c 100644
--- a/include/drm/ttm/ttm_bo_driver.h
+++ b/include/drm/ttm/ttm_bo_driver.h
@@ -394,7 +394,7 @@ struct ttm_bo_driver {
          */
         int (*move) (struct ttm_buffer_object *bo,
                      bool evict, bool interruptible,
-                     bool no_wait_reserve, bool no_wait_gpu,
+                     bool no_wait_gpu,
                      struct ttm_mem_reg *new_mem);
 
         /**
@@ -703,7 +703,6 @@ extern bool ttm_mem_reg_is_pci(struct ttm_bo_device *bdev,
  * @proposed_placement: Proposed new placement for the buffer object.
  * @mem: A struct ttm_mem_reg.
  * @interruptible: Sleep interruptible when sliping.
- * @no_wait_reserve: Return immediately if other buffers are busy.
  * @no_wait_gpu: Return immediately if the GPU is busy.
  *
  * Allocate memory space for the buffer object pointed to by @bo, using
@@ -719,7 +718,7 @@ extern int ttm_bo_mem_space(struct ttm_buffer_object *bo,
                                 struct ttm_placement *placement,
                                 struct ttm_mem_reg *mem,
                                 bool interruptible,
-                                bool no_wait_reserve, bool no_wait_gpu);
+                                bool no_wait_gpu);
 
 extern void ttm_bo_mem_put(struct ttm_buffer_object *bo,
                            struct ttm_mem_reg *mem);
@@ -901,7 +900,6 @@ extern int ttm_bo_wait_unreserved(struct ttm_buffer_object *bo,
  *
  * @bo: A pointer to a struct ttm_buffer_object.
  * @evict: 1: This is an eviction. Don't try to pipeline.
- * @no_wait_reserve: Return immediately if other buffers are busy.
  * @no_wait_gpu: Return immediately if the GPU is busy.
  * @new_mem: struct ttm_mem_reg indicating where to move.
  *
@@ -916,15 +914,14 @@ extern int ttm_bo_wait_unreserved(struct ttm_buffer_object *bo,
  */
 
 extern int ttm_bo_move_ttm(struct ttm_buffer_object *bo,
-                           bool evict, bool no_wait_reserve,
-                           bool no_wait_gpu, struct ttm_mem_reg *new_mem);
+                           bool evict, bool no_wait_gpu,
+                           struct ttm_mem_reg *new_mem);
 
 /**
  * ttm_bo_move_memcpy
  *
  * @bo: A pointer to a struct ttm_buffer_object.
  * @evict: 1: This is an eviction. Don't try to pipeline.
- * @no_wait_reserve: Return immediately if other buffers are busy.
  * @no_wait_gpu: Return immediately if the GPU is busy.
  * @new_mem: struct ttm_mem_reg indicating where to move.
  *
@@ -939,8 +936,8 @@ extern int ttm_bo_move_ttm(struct ttm_buffer_object *bo,
  */
 
 extern int ttm_bo_move_memcpy(struct ttm_buffer_object *bo,
-                              bool evict, bool no_wait_reserve,
-                              bool no_wait_gpu, struct ttm_mem_reg *new_mem);
+                              bool evict, bool no_wait_gpu,
+                              struct ttm_mem_reg *new_mem);
 
 /**
  * ttm_bo_free_old_node
@@ -957,7 +954,6 @@ extern void ttm_bo_free_old_node(struct ttm_buffer_object *bo);
  * @bo: A pointer to a struct ttm_buffer_object.
  * @sync_obj: A sync object that signals when moving is complete.
  * @evict: This is an evict move. Don't return until the buffer is idle.
- * @no_wait_reserve: Return immediately if other buffers are busy.
  * @no_wait_gpu: Return immediately if the GPU is busy.
  * @new_mem: struct ttm_mem_reg indicating where to move.
  *
@@ -971,8 +967,7 @@ extern void ttm_bo_free_old_node(struct ttm_buffer_object *bo);
 
 extern int ttm_bo_move_accel_cleanup(struct ttm_buffer_object *bo,
                                      void *sync_obj,
-                                     bool evict, bool no_wait_reserve,
-                                     bool no_wait_gpu,
+                                     bool evict, bool no_wait_gpu,
                                      struct ttm_mem_reg *new_mem);
 /**
  * ttm_io_prot