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>,
Jonathan Corbet <corbet@lwn.net>
Subject: [PATCH v2 06/11] media: marvell-ccic: use vb2_ops_wait_prepare/finish helper
Date: Wed, 26 Nov 2014 22:42:29 +0000 [thread overview]
Message-ID: <1417041754-8714-7-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: Jonathan Corbet <corbet@lwn.net>
---
drivers/media/platform/marvell-ccic/mcam-core.c | 29 +++++--------------------
1 file changed, 5 insertions(+), 24 deletions(-)
diff --git a/drivers/media/platform/marvell-ccic/mcam-core.c b/drivers/media/platform/marvell-ccic/mcam-core.c
index ce00cba..4ec29c0 100644
--- a/drivers/media/platform/marvell-ccic/mcam-core.c
+++ b/drivers/media/platform/marvell-ccic/mcam-core.c
@@ -1102,26 +1102,6 @@ static void mcam_vb_buf_queue(struct vb2_buffer *vb)
mcam_read_setup(cam);
}
-
-/*
- * vb2 uses these to release the mutex when waiting in dqbuf. I'm
- * not actually sure we need to do this (I'm not sure that vb2_dqbuf() needs
- * to be called with the mutex held), but better safe than sorry.
- */
-static void mcam_vb_wait_prepare(struct vb2_queue *vq)
-{
- struct mcam_camera *cam = vb2_get_drv_priv(vq);
-
- mutex_unlock(&cam->s_mutex);
-}
-
-static void mcam_vb_wait_finish(struct vb2_queue *vq)
-{
- struct mcam_camera *cam = vb2_get_drv_priv(vq);
-
- mutex_lock(&cam->s_mutex);
-}
-
/*
* These need to be called with the mutex held from vb2
*/
@@ -1191,8 +1171,8 @@ static const struct vb2_ops mcam_vb2_ops = {
.buf_queue = mcam_vb_buf_queue,
.start_streaming = mcam_vb_start_streaming,
.stop_streaming = mcam_vb_stop_streaming,
- .wait_prepare = mcam_vb_wait_prepare,
- .wait_finish = mcam_vb_wait_finish,
+ .wait_prepare = vb2_ops_wait_prepare,
+ .wait_finish = vb2_ops_wait_finish,
};
@@ -1252,8 +1232,8 @@ static const struct vb2_ops mcam_vb2_sg_ops = {
.buf_cleanup = mcam_vb_sg_buf_cleanup,
.start_streaming = mcam_vb_start_streaming,
.stop_streaming = mcam_vb_stop_streaming,
- .wait_prepare = mcam_vb_wait_prepare,
- .wait_finish = mcam_vb_wait_finish,
+ .wait_prepare = vb2_ops_wait_prepare,
+ .wait_finish = vb2_ops_wait_finish,
};
#endif /* MCAM_MODE_DMA_SG */
@@ -1265,6 +1245,7 @@ static int mcam_setup_vb2(struct mcam_camera *cam)
memset(vq, 0, sizeof(*vq));
vq->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
vq->drv_priv = cam;
+ vq->lock = &cam->s_mutex;
INIT_LIST_HEAD(&cam->buffers);
switch (cam->buffer_mode) {
case B_DMA_contig:
--
1.9.1
next prev parent reply other threads:[~2014-11-26 22:44 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 ` [PATCH v2 03/11] media: exynos-gsc: " Lad, Prabhakar
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 ` Lad, Prabhakar [this message]
2014-12-01 19:52 ` [PATCH v2 06/11] media: marvell-ccic: " 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-7-git-send-email-prabhakar.csengg@gmail.com \
--to=prabhakar.csengg@gmail.com \
--cc=corbet@lwn.net \
--cc=hans.verkuil@cisco.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).