Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Daniel Vetter and committed by
Dave Airlie
bfbf3c85 197633b9

+13 -13
-1
drivers/gpu/drm/drm_internal.h
··· 37 37 38 38 /* drm_vm.c */ 39 39 int drm_vma_info(struct seq_file *m, void *data); 40 - int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma); 41 40 void drm_vm_close_locked(struct drm_device *dev, struct vm_area_struct *vma); 42 41 43 42 /* drm_prime.c */
+3 -3
drivers/gpu/drm/drm_vm.c
··· 537 537 * according to the mapping type and remaps the pages. Finally sets the file 538 538 * pointer and calls vm_open(). 539 539 */ 540 - int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma) 540 + static int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma) 541 541 { 542 542 struct drm_file *priv = filp->private_data; 543 543 struct drm_device *dev = priv->minor->dev; ··· 651 651 return 0; 652 652 } 653 653 654 - int drm_mmap(struct file *filp, struct vm_area_struct *vma) 654 + int drm_legacy_mmap(struct file *filp, struct vm_area_struct *vma) 655 655 { 656 656 struct drm_file *priv = filp->private_data; 657 657 struct drm_device *dev = priv->minor->dev; ··· 666 666 667 667 return ret; 668 668 } 669 - EXPORT_SYMBOL(drm_mmap); 669 + EXPORT_SYMBOL(drm_legacy_mmap); 670 670 671 671 void drm_legacy_vma_flush(struct drm_device *dev) 672 672 {
+1 -1
drivers/gpu/drm/i810/i810_drv.c
··· 47 47 .open = drm_open, 48 48 .release = drm_release, 49 49 .unlocked_ioctl = drm_ioctl, 50 - .mmap = drm_mmap, 50 + .mmap = drm_legacy_mmap, 51 51 .poll = drm_poll, 52 52 #ifdef CONFIG_COMPAT 53 53 .compat_ioctl = drm_compat_ioctl,
+1 -1
drivers/gpu/drm/mga/mga_drv.c
··· 48 48 .open = drm_open, 49 49 .release = drm_release, 50 50 .unlocked_ioctl = drm_ioctl, 51 - .mmap = drm_mmap, 51 + .mmap = drm_legacy_mmap, 52 52 .poll = drm_poll, 53 53 #ifdef CONFIG_COMPAT 54 54 .compat_ioctl = mga_compat_ioctl,
+1 -1
drivers/gpu/drm/r128/r128_drv.c
··· 46 46 .open = drm_open, 47 47 .release = drm_release, 48 48 .unlocked_ioctl = drm_ioctl, 49 - .mmap = drm_mmap, 49 + .mmap = drm_legacy_mmap, 50 50 .poll = drm_poll, 51 51 #ifdef CONFIG_COMPAT 52 52 .compat_ioctl = r128_compat_ioctl,
+1 -1
drivers/gpu/drm/radeon/radeon_drv.c
··· 308 308 .open = drm_open, 309 309 .release = drm_release, 310 310 .unlocked_ioctl = drm_ioctl, 311 - .mmap = drm_mmap, 311 + .mmap = drm_legacy_mmap, 312 312 .poll = drm_poll, 313 313 .read = drm_read, 314 314 #ifdef CONFIG_COMPAT
+1 -1
drivers/gpu/drm/savage/savage_drv.c
··· 40 40 .open = drm_open, 41 41 .release = drm_release, 42 42 .unlocked_ioctl = drm_ioctl, 43 - .mmap = drm_mmap, 43 + .mmap = drm_legacy_mmap, 44 44 .poll = drm_poll, 45 45 #ifdef CONFIG_COMPAT 46 46 .compat_ioctl = drm_compat_ioctl,
+1 -1
drivers/gpu/drm/sis/sis_drv.c
··· 70 70 .open = drm_open, 71 71 .release = drm_release, 72 72 .unlocked_ioctl = drm_ioctl, 73 - .mmap = drm_mmap, 73 + .mmap = drm_legacy_mmap, 74 74 .poll = drm_poll, 75 75 #ifdef CONFIG_COMPAT 76 76 .compat_ioctl = drm_compat_ioctl,
+2 -1
drivers/gpu/drm/tdfx/tdfx_drv.c
··· 36 36 #include "tdfx_drv.h" 37 37 38 38 #include <drm/drm_pciids.h> 39 + #include <drm/drm_legacy.h> 39 40 40 41 static struct pci_device_id pciidlist[] = { 41 42 tdfx_PCI_IDS ··· 47 46 .open = drm_open, 48 47 .release = drm_release, 49 48 .unlocked_ioctl = drm_ioctl, 50 - .mmap = drm_mmap, 49 + .mmap = drm_legacy_mmap, 51 50 .poll = drm_poll, 52 51 #ifdef CONFIG_COMPAT 53 52 .compat_ioctl = drm_compat_ioctl,
+1 -1
drivers/gpu/drm/via/via_drv.c
··· 62 62 .open = drm_open, 63 63 .release = drm_release, 64 64 .unlocked_ioctl = drm_ioctl, 65 - .mmap = drm_mmap, 65 + .mmap = drm_legacy_mmap, 66 66 .poll = drm_poll, 67 67 #ifdef CONFIG_COMPAT 68 68 .compat_ioctl = drm_compat_ioctl,
-1
include/drm/drmP.h
··· 961 961 extern int drm_release(struct inode *inode, struct file *filp); 962 962 963 963 /* Mapping support (drm_vm.h) */ 964 - extern int drm_mmap(struct file *filp, struct vm_area_struct *vma); 965 964 extern void drm_vm_open_locked(struct drm_device *dev, struct vm_area_struct *vma); 966 965 extern unsigned int drm_poll(struct file *filp, struct poll_table_struct *wait); 967 966
+1
include/drm/drm_legacy.h
··· 157 157 int drm_legacy_rmmap(struct drm_device *d, struct drm_local_map *map); 158 158 int drm_legacy_rmmap_locked(struct drm_device *d, struct drm_local_map *map); 159 159 struct drm_local_map *drm_legacy_getsarea(struct drm_device *dev); 160 + int drm_legacy_mmap(struct file *filp, struct vm_area_struct *vma); 160 161 161 162 int drm_legacy_addbufs_agp(struct drm_device *d, struct drm_buf_desc *req); 162 163 int drm_legacy_addbufs_pci(struct drm_device *d, struct drm_buf_desc *req);