diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-09-23 15:46:49 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-09-24 03:43:07 +0200 |
| commit | bfbf3c851ce53b914fe98d60ea3fe3fc1ab75b96 (patch) | |
| tree | 789fa903b1dfd94ffb95a5546830cef74025b622 /include/drm | |
| parent | drm/gem: Don't call drm_mmap from drm_gem_mmap (diff) | |
| download | linux-bfbf3c851ce53b914fe98d60ea3fe3fc1ab75b96.tar.xz linux-bfbf3c851ce53b914fe98d60ea3fe3fc1ab75b96.zip | |
drm: move drm_mmap to <drm/drm_legacy.h>
Now that we've removed the copypasted users in gem/ttm we can
relegate the legacy buffer mapping support to where it belongs.
Also give it the proper drm_legacy_ prefix.
While at it statify drm_mmap_locked, somehow I've missed that in my
previous header rework.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Reviewed-by: David Herrmann <dh.herrmann@gmail.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'include/drm')
| -rw-r--r-- | include/drm/drmP.h | 1 | ||||
| -rw-r--r-- | include/drm/drm_legacy.h | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 2163ccbee50f..40c999019d9e 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -961,7 +961,6 @@ extern ssize_t drm_read(struct file *filp, char __user *buffer, extern int drm_release(struct inode *inode, struct file *filp); /* Mapping support (drm_vm.h) */ -extern int drm_mmap(struct file *filp, struct vm_area_struct *vma); extern void drm_vm_open_locked(struct drm_device *dev, struct vm_area_struct *vma); extern unsigned int drm_poll(struct file *filp, struct poll_table_struct *wait); diff --git a/include/drm/drm_legacy.h b/include/drm/drm_legacy.h index 6486306beb0d..3e698038dc7b 100644 --- a/include/drm/drm_legacy.h +++ b/include/drm/drm_legacy.h @@ -157,6 +157,7 @@ int drm_legacy_addmap(struct drm_device *d, resource_size_t offset, int drm_legacy_rmmap(struct drm_device *d, struct drm_local_map *map); int drm_legacy_rmmap_locked(struct drm_device *d, struct drm_local_map *map); struct drm_local_map *drm_legacy_getsarea(struct drm_device *dev); +int drm_legacy_mmap(struct file *filp, struct vm_area_struct *vma); int drm_legacy_addbufs_agp(struct drm_device *d, struct drm_buf_desc *req); int drm_legacy_addbufs_pci(struct drm_device *d, struct drm_buf_desc *req); |