Merge branches 'acpica-fixes', 'acpi-video' and 'acpi-processor'

[cascardo/linux.git] / drivers / gpu / drm / vmwgfx / vmwgfx_resource.c

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c
index e57667c..6a328d5 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c
@@ -129,7 +129,7 @@ static void vmw_resource_release(struct kref *kref)
        if (res->backup) {
                struct ttm_buffer_object *bo = &res->backup->base;
 
-               ttm_bo_reserve(bo, false, false, false, NULL);
+               ttm_bo_reserve(bo, false, false, NULL);
                if (!list_empty(&res->mob_head) &&
                    res->func->unbind != NULL) {
                        struct ttm_validate_buffer val_buf;
@@ -1512,7 +1512,7 @@ void vmw_resource_move_notify(struct ttm_buffer_object *bo,
                        list_del_init(&res->mob_head);
                }
 
-               (void) ttm_bo_wait(bo, false, false, false);
+               (void) ttm_bo_wait(bo, false, false);
        }
 }
 
@@ -1605,7 +1605,7 @@ void vmw_query_move_notify(struct ttm_buffer_object *bo,
                if (fence != NULL)
                        vmw_fence_obj_unreference(&fence);
 
-               (void) ttm_bo_wait(bo, false, false, false);
+               (void) ttm_bo_wait(bo, false, false);
        } else
                mutex_unlock(&dev_priv->binding_mutex);
 
@@ -1717,8 +1717,7 @@ int vmw_resource_pin(struct vmw_resource *res, bool interruptible)
                if (res->backup) {
                        vbo = res->backup;
 
-                       ttm_bo_reserve(&vbo->base, interruptible, false, false,
-                                      NULL);
+                       ttm_bo_reserve(&vbo->base, interruptible, false, NULL);
                        if (!vbo->pin_count) {
                                ret = ttm_bo_validate
                                        (&vbo->base,
@@ -1773,7 +1772,7 @@ void vmw_resource_unpin(struct vmw_resource *res)
        if (--res->pin_count == 0 && res->backup) {
                struct vmw_dma_buffer *vbo = res->backup;
 
-               ttm_bo_reserve(&vbo->base, false, false, false, NULL);
+               ttm_bo_reserve(&vbo->base, false, false, NULL);
                vmw_bo_pin_reserved(vbo, false);
                ttm_bo_unreserve(&vbo->base);
        }