Linux Media Controller development
 help / color / mirror / Atom feed
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
To: Linux Media Mailing List <linux-media@vger.kernel.org>
Cc: Hans Verkuil <hverkuil@xs4all.nl>,
	Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
	Mauro Carvalho Chehab <mchehab@infradead.org>
Subject: [PATCH/RFC 3/4] V4L: soc-camera: add support for new multi-size video-buffer ioctl()s
Date: Fri, 1 Apr 2011 10:13:13 +0200 (CEST)	[thread overview]
Message-ID: <Pine.LNX.4.64.1104011011480.9530@axis700.grange> (raw)
In-Reply-To: <Pine.LNX.4.64.1104010959470.9530@axis700.grange>

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
---
 drivers/media/video/soc_camera.c |   46 ++++++++++++++++++++++++++++++++++++-
 1 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/drivers/media/video/soc_camera.c b/drivers/media/video/soc_camera.c
index 11f0f1e..6a41e89 100644
--- a/drivers/media/video/soc_camera.c
+++ b/drivers/media/video/soc_camera.c
@@ -286,6 +286,45 @@ 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->dev.parent);
+
+	/* videobuf2 only */
+	if (ici->ops->init_videobuf)
+		return -EINVAL;
+	else
+		return vb2_create_bufs(&icd->vb2_vidq, create);
+}
+
+static int soc_camera_destroy_bufs(struct file *file, void *priv,
+			    struct v4l2_buffer_span *span)
+{
+	struct soc_camera_device *icd = file->private_data;
+	struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
+
+	/* videobuf2 only */
+	if (ici->ops->init_videobuf)
+		return -EINVAL;
+	else
+		return vb2_destroy_bufs(&icd->vb2_vidq, span);
+}
+
+static int soc_camera_submit_buf(struct file *file, void *priv,
+			    unsigned int idx)
+{
+	struct soc_camera_device *icd = file->private_data;
+	struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
+
+	/* videobuf2 only */
+	if (ici->ops->init_videobuf)
+		return -EINVAL;
+	else
+		return vb2_submit_buf(&icd->vb2_vidq, idx);
+}
+
 /* Always entered with .video_lock held */
 static int soc_camera_init_user_formats(struct soc_camera_device *icd)
 {
@@ -1420,19 +1459,22 @@ static void soc_camera_device_unregister(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_destroy_bufs	 = soc_camera_destroy_bufs,
+	.vidioc_submit_buf	 = soc_camera_submit_buf,
 	.vidioc_streamon	 = soc_camera_streamon,
 	.vidioc_streamoff	 = soc_camera_streamoff,
 	.vidioc_queryctrl	 = soc_camera_queryctrl,
-- 
1.7.2.5


  parent reply	other threads:[~2011-04-01  8:13 UTC|newest]

Thread overview: 59+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-04-01  8:12 [PATCH/RFC 0/4] V4L: new ioctl()s to support multi-sized video-buffers Guennadi Liakhovetski
2011-04-01  8:13 ` [PATCH/RFC 1/4] V4L: add three new ioctl()s for multi-size videobuffer management Guennadi Liakhovetski
2011-04-04  7:05   ` Hans Verkuil
2011-04-04  7:38     ` Guennadi Liakhovetski
2011-04-04  8:06       ` Hans Verkuil
2011-04-04  8:23         ` Guennadi Liakhovetski
2011-04-05 12:02         ` Laurent Pinchart
2011-04-05 12:40           ` Guennadi Liakhovetski
2011-04-05 12:40           ` Hans Verkuil
2011-04-05 12:53             ` Laurent Pinchart
2011-04-05 11:59   ` Laurent Pinchart
2011-04-05 12:39     ` Guennadi Liakhovetski
2011-04-05 12:56       ` Laurent Pinchart
2011-04-05 14:53         ` Sakari Ailus
2011-04-05 12:21   ` Laurent Pinchart
2011-04-05 12:34     ` Hans Verkuil
2011-04-05 12:50       ` Laurent Pinchart
2011-04-05 12:52       ` Guennadi Liakhovetski
2011-04-05 12:58         ` Laurent Pinchart
2011-04-06 16:19       ` Guennadi Liakhovetski
2011-04-07  7:06         ` Hans Verkuil
2011-04-07  7:15           ` Guennadi Liakhovetski
2011-04-07  7:50             ` Hans Verkuil
2011-04-07  8:53               ` Guennadi Liakhovetski
2011-04-07  9:13                 ` Hans Verkuil
2011-04-07  9:17               ` Laurent Pinchart
2011-04-07  9:28                 ` Hans Verkuil
2011-04-11 11:27                   ` Sakari Ailus
2011-04-11  8:54   ` Sakari Ailus
2011-05-13  7:45   ` Guennadi Liakhovetski
2011-05-14 11:12     ` Hans Verkuil
2011-05-16 13:32     ` Sakari Ailus
2011-05-16 20:34       ` Guennadi Liakhovetski
2011-05-17  5:52         ` Sakari Ailus
2011-05-18 14:01           ` Laurent Pinchart
2011-05-18 14:48             ` Guennadi Liakhovetski
2011-05-18 19:58               ` Sakari Ailus
2011-06-06 13:10                 ` Guennadi Liakhovetski
2011-06-06 17:28                   ` Sakari Ailus
2011-06-07 12:14                     ` Guennadi Liakhovetski
2011-06-08  9:04                       ` Sakari Ailus
2011-05-22 10:18           ` Guennadi Liakhovetski
2011-05-22 12:17             ` Sakari Ailus
2011-05-18 13:59     ` Laurent Pinchart
2011-05-18 15:15       ` Guennadi Liakhovetski
2011-05-18 18:02         ` Sakari Ailus
2011-04-01  8:13 ` [PATCH/RFC 2/4] V4L: add videobuf2 helper functions to support multi-size video-buffers Guennadi Liakhovetski
2011-04-01 14:06   ` [PATCH/RFC 2/4 v2] " Guennadi Liakhovetski
2011-04-03 17:34     ` Pawel Osciak
2011-04-04  7:55       ` Guennadi Liakhovetski
2011-04-05 12:42         ` Laurent Pinchart
2011-04-05 12:38     ` Laurent Pinchart
2011-04-05 13:01       ` Guennadi Liakhovetski
2011-04-01  8:13 ` Guennadi Liakhovetski [this message]
2011-04-01  8:13 ` [PATCH/RFC 4/4] V4L: sh_mobile_ceu_camera: " Guennadi Liakhovetski
2011-04-03 17:34 ` [PATCH/RFC 0/4] V4L: new ioctl()s to support multi-sized video-buffers Pawel Osciak
2011-04-04  7:15   ` Guennadi Liakhovetski
2011-04-05 12:19     ` Laurent Pinchart
2011-04-05 12:48       ` Guennadi Liakhovetski

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=Pine.LNX.4.64.1104011011480.9530@axis700.grange \
    --to=g.liakhovetski@gmx.de \
    --cc=hverkuil@xs4all.nl \
    --cc=laurent.pinchart@ideasonboard.com \
    --cc=linux-media@vger.kernel.org \
    --cc=mchehab@infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox