1 files changed, 3 insertions, 12 deletions

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
index 61a84b958d67..b9c078860a7c 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
@@ -801,11 +801,6 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset)
         DRM_INFO("MMIO at 0x%08x size is %u kiB\n",
                  dev_priv->mmio_start, dev_priv->mmio_size / 1024);
 
-        ret = vmw_ttm_global_init(dev_priv);
-        if (unlikely(ret != 0))
-                goto out_err0;
-
-
         vmw_master_init(&dev_priv->fbdev_master);
         ttm_lock_set_kill(&dev_priv->fbdev_master.lock, false, SIGTERM);
         dev_priv->active_master = &dev_priv->fbdev_master;
@@ -816,7 +811,7 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset)
         if (unlikely(dev_priv->mmio_virt == NULL)) {
                 ret = -ENOMEM;
                 DRM_ERROR("Failed mapping MMIO.\n");
-                goto out_err3;
+                goto out_err0;
         }
 
         /* Need mmio memory to check for fifo pitchlock cap. */
@@ -828,8 +823,8 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset)
                 goto out_err4;
         }
 
-        dev_priv->tdev = ttm_object_device_init
-                (dev_priv->mem_global_ref.object, 12, &vmw_prime_dmabuf_ops);
+        dev_priv->tdev = ttm_object_device_init(&ttm_mem_glob, 12,
+                                                &vmw_prime_dmabuf_ops);
 
         if (unlikely(dev_priv->tdev == NULL)) {
                 DRM_ERROR("Unable to initialize TTM object management.\n");
@@ -870,7 +865,6 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset)
         }
 
         ret = ttm_bo_device_init(&dev_priv->bdev,
-                                 dev_priv->bo_global_ref.ref.object,
                                  &vmw_bo_driver,
                                  dev->anon_inode->i_mapping,
                                  VMWGFX_FILE_PAGE_OFFSET,
@@ -992,8 +986,6 @@ out_no_device:
         ttm_object_device_release(&dev_priv->tdev);
 out_err4:
         memunmap(dev_priv->mmio_virt);
-out_err3:
-        vmw_ttm_global_release(dev_priv);
 out_err0:
         for (i = vmw_res_context; i < vmw_res_max; ++i)
                 idr_destroy(&dev_priv->res_idr[i]);
@@ -1045,7 +1037,6 @@ static void vmw_driver_unload(struct drm_device *dev)
         memunmap(dev_priv->mmio_virt);
         if (dev_priv->ctx.staged_bindings)
                 vmw_binding_state_free(dev_priv->ctx.staged_bindings);
-        vmw_ttm_global_release(dev_priv);
 
         for (i = vmw_res_context; i < vmw_res_max; ++i)
                 idr_destroy(&dev_priv->res_idr[i]);