aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2012-02-23 06:37:26 -0500
committerDave Airlie <airlied@redhat.com>2012-03-05 06:19:08 -0500
commit966e0cdd504657333415f43de6a219197511ebff (patch)
tree62aa0782141b62ad2a0c22ba2249fa8e2d94fe5e /drivers
parent81ffbbedc37c6043e5f5b123da926aa7dd8ad60a (diff)
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: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/drm_gem.c1
-rw-r--r--drivers/gpu/drm/drm_vm.c2
-rw-r--r--drivers/gpu/drm/exynos/exynos_drm_gem.c1
-rw-r--r--drivers/gpu/drm/i810/i810_dma.c1
4 files changed, 0 insertions, 5 deletions
diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
index f8625e290728..3ebe3c8f58b5 100644
--- a/drivers/gpu/drm/drm_gem.c
+++ b/drivers/gpu/drm/drm_gem.c
@@ -700,7 +700,6 @@ int drm_gem_mmap(struct file *filp, struct vm_area_struct *vma)
700 */ 700 */
701 drm_gem_object_reference(obj); 701 drm_gem_object_reference(obj);
702 702
703 vma->vm_file = filp; /* Needed for drm_vm_open() */
704 drm_vm_open_locked(vma); 703 drm_vm_open_locked(vma);
705 704
706out_unlock: 705out_unlock:
diff --git a/drivers/gpu/drm/drm_vm.c b/drivers/gpu/drm/drm_vm.c
index 8c03eaf41448..55cd61567812 100644
--- a/drivers/gpu/drm/drm_vm.c
+++ b/drivers/gpu/drm/drm_vm.c
@@ -519,7 +519,6 @@ static int drm_mmap_dma(struct file *filp, struct vm_area_struct *vma)
519 vma->vm_flags |= VM_RESERVED; /* Don't swap */ 519 vma->vm_flags |= VM_RESERVED; /* Don't swap */
520 vma->vm_flags |= VM_DONTEXPAND; 520 vma->vm_flags |= VM_DONTEXPAND;
521 521
522 vma->vm_file = filp; /* Needed for drm_vm_open() */
523 drm_vm_open_locked(vma); 522 drm_vm_open_locked(vma);
524 return 0; 523 return 0;
525} 524}
@@ -671,7 +670,6 @@ int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma)
671 vma->vm_flags |= VM_RESERVED; /* Don't swap */ 670 vma->vm_flags |= VM_RESERVED; /* Don't swap */
672 vma->vm_flags |= VM_DONTEXPAND; 671 vma->vm_flags |= VM_DONTEXPAND;
673 672
674 vma->vm_file = filp; /* Needed for drm_vm_open() */
675 drm_vm_open_locked(vma); 673 drm_vm_open_locked(vma);
676 return 0; 674 return 0;
677} 675}
diff --git a/drivers/gpu/drm/exynos/exynos_drm_gem.c b/drivers/gpu/drm/exynos/exynos_drm_gem.c
index 025abb3e3b67..65452512f5b4 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_gem.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_gem.c
@@ -208,7 +208,6 @@ static int exynos_drm_gem_mmap_buffer(struct file *filp,
208 208
209 /* in case of direct mapping, always having non-cachable attribute */ 209 /* in case of direct mapping, always having non-cachable attribute */
210 vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot); 210 vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
211 vma->vm_file = filp;
212 211
213 vm_size = vma->vm_end - vma->vm_start; 212 vm_size = vma->vm_end - vma->vm_start;
214 /* 213 /*
diff --git a/drivers/gpu/drm/i810/i810_dma.c b/drivers/gpu/drm/i810/i810_dma.c
index 64a989ed5b8f..2c8a60c3b98e 100644
--- a/drivers/gpu/drm/i810/i810_dma.c
+++ b/drivers/gpu/drm/i810/i810_dma.c
@@ -99,7 +99,6 @@ static int i810_mmap_buffers(struct file *filp, struct vm_area_struct *vma)
99 buf_priv = buf->dev_private; 99 buf_priv = buf->dev_private;
100 100
101 vma->vm_flags |= (VM_IO | VM_DONTCOPY); 101 vma->vm_flags |= (VM_IO | VM_DONTCOPY);
102 vma->vm_file = filp;
103 102
104 buf_priv->currently_mapped = I810_BUF_MAPPED; 103 buf_priv->currently_mapped = I810_BUF_MAPPED;
105 104