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

Commit 966e0cdd authored by Dave Airlie's avatar Dave Airlie
Browse files

drm: drop setting vm_file to filp 



Talking to Al Viro on irc, we can see no possible reason for doing
this, the upper mmap code does it. The code has been there since
first import into drm tree I can find.

Al tracked down this as a requirement pre 2.3.51 hasn't been needed since.

Acked-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 81ffbbed

drivers/gpu/drm/drm_gem.c

+0 −1
Original line number Diff line number Diff line
@@ -700,7 +700,6 @@ int drm_gem_mmap(struct file *filp, struct vm_area_struct *vma) 
	 */

	drm_gem_object_reference(obj);



	vma->vm_file = filp;	/* Needed for drm_vm_open() */

	drm_vm_open_locked(vma);



out_unlock:

drivers/gpu/drm/drm_vm.c

+0 −2
Original line number Diff line number Diff line
@@ -519,7 +519,6 @@ static int drm_mmap_dma(struct file *filp, struct vm_area_struct *vma) 
	vma->vm_flags |= VM_RESERVED;	/* Don't swap */

	vma->vm_flags |= VM_DONTEXPAND;



	vma->vm_file = filp;	/* Needed for drm_vm_open() */

	drm_vm_open_locked(vma);

	return 0;

}
@@ -671,7 +670,6 @@ int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma) 
	vma->vm_flags |= VM_RESERVED;	/* Don't swap */

	vma->vm_flags |= VM_DONTEXPAND;



	vma->vm_file = filp;	/* Needed for drm_vm_open() */

	drm_vm_open_locked(vma);

	return 0;

}

drivers/gpu/drm/exynos/exynos_drm_gem.c

+0 −1
Original line number Diff line number Diff line
@@ -208,7 +208,6 @@ static int exynos_drm_gem_mmap_buffer(struct file *filp, 


	/* in case of direct mapping, always having non-cachable attribute */

	vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);

	vma->vm_file = filp;



	vm_size = vma->vm_end - vma->vm_start;

	/*

drivers/gpu/drm/i810/i810_dma.c

+0 −1
Original line number Diff line number Diff line
@@ -99,7 +99,6 @@ static int i810_mmap_buffers(struct file *filp, struct vm_area_struct *vma) 
	buf_priv = buf->dev_private;



	vma->vm_flags |= (VM_IO | VM_DONTCOPY);

	vma->vm_file = filp;



	buf_priv->currently_mapped = I810_BUF_MAPPED;