Message ID | 1411480014-10138-4-git-send-email-daniel.vetter@ffwll.ch (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Hi On Tue, Sep 23, 2014 at 3:46 PM, Daniel Vetter <daniel.vetter@ffwll.ch> wrote: > 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. Reviewed-by: David Herrmann <dh.herrmann@gmail.com> Thanks David > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > --- > drivers/gpu/drm/drm_internal.h | 1 - > drivers/gpu/drm/drm_vm.c | 6 +++--- > drivers/gpu/drm/i810/i810_drv.c | 2 +- > drivers/gpu/drm/mga/mga_drv.c | 2 +- > drivers/gpu/drm/r128/r128_drv.c | 2 +- > drivers/gpu/drm/radeon/radeon_drv.c | 2 +- > drivers/gpu/drm/savage/savage_drv.c | 2 +- > drivers/gpu/drm/sis/sis_drv.c | 2 +- > drivers/gpu/drm/tdfx/tdfx_drv.c | 3 ++- > drivers/gpu/drm/via/via_drv.c | 2 +- > include/drm/drmP.h | 1 - > include/drm/drm_legacy.h | 1 + > 12 files changed, 13 insertions(+), 13 deletions(-) > > diff --git a/drivers/gpu/drm/drm_internal.h b/drivers/gpu/drm/drm_internal.h > index 7e459bf38c26..d27faae45f1b 100644 > --- a/drivers/gpu/drm/drm_internal.h > +++ b/drivers/gpu/drm/drm_internal.h > @@ -37,7 +37,6 @@ int drm_irq_by_busid(struct drm_device *dev, void *data, > > /* drm_vm.c */ > int drm_vma_info(struct seq_file *m, void *data); > -int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma); > void drm_vm_close_locked(struct drm_device *dev, struct vm_area_struct *vma); > > /* drm_prime.c */ > diff --git a/drivers/gpu/drm/drm_vm.c b/drivers/gpu/drm/drm_vm.c > index 06cad0323699..e36c5cb2733b 100644 > --- a/drivers/gpu/drm/drm_vm.c > +++ b/drivers/gpu/drm/drm_vm.c > @@ -541,7 +541,7 @@ static resource_size_t drm_core_get_reg_ofs(struct drm_device *dev) > * according to the mapping type and remaps the pages. Finally sets the file > * pointer and calls vm_open(). > */ > -int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma) > +static int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma) > { > struct drm_file *priv = filp->private_data; > struct drm_device *dev = priv->minor->dev; > @@ -655,7 +655,7 @@ int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma) > return 0; > } > > -int drm_mmap(struct file *filp, struct vm_area_struct *vma) > +int drm_legacy_mmap(struct file *filp, struct vm_area_struct *vma) > { > struct drm_file *priv = filp->private_data; > struct drm_device *dev = priv->minor->dev; > @@ -670,7 +670,7 @@ int drm_mmap(struct file *filp, struct vm_area_struct *vma) > > return ret; > } > -EXPORT_SYMBOL(drm_mmap); > +EXPORT_SYMBOL(drm_legacy_mmap); > > void drm_legacy_vma_flush(struct drm_device *dev) > { > diff --git a/drivers/gpu/drm/i810/i810_drv.c b/drivers/gpu/drm/i810/i810_drv.c > index 6cb08a1c6b62..44f4a131c8dd 100644 > --- a/drivers/gpu/drm/i810/i810_drv.c > +++ b/drivers/gpu/drm/i810/i810_drv.c > @@ -47,7 +47,7 @@ static const struct file_operations i810_driver_fops = { > .open = drm_open, > .release = drm_release, > .unlocked_ioctl = drm_ioctl, > - .mmap = drm_mmap, > + .mmap = drm_legacy_mmap, > .poll = drm_poll, > #ifdef CONFIG_COMPAT > .compat_ioctl = drm_compat_ioctl, > diff --git a/drivers/gpu/drm/mga/mga_drv.c b/drivers/gpu/drm/mga/mga_drv.c > index cb5c71f4b28e..5e2f131a6a72 100644 > --- a/drivers/gpu/drm/mga/mga_drv.c > +++ b/drivers/gpu/drm/mga/mga_drv.c > @@ -48,7 +48,7 @@ static const struct file_operations mga_driver_fops = { > .open = drm_open, > .release = drm_release, > .unlocked_ioctl = drm_ioctl, > - .mmap = drm_mmap, > + .mmap = drm_legacy_mmap, > .poll = drm_poll, > #ifdef CONFIG_COMPAT > .compat_ioctl = mga_compat_ioctl, > diff --git a/drivers/gpu/drm/r128/r128_drv.c b/drivers/gpu/drm/r128/r128_drv.c > index 4a59370eb580..c57b4de63caf 100644 > --- a/drivers/gpu/drm/r128/r128_drv.c > +++ b/drivers/gpu/drm/r128/r128_drv.c > @@ -46,7 +46,7 @@ static const struct file_operations r128_driver_fops = { > .open = drm_open, > .release = drm_release, > .unlocked_ioctl = drm_ioctl, > - .mmap = drm_mmap, > + .mmap = drm_legacy_mmap, > .poll = drm_poll, > #ifdef CONFIG_COMPAT > .compat_ioctl = r128_compat_ioctl, > diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c > index ec7e963d9bf7..dd082049fd5b 100644 > --- a/drivers/gpu/drm/radeon/radeon_drv.c > +++ b/drivers/gpu/drm/radeon/radeon_drv.c > @@ -308,7 +308,7 @@ static const struct file_operations radeon_driver_old_fops = { > .open = drm_open, > .release = drm_release, > .unlocked_ioctl = drm_ioctl, > - .mmap = drm_mmap, > + .mmap = drm_legacy_mmap, > .poll = drm_poll, > .read = drm_read, > #ifdef CONFIG_COMPAT > diff --git a/drivers/gpu/drm/savage/savage_drv.c b/drivers/gpu/drm/savage/savage_drv.c > index 1b09d2182037..21aed1febeb4 100644 > --- a/drivers/gpu/drm/savage/savage_drv.c > +++ b/drivers/gpu/drm/savage/savage_drv.c > @@ -40,7 +40,7 @@ static const struct file_operations savage_driver_fops = { > .open = drm_open, > .release = drm_release, > .unlocked_ioctl = drm_ioctl, > - .mmap = drm_mmap, > + .mmap = drm_legacy_mmap, > .poll = drm_poll, > #ifdef CONFIG_COMPAT > .compat_ioctl = drm_compat_ioctl, > diff --git a/drivers/gpu/drm/sis/sis_drv.c b/drivers/gpu/drm/sis/sis_drv.c > index 54858e6fedaf..79bce76cb8f7 100644 > --- a/drivers/gpu/drm/sis/sis_drv.c > +++ b/drivers/gpu/drm/sis/sis_drv.c > @@ -70,7 +70,7 @@ static const struct file_operations sis_driver_fops = { > .open = drm_open, > .release = drm_release, > .unlocked_ioctl = drm_ioctl, > - .mmap = drm_mmap, > + .mmap = drm_legacy_mmap, > .poll = drm_poll, > #ifdef CONFIG_COMPAT > .compat_ioctl = drm_compat_ioctl, > diff --git a/drivers/gpu/drm/tdfx/tdfx_drv.c b/drivers/gpu/drm/tdfx/tdfx_drv.c > index df533ff999a4..fab5ebcb0fef 100644 > --- a/drivers/gpu/drm/tdfx/tdfx_drv.c > +++ b/drivers/gpu/drm/tdfx/tdfx_drv.c > @@ -36,6 +36,7 @@ > #include "tdfx_drv.h" > > #include <drm/drm_pciids.h> > +#include <drm/drm_legacy.h> > > static struct pci_device_id pciidlist[] = { > tdfx_PCI_IDS > @@ -46,7 +47,7 @@ static const struct file_operations tdfx_driver_fops = { > .open = drm_open, > .release = drm_release, > .unlocked_ioctl = drm_ioctl, > - .mmap = drm_mmap, > + .mmap = drm_legacy_mmap, > .poll = drm_poll, > #ifdef CONFIG_COMPAT > .compat_ioctl = drm_compat_ioctl, > diff --git a/drivers/gpu/drm/via/via_drv.c b/drivers/gpu/drm/via/via_drv.c > index c16ffa63ded6..ed8aa8ff861a 100644 > --- a/drivers/gpu/drm/via/via_drv.c > +++ b/drivers/gpu/drm/via/via_drv.c > @@ -62,7 +62,7 @@ static const struct file_operations via_driver_fops = { > .open = drm_open, > .release = drm_release, > .unlocked_ioctl = drm_ioctl, > - .mmap = drm_mmap, > + .mmap = drm_legacy_mmap, > .poll = drm_poll, > #ifdef CONFIG_COMPAT > .compat_ioctl = drm_compat_ioctl, > diff --git a/include/drm/drmP.h b/include/drm/drmP.h > index 5c60d384b37b..24aa38236367 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); > -- > 2.1.0 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/drivers/gpu/drm/drm_internal.h b/drivers/gpu/drm/drm_internal.h index 7e459bf38c26..d27faae45f1b 100644 --- a/drivers/gpu/drm/drm_internal.h +++ b/drivers/gpu/drm/drm_internal.h @@ -37,7 +37,6 @@ int drm_irq_by_busid(struct drm_device *dev, void *data, /* drm_vm.c */ int drm_vma_info(struct seq_file *m, void *data); -int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma); void drm_vm_close_locked(struct drm_device *dev, struct vm_area_struct *vma); /* drm_prime.c */ diff --git a/drivers/gpu/drm/drm_vm.c b/drivers/gpu/drm/drm_vm.c index 06cad0323699..e36c5cb2733b 100644 --- a/drivers/gpu/drm/drm_vm.c +++ b/drivers/gpu/drm/drm_vm.c @@ -541,7 +541,7 @@ static resource_size_t drm_core_get_reg_ofs(struct drm_device *dev) * according to the mapping type and remaps the pages. Finally sets the file * pointer and calls vm_open(). */ -int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma) +static int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma) { struct drm_file *priv = filp->private_data; struct drm_device *dev = priv->minor->dev; @@ -655,7 +655,7 @@ int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma) return 0; } -int drm_mmap(struct file *filp, struct vm_area_struct *vma) +int drm_legacy_mmap(struct file *filp, struct vm_area_struct *vma) { struct drm_file *priv = filp->private_data; struct drm_device *dev = priv->minor->dev; @@ -670,7 +670,7 @@ int drm_mmap(struct file *filp, struct vm_area_struct *vma) return ret; } -EXPORT_SYMBOL(drm_mmap); +EXPORT_SYMBOL(drm_legacy_mmap); void drm_legacy_vma_flush(struct drm_device *dev) { diff --git a/drivers/gpu/drm/i810/i810_drv.c b/drivers/gpu/drm/i810/i810_drv.c index 6cb08a1c6b62..44f4a131c8dd 100644 --- a/drivers/gpu/drm/i810/i810_drv.c +++ b/drivers/gpu/drm/i810/i810_drv.c @@ -47,7 +47,7 @@ static const struct file_operations i810_driver_fops = { .open = drm_open, .release = drm_release, .unlocked_ioctl = drm_ioctl, - .mmap = drm_mmap, + .mmap = drm_legacy_mmap, .poll = drm_poll, #ifdef CONFIG_COMPAT .compat_ioctl = drm_compat_ioctl, diff --git a/drivers/gpu/drm/mga/mga_drv.c b/drivers/gpu/drm/mga/mga_drv.c index cb5c71f4b28e..5e2f131a6a72 100644 --- a/drivers/gpu/drm/mga/mga_drv.c +++ b/drivers/gpu/drm/mga/mga_drv.c @@ -48,7 +48,7 @@ static const struct file_operations mga_driver_fops = { .open = drm_open, .release = drm_release, .unlocked_ioctl = drm_ioctl, - .mmap = drm_mmap, + .mmap = drm_legacy_mmap, .poll = drm_poll, #ifdef CONFIG_COMPAT .compat_ioctl = mga_compat_ioctl, diff --git a/drivers/gpu/drm/r128/r128_drv.c b/drivers/gpu/drm/r128/r128_drv.c index 4a59370eb580..c57b4de63caf 100644 --- a/drivers/gpu/drm/r128/r128_drv.c +++ b/drivers/gpu/drm/r128/r128_drv.c @@ -46,7 +46,7 @@ static const struct file_operations r128_driver_fops = { .open = drm_open, .release = drm_release, .unlocked_ioctl = drm_ioctl, - .mmap = drm_mmap, + .mmap = drm_legacy_mmap, .poll = drm_poll, #ifdef CONFIG_COMPAT .compat_ioctl = r128_compat_ioctl, diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c index ec7e963d9bf7..dd082049fd5b 100644 --- a/drivers/gpu/drm/radeon/radeon_drv.c +++ b/drivers/gpu/drm/radeon/radeon_drv.c @@ -308,7 +308,7 @@ static const struct file_operations radeon_driver_old_fops = { .open = drm_open, .release = drm_release, .unlocked_ioctl = drm_ioctl, - .mmap = drm_mmap, + .mmap = drm_legacy_mmap, .poll = drm_poll, .read = drm_read, #ifdef CONFIG_COMPAT diff --git a/drivers/gpu/drm/savage/savage_drv.c b/drivers/gpu/drm/savage/savage_drv.c index 1b09d2182037..21aed1febeb4 100644 --- a/drivers/gpu/drm/savage/savage_drv.c +++ b/drivers/gpu/drm/savage/savage_drv.c @@ -40,7 +40,7 @@ static const struct file_operations savage_driver_fops = { .open = drm_open, .release = drm_release, .unlocked_ioctl = drm_ioctl, - .mmap = drm_mmap, + .mmap = drm_legacy_mmap, .poll = drm_poll, #ifdef CONFIG_COMPAT .compat_ioctl = drm_compat_ioctl, diff --git a/drivers/gpu/drm/sis/sis_drv.c b/drivers/gpu/drm/sis/sis_drv.c index 54858e6fedaf..79bce76cb8f7 100644 --- a/drivers/gpu/drm/sis/sis_drv.c +++ b/drivers/gpu/drm/sis/sis_drv.c @@ -70,7 +70,7 @@ static const struct file_operations sis_driver_fops = { .open = drm_open, .release = drm_release, .unlocked_ioctl = drm_ioctl, - .mmap = drm_mmap, + .mmap = drm_legacy_mmap, .poll = drm_poll, #ifdef CONFIG_COMPAT .compat_ioctl = drm_compat_ioctl, diff --git a/drivers/gpu/drm/tdfx/tdfx_drv.c b/drivers/gpu/drm/tdfx/tdfx_drv.c index df533ff999a4..fab5ebcb0fef 100644 --- a/drivers/gpu/drm/tdfx/tdfx_drv.c +++ b/drivers/gpu/drm/tdfx/tdfx_drv.c @@ -36,6 +36,7 @@ #include "tdfx_drv.h" #include <drm/drm_pciids.h> +#include <drm/drm_legacy.h> static struct pci_device_id pciidlist[] = { tdfx_PCI_IDS @@ -46,7 +47,7 @@ static const struct file_operations tdfx_driver_fops = { .open = drm_open, .release = drm_release, .unlocked_ioctl = drm_ioctl, - .mmap = drm_mmap, + .mmap = drm_legacy_mmap, .poll = drm_poll, #ifdef CONFIG_COMPAT .compat_ioctl = drm_compat_ioctl, diff --git a/drivers/gpu/drm/via/via_drv.c b/drivers/gpu/drm/via/via_drv.c index c16ffa63ded6..ed8aa8ff861a 100644 --- a/drivers/gpu/drm/via/via_drv.c +++ b/drivers/gpu/drm/via/via_drv.c @@ -62,7 +62,7 @@ static const struct file_operations via_driver_fops = { .open = drm_open, .release = drm_release, .unlocked_ioctl = drm_ioctl, - .mmap = drm_mmap, + .mmap = drm_legacy_mmap, .poll = drm_poll, #ifdef CONFIG_COMPAT .compat_ioctl = drm_compat_ioctl, diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 5c60d384b37b..24aa38236367 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);
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> --- drivers/gpu/drm/drm_internal.h | 1 - drivers/gpu/drm/drm_vm.c | 6 +++--- drivers/gpu/drm/i810/i810_drv.c | 2 +- drivers/gpu/drm/mga/mga_drv.c | 2 +- drivers/gpu/drm/r128/r128_drv.c | 2 +- drivers/gpu/drm/radeon/radeon_drv.c | 2 +- drivers/gpu/drm/savage/savage_drv.c | 2 +- drivers/gpu/drm/sis/sis_drv.c | 2 +- drivers/gpu/drm/tdfx/tdfx_drv.c | 3 ++- drivers/gpu/drm/via/via_drv.c | 2 +- include/drm/drmP.h | 1 - include/drm/drm_legacy.h | 1 + 12 files changed, 13 insertions(+), 13 deletions(-)