Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ae77ee9 authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Mauro Carvalho Chehab
Browse files

[media] V4L: soc-camera: add 2 new ioctl() handlers 



This patch adds two new ioctl() handlers: .vidioc_create_bufs() and
.vidioc_prepare_buf() for compliant vb2 soc-camera hosts.

Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 07f92448

drivers/media/video/soc_camera.c

+31 −2
Original line number Diff line number Diff line
@@ -318,6 +318,32 @@ static int soc_camera_dqbuf(struct file *file, void *priv, 
		return vb2_dqbuf(&icd->vb2_vidq, p, file->f_flags & O_NONBLOCK);

}



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

			    struct v4l2_create_buffers *create)

{

	struct soc_camera_device *icd = file->private_data;

	struct soc_camera_host *ici = to_soc_camera_host(icd->parent);



	/* videobuf2 only */

	if (ici->ops->init_videobuf)

		return -EINVAL;

	else

		return vb2_create_bufs(&icd->vb2_vidq, create);

}



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

				  struct v4l2_buffer *b)

{

	struct soc_camera_device *icd = file->private_data;

	struct soc_camera_host *ici = to_soc_camera_host(icd->parent);



	/* videobuf2 only */

	if (ici->ops->init_videobuf)

		return -EINVAL;

	else

		return vb2_prepare_buf(&icd->vb2_vidq, b);

}



/* Always entered with .video_lock held */

static int soc_camera_init_user_formats(struct soc_camera_device *icd)

{
@@ -1041,6 +1067,7 @@ static int soc_camera_probe(struct soc_camera_device *icd) 
		if (!control || !control->driver || !dev_get_drvdata(control) ||

		    !try_module_get(control->driver->owner)) {

			icl->del_device(icd);

			ret = -ENODEV;

			goto enodrv;

		}

	}
@@ -1312,19 +1339,21 @@ static int soc_camera_device_register(struct soc_camera_device *icd) 


static const struct v4l2_ioctl_ops soc_camera_ioctl_ops = {

	.vidioc_querycap	 = soc_camera_querycap,

	.vidioc_try_fmt_vid_cap  = soc_camera_try_fmt_vid_cap,

	.vidioc_g_fmt_vid_cap    = soc_camera_g_fmt_vid_cap,

	.vidioc_enum_fmt_vid_cap = soc_camera_enum_fmt_vid_cap,

	.vidioc_s_fmt_vid_cap    = soc_camera_s_fmt_vid_cap,

	.vidioc_enum_fmt_vid_cap = soc_camera_enum_fmt_vid_cap,

	.vidioc_enum_input	 = soc_camera_enum_input,

	.vidioc_g_input		 = soc_camera_g_input,

	.vidioc_s_input		 = soc_camera_s_input,

	.vidioc_s_std		 = soc_camera_s_std,

	.vidioc_enum_framesizes  = soc_camera_enum_fsizes,

	.vidioc_reqbufs		 = soc_camera_reqbufs,

	.vidioc_try_fmt_vid_cap  = soc_camera_try_fmt_vid_cap,

	.vidioc_querybuf	 = soc_camera_querybuf,

	.vidioc_qbuf		 = soc_camera_qbuf,

	.vidioc_dqbuf		 = soc_camera_dqbuf,

	.vidioc_create_bufs	 = soc_camera_create_bufs,

	.vidioc_prepare_buf	 = soc_camera_prepare_buf,

	.vidioc_streamon	 = soc_camera_streamon,

	.vidioc_streamoff	 = soc_camera_streamoff,

	.vidioc_cropcap		 = soc_camera_cropcap,