Skip to contentSkip to conversation

Helper to abstract vma handling in media layer

GIT PULL Hans Verkuil 1 participant 1 message Jun 5, 2015 Media (V4L/DVB)

lore
Share & tools
lore
#0 lore raw

This pull request merged Jan's vb2/mm patches to abstract vma handling.

See http://www.spinics.net/lists/linux-media/msg89653.html for more info.

It's the same pull request as from May 25th, but with an additional patch that puts get_vaddr_frames() behind a config option (requested by Andrew Morton).

Regards,

Hans

The following changes since commit 64d5702229d86deacf42a43bc893a981f72d4908:

[media] vivid.txt: update the vivid documentation (2015-06-05 11:52:12 -0300)

are available in the git repository at:

git://linuxtv.org/hverkuil/media_tree.git for-v4.2m

for you to fetch changes up to 1382dd5a8f783f368f8b1dd687ee0bf0a93ed899:

mm: Move get_vaddr_frames() behind a config option (2015-06-05 17:01:17 +0200)

----------------------------------------------------------------
Jan Kara (9):
mm: Provide new get_vaddr_frames() helper
media: omap_vout: Convert omap_vout_uservirt_to_phys() to use get_vaddr_pfns()
vb2: Provide helpers for mapping virtual addresses
media: vb2: Convert vb2_dma_sg_get_userptr() to use frame vector
media: vb2: Convert vb2_vmalloc_get_userptr() to use frame vector
media: vb2: Convert vb2_dc_get_userptr() to use frame vector
media: vb2: Remove unused functions
drm/exynos: Convert g2d_userptr_get_dma_addr() to use get_vaddr_frames()
mm: Move get_vaddr_frames() behind a config option

 drivers/gpu/drm/exynos/Kconfig                 |   1 +
 drivers/gpu/drm/exynos/exynos_drm_g2d.c        |  91 ++++++++++--------------------
 drivers/gpu/drm/exynos/exynos_drm_gem.c        |  97 --------------------------------
 drivers/media/platform/omap/Kconfig            |   1 +
 drivers/media/platform/omap/omap_vout.c        |  69 +++++++++++------------
 drivers/media/v4l2-core/Kconfig                |   1 +
 drivers/media/v4l2-core/videobuf2-dma-contig.c | 214 ++++++++++++-----------------------------------------------------------
 drivers/media/v4l2-core/videobuf2-dma-sg.c     |  97 +++++---------------------------
 drivers/media/v4l2-core/videobuf2-memops.c     | 148 ++++++++++++++++---------------------------------
 drivers/media/v4l2-core/videobuf2-vmalloc.c    |  94 ++++++++++++-------------------
 include/linux/mm.h                             |  44 +++++++++++++++
 include/media/videobuf2-memops.h               |  11 ++--
 mm/Kconfig                                     |   3 +
 mm/Makefile                                    |   1 +
 mm/frame_vector.c                              | 232 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 mm/gup.c                                       |   1 +
 16 files changed, 480 insertions(+), 625 deletions(-)
 create mode 100644 mm/frame_vector.c