diff options
author | Dave Airlie <airlied@redhat.com> | 2019-04-22 18:42:23 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2019-04-23 22:32:11 -0400 |
commit | 15e60851e191c0e4ad19d755da7b92fefbf10c7e (patch) | |
tree | ea8aac0885e7710276af6d1d53923825c155db36 | |
parent | b30a43ac7132cdda833ac4b13dd1ebd35ace14b7 (diff) |
drm/legacy: move drm_legacy_master_rmmaps to non-driver legacy header.
This isn't used by drivers, and won't be in the future.
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r-- | drivers/gpu/drm/drm_legacy.h | 3 | ||||
-rw-r--r-- | include/drm/drm_legacy.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/drm_legacy.h b/drivers/gpu/drm/drm_legacy.h index 280fbeb846ff..e6bf1a94374b 100644 --- a/drivers/gpu/drm/drm_legacy.h +++ b/drivers/gpu/drm/drm_legacy.h | |||
@@ -81,6 +81,9 @@ int __drm_legacy_mapbufs(struct drm_device *, void *, int *, | |||
81 | int (*)(void *, int, unsigned long, struct drm_buf *), | 81 | int (*)(void *, int, unsigned long, struct drm_buf *), |
82 | struct drm_file *); | 82 | struct drm_file *); |
83 | 83 | ||
84 | void drm_legacy_master_rmmaps(struct drm_device *dev, | ||
85 | struct drm_master *master); | ||
86 | |||
84 | #ifdef CONFIG_DRM_VM | 87 | #ifdef CONFIG_DRM_VM |
85 | void drm_legacy_vma_flush(struct drm_device *d); | 88 | void drm_legacy_vma_flush(struct drm_device *d); |
86 | #else | 89 | #else |
diff --git a/include/drm/drm_legacy.h b/include/drm/drm_legacy.h index 3e99ab69c122..2182a56ac421 100644 --- a/include/drm/drm_legacy.h +++ b/include/drm/drm_legacy.h | |||
@@ -162,8 +162,6 @@ int drm_legacy_addmap(struct drm_device *d, resource_size_t offset, | |||
162 | struct drm_local_map *drm_legacy_findmap(struct drm_device *dev, unsigned int token); | 162 | struct drm_local_map *drm_legacy_findmap(struct drm_device *dev, unsigned int token); |
163 | void drm_legacy_rmmap(struct drm_device *d, struct drm_local_map *map); | 163 | void drm_legacy_rmmap(struct drm_device *d, struct drm_local_map *map); |
164 | int drm_legacy_rmmap_locked(struct drm_device *d, struct drm_local_map *map); | 164 | int drm_legacy_rmmap_locked(struct drm_device *d, struct drm_local_map *map); |
165 | void drm_legacy_master_rmmaps(struct drm_device *dev, | ||
166 | struct drm_master *master); | ||
167 | struct drm_local_map *drm_legacy_getsarea(struct drm_device *dev); | 165 | struct drm_local_map *drm_legacy_getsarea(struct drm_device *dev); |
168 | int drm_legacy_mmap(struct file *filp, struct vm_area_struct *vma); | 166 | int drm_legacy_mmap(struct file *filp, struct vm_area_struct *vma); |
169 | 167 | ||