Commit eb83b8e3 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

media: videobuf2: Move frame_vector into media subsystem 



It's the only user. This also garbage collects the CONFIG_FRAME_VECTOR
symbol from all over the tree (well just one place, somehow omap media
driver still had this in its Kconfig, despite not using it).

Reviewed-by: default avatarJohn Hubbard <jhubbard@nvidia.com>
Acked-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Acked-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Acked-by: default avatarTomasz Figa <tfiga@chromium.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Cc: Jason Gunthorpe <jgg@ziepe.ca>
Cc: Pawel Osciak <pawel@osciak.com>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Tomasz Figa <tfiga@chromium.org>
Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: John Hubbard <jhubbard@nvidia.com>
Cc: Jérôme Glisse <jglisse@redhat.com>
Cc: Jan Kara <jack@suse.cz>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: linux-mm@kvack.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-samsung-soc@vger.kernel.org
Cc: linux-media@vger.kernel.org
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20201127164131.2244124-7-daniel.vetter@ffwll.ch
parent 04769cb1

drivers/media/common/videobuf2/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ config VIDEOBUF2_V4L2 


config VIDEOBUF2_MEMOPS

	tristate

	select FRAME_VECTOR



config VIDEOBUF2_DMA_CONTIG

	tristate

drivers/media/common/videobuf2/Makefile

+1 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

videobuf2-common-objs := videobuf2-core.o

videobuf2-common-objs += frame_vector.o



ifeq ($(CONFIG_TRACEPOINTS),y)

  videobuf2-common-objs += vb2-trace.o

mm/frame_vector.c→drivers/media/common/videobuf2/frame_vector.c

+2 −0
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ 
#include <linux/pagemap.h>

#include <linux/sched.h>



#include <media/frame_vector.h>



/**

 * get_vaddr_frames() - map virtual addresses to pfns

 * @start:	starting user address

drivers/media/platform/omap/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -12,6 +12,5 @@ config VIDEO_OMAP2_VOUT 
	depends on VIDEO_V4L2

	select VIDEOBUF2_DMA_CONTIG

	select OMAP2_VRFB if ARCH_OMAP2 || ARCH_OMAP3

	select FRAME_VECTOR

	help

	  V4L2 Display driver support for OMAP2/3 based boards.

include/linux/mm.h

+0 −42
Original line number Diff line number Diff line
@@ -1754,48 +1754,6 @@ int account_locked_vm(struct mm_struct *mm, unsigned long pages, bool inc); 
int __account_locked_vm(struct mm_struct *mm, unsigned long pages, bool inc,

			struct task_struct *task, bool bypass_rlim);



/* Container for pinned pfns / pages */

struct frame_vector {

	unsigned int nr_allocated;	/* Number of frames we have space for */

	unsigned int nr_frames;	/* Number of frames stored in ptrs array */

	bool got_ref;		/* Did we pin pages by getting page ref? */

	bool is_pfns;		/* Does array contain pages or pfns? */

	void *ptrs[];		/* Array of pinned pfns / pages. Use

				 * pfns_vector_pages() or pfns_vector_pfns()

				 * for access */

};



struct frame_vector *frame_vector_create(unsigned int nr_frames);

void frame_vector_destroy(struct frame_vector *vec);

int get_vaddr_frames(unsigned long start, unsigned int nr_pfns,

		     struct frame_vector *vec);

void put_vaddr_frames(struct frame_vector *vec);

int frame_vector_to_pages(struct frame_vector *vec);

void frame_vector_to_pfns(struct frame_vector *vec);



static inline unsigned int frame_vector_count(struct frame_vector *vec)

{

	return vec->nr_frames;

}



static inline struct page **frame_vector_pages(struct frame_vector *vec)

{

	if (vec->is_pfns) {

		int err = frame_vector_to_pages(vec);



		if (err)

			return ERR_PTR(err);

	}

	return (struct page **)(vec->ptrs);

}



static inline unsigned long *frame_vector_pfns(struct frame_vector *vec)

{

	if (!vec->is_pfns)

		frame_vector_to_pfns(vec);

	return (unsigned long *)(vec->ptrs);

}



struct kvec;

int get_kernel_pages(const struct kvec *iov, int nr_pages, int write,

			struct page **pages);