public inbox for linux-media@vger.kernel.org
 help / color / mirror / Atom feed
From: Marek Szyprowski <m.szyprowski@samsung.com>
To: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: linaro-mm-sig@lists.linaro.org, linux-media@vger.kernel.org,
	Tomasz Stanislawski <t.stanislaws@samsung.com>,
	Kyungmin Park <kyungmin.park@samsung.com>
Subject: [PATCH 5/6] v4l: fimc: integrate capture i-face with shrbuf
Date: Tue, 02 Aug 2011 11:53:48 +0200	[thread overview]
Message-ID: <4E37C92C.9070101@samsung.com> (raw)
In-Reply-To: <4E37C7D7.40301@samsung.com>

From: Tomasz Stanislawski <t.stanislaws@samsung.com>

Signed-off-by: Tomasz Stanislawski <t.stanislaws@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
---
  drivers/media/video/s5p-fimc/fimc-capture.c |   11 ++++++++++-
  1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/drivers/media/video/s5p-fimc/fimc-capture.c 
b/drivers/media/video/s5p-fimc/fimc-capture.c
index a16f359..0904263 100644
--- a/drivers/media/video/s5p-fimc/fimc-capture.c
+++ b/drivers/media/video/s5p-fimc/fimc-capture.c
@@ -981,6 +981,14 @@ static int fimc_cap_qbuf(struct file *file, void *priv,
      return vb2_qbuf(&fimc->vid_cap.vbq, buf);
  }

+static int fimc_cap_expbuf(struct file *file, void *priv,
+              unsigned int offset)
+{
+    struct fimc_dev *fimc = video_drvdata(file);
+
+    return vb2_expbuf(&fimc->vid_cap.vbq, offset);
+}
+
  static int fimc_cap_dqbuf(struct file *file, void *priv,
                 struct v4l2_buffer *buf)
  {
@@ -1051,6 +1059,7 @@ static const struct v4l2_ioctl_ops 
fimc_capture_ioctl_ops = {

      .vidioc_qbuf            = fimc_cap_qbuf,
      .vidioc_dqbuf            = fimc_cap_dqbuf,
+    .vidioc_expbuf            = fimc_cap_expbuf,

      .vidioc_streamon        = fimc_cap_streamon,
      .vidioc_streamoff        = fimc_cap_streamoff,
@@ -1422,7 +1431,7 @@ int fimc_register_capture_device(struct fimc_dev 
*fimc,
      q = &fimc->vid_cap.vbq;
      memset(q, 0, sizeof(*q));
      q->type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
-    q->io_modes = VB2_MMAP | VB2_USERPTR;
+    q->io_modes = VB2_MMAP | VB2_USERPTR | VB2_SHRBUF;
      q->drv_priv = fimc->vid_cap.ctx;
      q->ops = &fimc_capture_qops;
      q->mem_ops = &vb2_dma_contig_memops;
-- 
1.7.6




  parent reply	other threads:[~2011-08-02  9:53 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-08-02  9:48 Buffer sharing proof-of-concept Marek Szyprowski
2011-08-02  9:49 ` [PATCH 1/6] drivers: base: add shared buffer framework Marek Szyprowski
2011-08-02 18:09   ` [Linaro-mm-sig] " Clark, Rob
2011-08-02  9:50 ` [PATCH 2/6] v4l: add buffer exporting via shrbuf Marek Szyprowski
2011-08-02  9:52 ` [PATCH 3/6] v4l: vb2: add support for shared buffer (shrbuf) Marek Szyprowski
2011-08-02  9:53 ` [PATCH 4/6] v4l: vb2: integrate dma-contig allocator with shrbuf Marek Szyprowski
2011-08-02  9:53 ` Marek Szyprowski [this message]
2011-08-02  9:54 ` [PATCH 6/6] v4l: s5p-tv: mixer: integrate " Marek Szyprowski
2011-08-02 11:59 ` [Linaro-mm-sig] Buffer sharing proof-of-concept KyongHo Cho
2011-08-02 14:48   ` Marek Szyprowski
2011-08-02 15:44 ` Jordan Crouse
2011-08-03  9:33   ` Tom Cooksey
2011-08-03 15:12     ` Jordan Crouse
2011-08-04  8:58       ` Daniel Vetter
2011-08-04 11:14         ` Clark, Rob
2011-08-04 12:34           ` Daniel Vetter
2011-08-04 16:19             ` Clark, Rob

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=4E37C92C.9070101@samsung.com \
    --to=m.szyprowski@samsung.com \
    --cc=kyungmin.park@samsung.com \
    --cc=linaro-mm-sig@lists.linaro.org \
    --cc=linux-media@vger.kernel.org \
    --cc=t.stanislaws@samsung.com \
    /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