Merge tag 'media/v4.3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

Pull media updates from Mauro Carvalho Chehab:
 "A series of patches that move part of the code used to allocate memory
  from the media subsystem to the mm subsystem"

[ The mm parts have been acked by VM people, and the series was
  apparently in -mm for a while   - Linus ]

* tag 'media/v4.3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  [media] drm/exynos: Convert g2d_userptr_get_dma_addr() to use get_vaddr_frames()
  [media] media: vb2: Remove unused functions
  [media] media: vb2: Convert vb2_dc_get_userptr() to use frame vector
  [media] media: vb2: Convert vb2_vmalloc_get_userptr() to use frame vector
  [media] media: vb2: Convert vb2_dma_sg_get_userptr() to use frame vector
  [media] vb2: Provide helpers for mapping virtual addresses
  [media] media: omap_vout: Convert omap_vout_uservirt_to_phys() to use get_vaddr_pfns()
  [media] mm: Provide new get_vaddr_frames() helper
  [media] vb2: Push mmap_sem down to memops

1 files changed, 0 insertions, 97 deletions

diff --git a/drivers/gpu/drm/exynos/exynos_drm_gem.c b/drivers/gpu/drm/exynos/exynos_drm_gem.c
index 62b9ea1b07fb..f12fbc36b120 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_gem.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_gem.c
@@ -366,103 +366,6 @@ int exynos_drm_gem_get_ioctl(struct drm_device *dev, void *data,
         return 0;
 }
 
-struct vm_area_struct *exynos_gem_get_vma(struct vm_area_struct *vma)
-{
-        struct vm_area_struct *vma_copy;
-
-        vma_copy = kmalloc(sizeof(*vma_copy), GFP_KERNEL);
-        if (!vma_copy)
-                return NULL;
-
-        if (vma->vm_ops && vma->vm_ops->open)
-                vma->vm_ops->open(vma);
-
-        if (vma->vm_file)
-                get_file(vma->vm_file);
-
-        memcpy(vma_copy, vma, sizeof(*vma));
-
-        vma_copy->vm_mm = NULL;
-        vma_copy->vm_next = NULL;
-        vma_copy->vm_prev = NULL;
-
-        return vma_copy;
-}
-
-void exynos_gem_put_vma(struct vm_area_struct *vma)
-{
-        if (!vma)
-                return;
-
-        if (vma->vm_ops && vma->vm_ops->close)
-                vma->vm_ops->close(vma);
-
-        if (vma->vm_file)
-                fput(vma->vm_file);
-
-        kfree(vma);
-}
-
-int exynos_gem_get_pages_from_userptr(unsigned long start,
-                                                unsigned int npages,
-                                                struct page **pages,
-                                                struct vm_area_struct *vma)
-{
-        int get_npages;
-
-        /* the memory region mmaped with VM_PFNMAP. */
-        if (vma_is_io(vma)) {
-                unsigned int i;
-
-                for (i = 0; i < npages; ++i, start += PAGE_SIZE) {
-                        unsigned long pfn;
-                        int ret = follow_pfn(vma, start, &pfn);
-                        if (ret)
-                                return ret;
-
-                        pages[i] = pfn_to_page(pfn);
-                }
-
-                if (i != npages) {
-                        DRM_ERROR("failed to get user_pages.\n");
-                        return -EINVAL;
-                }
-
-                return 0;
-        }
-
-        get_npages = get_user_pages(current, current->mm, start,
-                                        npages, 1, 1, pages, NULL);
-        get_npages = max(get_npages, 0);
-        if (get_npages != npages) {
-                DRM_ERROR("failed to get user_pages.\n");
-                while (get_npages)
-                        put_page(pages[--get_npages]);
-                return -EFAULT;
-        }
-
-        return 0;
-}
-
-void exynos_gem_put_pages_to_userptr(struct page **pages,
-                                        unsigned int npages,
-                                        struct vm_area_struct *vma)
-{
-        if (!vma_is_io(vma)) {
-                unsigned int i;
-
-                for (i = 0; i < npages; i++) {
-                        set_page_dirty_lock(pages[i]);
-
-                        /*
-                         * undo the reference we took when populating
-                         * the table.
-                         */
-                        put_page(pages[i]);
-                }
-        }
-}
-
 int exynos_gem_map_sgt_with_dma(struct drm_device *drm_dev,
                                 struct sg_table *sgt,
                                 enum dma_data_direction dir)