Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bfbf3c85 authored by Daniel Vetter's avatar Daniel Vetter Committed by Dave Airlie
Browse files

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: default avatarDaniel Vetter <daniel.vetter@intel.com>
Reviewed-by: default avatarDavid Herrmann <dh.herrmann@gmail.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 197633b9

drivers/gpu/drm/drm_internal.h

+0 −1
Original line number Diff line number Diff line
@@ -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 */

drivers/gpu/drm/drm_vm.c

+3 −3
Original line number Diff line number Diff line
@@ -537,7 +537,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;
@@ -651,7 +651,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;
@@ -666,7 +666,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)

{

drivers/gpu/drm/i810/i810_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

drivers/gpu/drm/mga/mga_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

drivers/gpu/drm/r128/r128_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -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,