From: "Lad, Prabhakar" <prabhakar.csengg@gmail.com>
To: LMML <linux-media@vger.kernel.org>
Cc: linux-kernel@vger.kernel.org,
Hans Verkuil <hans.verkuil@cisco.com>,
"Lad, Prabhakar" <prabhakar.csengg@gmail.com>,
Kukjin Kim <kgene.kim@samsung.com>
Subject: [PATCH v2 03/11] media: exynos-gsc: use vb2_ops_wait_prepare/finish helper
Date: Wed, 26 Nov 2014 22:42:26 +0000 [thread overview]
Message-ID: <1417041754-8714-4-git-send-email-prabhakar.csengg@gmail.com> (raw)
In-Reply-To: <1417041754-8714-1-git-send-email-prabhakar.csengg@gmail.com>
This patch drops driver specific wait_prepare() and
wait_finish() callbacks from vb2_ops and instead uses
the the helpers vb2_ops_wait_prepare/finish() provided
by the vb2 core, the lock member of the queue needs
to be initalized to a mutex so that vb2 helpers
vb2_ops_wait_prepare/finish() can make use of it.
Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Cc: Kukjin Kim <kgene.kim@samsung.com>
---
drivers/media/platform/exynos-gsc/gsc-core.h | 12 ------------
drivers/media/platform/exynos-gsc/gsc-m2m.c | 6 ++++--
2 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/drivers/media/platform/exynos-gsc/gsc-core.h b/drivers/media/platform/exynos-gsc/gsc-core.h
index 0abdb17..fa572aa 100644
--- a/drivers/media/platform/exynos-gsc/gsc-core.h
+++ b/drivers/media/platform/exynos-gsc/gsc-core.h
@@ -466,18 +466,6 @@ static inline void gsc_hw_clear_irq(struct gsc_dev *dev, int irq)
writel(cfg, dev->regs + GSC_IRQ);
}
-static inline void gsc_lock(struct vb2_queue *vq)
-{
- struct gsc_ctx *ctx = vb2_get_drv_priv(vq);
- mutex_lock(&ctx->gsc_dev->lock);
-}
-
-static inline void gsc_unlock(struct vb2_queue *vq)
-{
- struct gsc_ctx *ctx = vb2_get_drv_priv(vq);
- mutex_unlock(&ctx->gsc_dev->lock);
-}
-
static inline bool gsc_ctx_state_is_set(u32 mask, struct gsc_ctx *ctx)
{
unsigned long flags;
diff --git a/drivers/media/platform/exynos-gsc/gsc-m2m.c b/drivers/media/platform/exynos-gsc/gsc-m2m.c
index 74e1de6..d5cffef 100644
--- a/drivers/media/platform/exynos-gsc/gsc-m2m.c
+++ b/drivers/media/platform/exynos-gsc/gsc-m2m.c
@@ -267,8 +267,8 @@ static struct vb2_ops gsc_m2m_qops = {
.queue_setup = gsc_m2m_queue_setup,
.buf_prepare = gsc_m2m_buf_prepare,
.buf_queue = gsc_m2m_buf_queue,
- .wait_prepare = gsc_unlock,
- .wait_finish = gsc_lock,
+ .wait_prepare = vb2_ops_wait_prepare,
+ .wait_finish = vb2_ops_wait_finish,
.stop_streaming = gsc_m2m_stop_streaming,
.start_streaming = gsc_m2m_start_streaming,
};
@@ -590,6 +590,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq,
src_vq->mem_ops = &vb2_dma_contig_memops;
src_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
src_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
+ src_vq->lock = &ctx->gsc_dev->lock;
ret = vb2_queue_init(src_vq);
if (ret)
@@ -603,6 +604,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq,
dst_vq->mem_ops = &vb2_dma_contig_memops;
dst_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
dst_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
+ dst_vq->lock = &ctx->gsc_dev->lock;
return vb2_queue_init(dst_vq);
}
--
1.9.1
next prev parent reply other threads:[~2014-11-26 22:46 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-26 22:42 [PATCH v2 00/11] media: use vb2_ops_wait_prepare/finish helper Lad, Prabhakar
2014-11-26 22:42 ` [PATCH v2 01/11] media: s3c-camif: " Lad, Prabhakar
2014-12-08 11:04 ` Sylwester Nawrocki
2014-11-26 22:42 ` [PATCH v2 02/11] media: ti-vpe: " Lad, Prabhakar
2014-11-26 22:42 ` Lad, Prabhakar [this message]
2014-11-26 22:42 ` [PATCH v2 04/11] media: soc_camera: " Lad, Prabhakar
2014-11-26 22:42 ` [PATCH v2 05/11] media: sh_veu: " Lad, Prabhakar
2014-11-26 22:42 ` [PATCH v2 06/11] media: marvell-ccic: " Lad, Prabhakar
2014-12-01 19:52 ` Jonathan Corbet
2014-11-26 22:42 ` [PATCH v2 07/11] media: s5p-tv: " Lad, Prabhakar
2014-11-26 22:42 ` [PATCH v2 08/11] media: blackfin: " Lad, Prabhakar
2014-11-26 22:42 ` [PATCH v2 09/11] media: s5p-mfc: " Lad, Prabhakar
2014-11-26 22:42 ` [PATCH v2 10/11] media: davinci: vpif_capture: " Lad, Prabhakar
2014-11-26 22:42 ` [PATCH v2 11/11] media: usb: uvc: " Lad, Prabhakar
2014-11-26 22:59 ` Laurent Pinchart
2014-11-26 23:17 ` Prabhakar Lad
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=1417041754-8714-4-git-send-email-prabhakar.csengg@gmail.com \
--to=prabhakar.csengg@gmail.com \
--cc=hans.verkuil@cisco.com \
--cc=kgene.kim@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.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;
as well as URLs for NNTP newsgroup(s).