diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-03-18 19:17:02 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-03-18 19:17:02 +1000 |
| commit | d1583c9997cf5e7e8ceef35b6f264262cda5f948 (patch) | |
| tree | 9451558c65eea52ad096f5a16313eaf02eb0775c /include/drm/drmP.h | |
| parent | bcc298bc924e0a990f853ba3e19f8b5a833cba7e (diff) | |
| parent | 07b48c3ac539828d744f0562da1f24e8a234d06e (diff) | |
| download | linux-d1583c9997cf5e7e8ceef35b6f264262cda5f948.tar.bz2 | |
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
Diffstat (limited to 'include/drm/drmP.h')
| -rw-r--r-- | include/drm/drmP.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 319ec1eb0372..daac00a93126 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -1091,11 +1091,11 @@ struct drm_device { struct device *dev; /**< Device structure of bus-device */ struct drm_driver *driver; /**< DRM driver managing the device */ void *dev_private; /**< DRM driver private data */ - struct address_space *dev_mapping; /**< Private addr-space just for the device */ struct drm_minor *control; /**< Control node */ struct drm_minor *primary; /**< Primary node */ struct drm_minor *render; /**< Render node */ atomic_t unplugged; /**< Flag whether dev is dead */ + struct inode *anon_inode; /**< inode for private address-space */ /*@} */ /** \name Locks */ |