Merge tag 'mac80211-for-davem-2016-06-09' of git://git.kernel.org/pub/scm/linux/kerne...

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

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c b/drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c
index 092ea81..265c81e 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c
@@ -421,9 +421,9 @@ static int vmw_cotable_resize(struct vmw_resource *res, size_t new_size)
        }
 
        bo = &buf->base;
-       WARN_ON_ONCE(ttm_bo_reserve(bo, false, true, false, NULL));
+       WARN_ON_ONCE(ttm_bo_reserve(bo, false, true, NULL));
 
-       ret = ttm_bo_wait(old_bo, false, false, false);
+       ret = ttm_bo_wait(old_bo, false, false);
        if (unlikely(ret != 0)) {
                DRM_ERROR("Failed waiting for cotable unbind.\n");
                goto out_wait;