Merge branch 'drm-next' of git://people.freedesktop.org/~dvdhrm/linux into drm-next

This is the 3rd respin of the drm-anon patches. They allow module unloading, use
the pin_fs_* helpers recommended by Al and are rebased on top of drm-next. Note
that there are minor conflicts with the "drm-minor" branch.

* 'drm-next' of git://people.freedesktop.org/~dvdhrm/linux:
  drm: init TTM dev_mapping in ttm_bo_device_init()
  drm: use anon-inode instead of relying on cdevs
  drm: add pseudo filesystem for shared inodes

1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
index 0083cbf99edf..c35715f26f40 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
@@ -722,7 +722,9 @@ 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, VMWGFX_FILE_PAGE_OFFSET,
+                                 &vmw_bo_driver,
+                                 dev->anon_inode->i_mapping,
+                                 VMWGFX_FILE_PAGE_OFFSET,
                                  false);
         if (unlikely(ret != 0)) {
                 DRM_ERROR("Failed initializing TTM buffer object driver.\n");
@@ -969,7 +971,6 @@ static int vmw_driver_open(struct drm_device *dev, struct drm_file *file_priv)
                 goto out_no_shman;
 
         file_priv->driver_priv = vmw_fp;
-        dev_priv->bdev.dev_mapping = dev->dev_mapping;
 
         return 0;