drm/vmwgfx: switch over to the new pin interface v2

[linux-2.6-microblaze.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 c0f1560..5e922d9 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c
@@ -370,7 +370,7 @@ static int vmw_resource_buf_alloc(struct vmw_resource *res,
 
        ret = vmw_bo_init(res->dev_priv, backup, res->backup_size,
                              res->func->backup_placement,
-                             interruptible,
+                             interruptible, false,
                              &vmw_bo_bo_free);
        if (unlikely(ret != 0))
                goto out_no_bo;
@@ -1002,7 +1002,7 @@ int vmw_resource_pin(struct vmw_resource *res, bool interruptible)
                        vbo = res->backup;
 
                        ttm_bo_reserve(&vbo->base, interruptible, false, NULL);
-                       if (!vbo->pin_count) {
+                       if (!vbo->base.pin_count) {
                                ret = ttm_bo_validate
                                        (&vbo->base,
                                         res->func->backup_placement,