Merge remote-tracking branch 'iommu/next'

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

diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
index 42c074a9c9551571c2dc782c05c5b568f8d0a789..c2a30bdc8a01996f7866a0dd344867900e32c873 100644 (file)
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@ -354,14 +354,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, interruptible, no_wait_gpu,
-                                     mem);
+               ret = ttm_bo_move_ttm(bo, interruptible, no_wait_gpu, mem);
        else if (bdev->driver->move)
                ret = bdev->driver->move(bo, evict, interruptible,
                                         no_wait_gpu, mem);
        else
-               ret = ttm_bo_move_memcpy(bo, evict, interruptible,
-                                        no_wait_gpu, mem);
+               ret = ttm_bo_move_memcpy(bo, interruptible, no_wait_gpu, mem);
 
        if (ret) {
                if (bdev->driver->move_notify) {