Commit 7e98b7b5 authored by Boris Brezillon's avatar Boris Brezillon Committed by Mauro Carvalho Chehab
Browse files

media: v4l2: Get rid of ->vidioc_enum_fmt_vid_{cap, out}_mplane 



Support for multiplanar and singleplanar formats is mutually exclusive,
at least in practice. In our attempt to unify support for support for
mplane and !mplane in v4l, let's get rid of the
->vidioc_enum_fmt_{vid,out}_cap_mplane() hooks and call
->vidioc_enum_fmt_{vid,out}_cap() instead.

Signed-off-by: default avatarBoris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
[hverkuil-cisco@xs4all.nl: fix typos: pirv -> priv and prov -> priv]
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 1ddc8a97

drivers/media/pci/intel/ipu3/ipu3-cio2.c

+1 −1
Original line number Diff line number Diff line
@@ -1174,7 +1174,7 @@ static const struct v4l2_file_operations cio2_v4l2_fops = { 


static const struct v4l2_ioctl_ops cio2_v4l2_ioctl_ops = {

	.vidioc_querycap = cio2_v4l2_querycap,

	.vidioc_enum_fmt_vid_cap_mplane = cio2_v4l2_enum_fmt,

	.vidioc_enum_fmt_vid_cap = cio2_v4l2_enum_fmt,

	.vidioc_g_fmt_vid_cap_mplane = cio2_v4l2_g_fmt,

	.vidioc_s_fmt_vid_cap_mplane = cio2_v4l2_s_fmt,

	.vidioc_try_fmt_vid_cap_mplane = cio2_v4l2_try_fmt,

drivers/media/platform/exynos-gsc/gsc-core.c

+1 −1
Original line number Diff line number Diff line
@@ -331,7 +331,7 @@ void gsc_check_src_scale_info(struct gsc_variant *var, 
	}

}



int gsc_enum_fmt_mplane(struct v4l2_fmtdesc *f)

int gsc_enum_fmt(struct v4l2_fmtdesc *f)

{

	const struct gsc_fmt *fmt;

drivers/media/platform/exynos-gsc/gsc-core.h

+1 −1
Original line number Diff line number Diff line
@@ -387,7 +387,7 @@ void gsc_m2m_job_finish(struct gsc_ctx *ctx, int vb_state); 
u32 get_plane_size(struct gsc_frame *fr, unsigned int plane);

const struct gsc_fmt *get_format(int index);

const struct gsc_fmt *find_fmt(u32 *pixelformat, u32 *mbus_code, u32 index);

int gsc_enum_fmt_mplane(struct v4l2_fmtdesc *f);

int gsc_enum_fmt(struct v4l2_fmtdesc *f);

int gsc_try_fmt_mplane(struct gsc_ctx *ctx, struct v4l2_format *f);

void gsc_set_frame_size(struct gsc_frame *frame, int width, int height);

int gsc_g_fmt_mplane(struct gsc_ctx *ctx, struct v4l2_format *f);

drivers/media/platform/exynos-gsc/gsc-m2m.c

+5 −5
Original line number Diff line number Diff line
@@ -301,10 +301,10 @@ static int gsc_m2m_querycap(struct file *file, void *fh, 
	return 0;

}



static int gsc_m2m_enum_fmt_mplane(struct file *file, void *priv,

static int gsc_m2m_enum_fmt(struct file *file, void *priv,

			    struct v4l2_fmtdesc *f)

{

	return gsc_enum_fmt_mplane(f);

	return gsc_enum_fmt(f);

}



static int gsc_m2m_g_fmt_mplane(struct file *file, void *fh,
@@ -560,8 +560,8 @@ static int gsc_m2m_s_selection(struct file *file, void *fh, 


static const struct v4l2_ioctl_ops gsc_m2m_ioctl_ops = {

	.vidioc_querycap		= gsc_m2m_querycap,

	.vidioc_enum_fmt_vid_cap_mplane	= gsc_m2m_enum_fmt_mplane,

	.vidioc_enum_fmt_vid_out_mplane	= gsc_m2m_enum_fmt_mplane,

	.vidioc_enum_fmt_vid_cap	= gsc_m2m_enum_fmt,

	.vidioc_enum_fmt_vid_out	= gsc_m2m_enum_fmt,

	.vidioc_g_fmt_vid_cap_mplane	= gsc_m2m_g_fmt_mplane,

	.vidioc_g_fmt_vid_out_mplane	= gsc_m2m_g_fmt_mplane,

	.vidioc_try_fmt_vid_cap_mplane	= gsc_m2m_try_fmt_mplane,

drivers/media/platform/exynos4-is/fimc-capture.c

+3 −3
Original line number Diff line number Diff line
@@ -732,7 +732,7 @@ static int fimc_cap_querycap(struct file *file, void *priv, 
	return 0;

}



static int fimc_cap_enum_fmt_mplane(struct file *file, void *priv,

static int fimc_cap_enum_fmt(struct file *file, void *priv,

			     struct v4l2_fmtdesc *f)

{

	struct fimc_fmt *fmt;
@@ -1360,7 +1360,7 @@ static int fimc_cap_s_selection(struct file *file, void *fh, 
static const struct v4l2_ioctl_ops fimc_capture_ioctl_ops = {

	.vidioc_querycap		= fimc_cap_querycap,



	.vidioc_enum_fmt_vid_cap_mplane	= fimc_cap_enum_fmt_mplane,

	.vidioc_enum_fmt_vid_cap	= fimc_cap_enum_fmt,

	.vidioc_try_fmt_vid_cap_mplane	= fimc_cap_try_fmt_mplane,

	.vidioc_s_fmt_vid_cap_mplane	= fimc_cap_s_fmt_mplane,

	.vidioc_g_fmt_vid_cap_mplane	= fimc_cap_g_fmt_mplane,