From: Albert Wang <twang13@marvell.com>
To: corbet@lwn.net, g.liakhovetski@gmx.de
Cc: linux-media@vger.kernel.org, Albert Wang <twang13@marvell.com>,
Libin Yang <lbyang@marvell.com>
Subject: [PATCH V3 09/15] [media] marvell-ccic: add get_mcam function for marvell-ccic driver
Date: Sat, 15 Dec 2012 17:57:58 +0800 [thread overview]
Message-ID: <1355565484-15791-10-git-send-email-twang13@marvell.com> (raw)
In-Reply-To: <1355565484-15791-1-git-send-email-twang13@marvell.com>
This patch adds get_mcam() inline function which is prepared for
adding soc_camera support in marvell-ccic driver
Signed-off-by: Libin Yang <lbyang@marvell.com>
Signed-off-by: Albert Wang <twang13@marvell.com>
---
drivers/media/platform/marvell-ccic/mcam-core.c | 27 ++++++++++++++---------
drivers/media/platform/marvell-ccic/mcam-core.h | 5 +++++
2 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/drivers/media/platform/marvell-ccic/mcam-core.c b/drivers/media/platform/marvell-ccic/mcam-core.c
index c3c8873..9b5a5e9 100755
--- a/drivers/media/platform/marvell-ccic/mcam-core.c
+++ b/drivers/media/platform/marvell-ccic/mcam-core.c
@@ -1057,7 +1057,7 @@ static int mcam_vb_queue_setup(struct vb2_queue *vq,
unsigned int *num_planes, unsigned int sizes[],
void *alloc_ctxs[])
{
- struct mcam_camera *cam = vb2_get_drv_priv(vq);
+ struct mcam_camera *cam = get_mcam(vq);
int minbufs = (cam->buffer_mode == B_DMA_contig) ? 3 : 2;
sizes[0] = cam->pix_format.sizeimage;
@@ -1073,14 +1073,17 @@ static int mcam_vb_queue_setup(struct vb2_queue *vq,
static void mcam_vb_buf_queue(struct vb2_buffer *vb)
{
struct mcam_vb_buffer *mvb = vb_to_mvb(vb);
- struct mcam_camera *cam = vb2_get_drv_priv(vb->vb2_queue);
+ struct mcam_camera *cam = get_mcam(vb->vb2_queue);
struct v4l2_pix_format *fmt = &cam->pix_format;
unsigned long flags;
int start;
dma_addr_t dma_handle;
+ unsigned long size;
u32 pixel_count = fmt->width * fmt->height;
spin_lock_irqsave(&cam->dev_lock, flags);
+ size = vb2_plane_size(vb, 0);
+ vb2_set_plane_payload(vb, 0, size);
dma_handle = vb2_dma_contig_plane_dma_addr(vb, 0);
BUG_ON(!dma_handle);
start = (cam->state == S_BUFWAIT) && !list_empty(&cam->buffers);
@@ -1121,14 +1124,14 @@ static void mcam_vb_buf_queue(struct vb2_buffer *vb)
*/
static void mcam_vb_wait_prepare(struct vb2_queue *vq)
{
- struct mcam_camera *cam = vb2_get_drv_priv(vq);
+ struct mcam_camera *cam = get_mcam(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);
+ struct mcam_camera *cam = get_mcam(vq);
mutex_lock(&cam->s_mutex);
}
@@ -1138,9 +1141,12 @@ static void mcam_vb_wait_finish(struct vb2_queue *vq)
*/
static int mcam_vb_start_streaming(struct vb2_queue *vq, unsigned int count)
{
- struct mcam_camera *cam = vb2_get_drv_priv(vq);
+ struct mcam_camera *cam = get_mcam(vq);
unsigned int frame;
+ if (count < 2)
+ return -EINVAL;
+
if (cam->state != S_IDLE) {
INIT_LIST_HEAD(&cam->buffers);
return -EINVAL;
@@ -1170,7 +1176,7 @@ static int mcam_vb_start_streaming(struct vb2_queue *vq, unsigned int count)
static int mcam_vb_stop_streaming(struct vb2_queue *vq)
{
- struct mcam_camera *cam = vb2_get_drv_priv(vq);
+ struct mcam_camera *cam = get_mcam(vq);
unsigned long flags;
if (cam->state == S_BUFWAIT) {
@@ -1181,6 +1187,7 @@ static int mcam_vb_stop_streaming(struct vb2_queue *vq)
if (cam->state != S_STREAMING)
return -EINVAL;
mcam_ctlr_stop_dma(cam);
+ cam->state = S_IDLE;
/*
* Reset the CCIC PHY after stopping streaming,
* otherwise, the CCIC may be unstable.
@@ -1216,7 +1223,7 @@ static const struct vb2_ops mcam_vb2_ops = {
static int mcam_vb_sg_buf_init(struct vb2_buffer *vb)
{
struct mcam_vb_buffer *mvb = vb_to_mvb(vb);
- struct mcam_camera *cam = vb2_get_drv_priv(vb->vb2_queue);
+ struct mcam_camera *cam = get_mcam(vb->vb2_queue);
int ndesc = cam->pix_format.sizeimage/PAGE_SIZE + 1;
mvb->dma_desc = dma_alloc_coherent(cam->dev,
@@ -1232,7 +1239,7 @@ static int mcam_vb_sg_buf_init(struct vb2_buffer *vb)
static int mcam_vb_sg_buf_prepare(struct vb2_buffer *vb)
{
struct mcam_vb_buffer *mvb = vb_to_mvb(vb);
- struct mcam_camera *cam = vb2_get_drv_priv(vb->vb2_queue);
+ struct mcam_camera *cam = get_mcam(vb->vb2_queue);
struct vb2_dma_sg_desc *sgd = vb2_dma_sg_plane_desc(vb, 0);
struct mcam_dma_desc *desc = mvb->dma_desc;
struct scatterlist *sg;
@@ -1252,7 +1259,7 @@ static int mcam_vb_sg_buf_prepare(struct vb2_buffer *vb)
static int mcam_vb_sg_buf_finish(struct vb2_buffer *vb)
{
- struct mcam_camera *cam = vb2_get_drv_priv(vb->vb2_queue);
+ struct mcam_camera *cam = get_mcam(vb->vb2_queue);
struct vb2_dma_sg_desc *sgd = vb2_dma_sg_plane_desc(vb, 0);
dma_unmap_sg(cam->dev, sgd->sglist, sgd->num_pages, DMA_FROM_DEVICE);
@@ -1261,7 +1268,7 @@ static int mcam_vb_sg_buf_finish(struct vb2_buffer *vb)
static void mcam_vb_sg_buf_cleanup(struct vb2_buffer *vb)
{
- struct mcam_camera *cam = vb2_get_drv_priv(vb->vb2_queue);
+ struct mcam_camera *cam = get_mcam(vb->vb2_queue);
struct mcam_vb_buffer *mvb = vb_to_mvb(vb);
int ndesc = cam->pix_format.sizeimage/PAGE_SIZE + 1;
diff --git a/drivers/media/platform/marvell-ccic/mcam-core.h b/drivers/media/platform/marvell-ccic/mcam-core.h
index 7db638f..3ea25ed 100755
--- a/drivers/media/platform/marvell-ccic/mcam-core.h
+++ b/drivers/media/platform/marvell-ccic/mcam-core.h
@@ -216,6 +216,11 @@ static inline void mcam_reg_set_bit(struct mcam_camera *cam,
mcam_reg_write_mask(cam, reg, val, val);
}
+static inline struct mcam_camera *get_mcam(struct vb2_queue *vq)
+{
+ return vb2_get_drv_priv(vq);
+}
+
/*
* Functions for use by platform code.
*/
--
1.7.9.5
next prev parent reply other threads:[~2012-12-15 9:59 UTC|newest]
Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-15 9:57 [PATCH V3 00/15] [media] marvell-ccic: add soc camera support on marvell-ccic Albert Wang
2012-12-15 9:57 ` [PATCH V3 01/15] [media] marvell-ccic: use internal variable replace global frame stats variable Albert Wang
2012-12-16 15:36 ` Jonathan Corbet
2012-12-27 20:07 ` Mauro Carvalho Chehab
2013-01-01 14:56 ` Guennadi Liakhovetski
2012-12-15 9:57 ` [PATCH V3 02/15] [media] marvell-ccic: add MIPI support for marvell-ccic driver Albert Wang
2012-12-16 15:54 ` Jonathan Corbet
2012-12-16 21:45 ` Albert Wang
2013-01-01 15:28 ` Guennadi Liakhovetski
2013-01-01 19:31 ` Albert Wang
2012-12-15 9:57 ` [PATCH V3 03/15] [media] marvell-ccic: add clock tree " Albert Wang
2012-12-16 16:03 ` Jonathan Corbet
2012-12-16 21:51 ` Albert Wang
2013-01-03 17:37 ` Nicolas THERY
2013-01-03 19:27 ` Albert Wang
2013-01-01 16:05 ` Guennadi Liakhovetski
2013-01-01 19:36 ` Albert Wang
2013-01-04 5:42 ` Libin Yang
2013-01-04 10:25 ` Guennadi Liakhovetski
2013-01-05 3:12 ` Libin Yang
2012-12-15 9:57 ` [PATCH V3 04/15] [media] marvell-ccic: reset ccic phy when stop streaming for stability Albert Wang
2012-12-16 16:04 ` Jonathan Corbet
2013-01-01 16:13 ` Guennadi Liakhovetski
2012-12-15 9:57 ` [PATCH V3 05/15] [media] marvell-ccic: refine mcam_set_contig_buffer function Albert Wang
2012-12-16 16:06 ` Jonathan Corbet
2012-12-16 21:54 ` Albert Wang
2012-12-15 9:57 ` [PATCH V3 06/15] [media] marvell-ccic: add new formats support for marvell-ccic driver Albert Wang
2012-12-16 16:16 ` Jonathan Corbet
2012-12-16 21:58 ` Albert Wang
2013-01-01 16:56 ` Guennadi Liakhovetski
2013-01-01 19:42 ` Albert Wang
2013-01-01 20:03 ` Guennadi Liakhovetski
2013-01-04 9:32 ` Libin Yang
2013-01-10 7:53 ` Libin Yang
2012-12-15 9:57 ` [PATCH V3 07/15] [media] marvell-ccic: add SOF / EOF pair check " Albert Wang
2012-12-16 16:19 ` Jonathan Corbet
2012-12-16 22:00 ` Albert Wang
2013-01-02 7:48 ` Guennadi Liakhovetski
2012-12-15 9:57 ` [PATCH V3 08/15] [media] marvell-ccic: switch to resource managed allocation and request Albert Wang
2012-12-16 16:20 ` Jonathan Corbet
2013-01-02 8:00 ` Guennadi Liakhovetski
2012-12-15 9:57 ` Albert Wang [this message]
2012-12-16 16:24 ` [PATCH V3 09/15] [media] marvell-ccic: add get_mcam function for marvell-ccic driver Jonathan Corbet
2012-12-16 22:04 ` Albert Wang
2013-01-02 8:16 ` Guennadi Liakhovetski
2012-12-15 9:57 ` [PATCH V3 10/15] [media] marvell-ccic: split mcam-core into 2 parts for soc_camera support Albert Wang
2012-12-16 16:37 ` Jonathan Corbet
2012-12-16 22:12 ` Albert Wang
2012-12-17 15:28 ` Jonathan Corbet
2012-12-18 3:04 ` Albert Wang
2012-12-18 19:15 ` Jonathan Corbet
2012-12-18 20:48 ` Albert Wang
2013-01-31 8:29 ` Albert Wang
2013-02-05 3:14 ` Jonathan Corbet
2013-02-06 3:21 ` Albert Wang
2012-12-15 9:58 ` [PATCH V3 11/15] [media] marvell-ccic: add soc_camera support in mcam core Albert Wang
2012-12-15 9:58 ` [PATCH V3 12/15] [media] marvell-ccic: add soc_camera support in mmp driver Albert Wang
2012-12-16 16:46 ` Jonathan Corbet
2012-12-16 22:19 ` Albert Wang
2012-12-15 9:58 ` [PATCH V3 13/15] [media] marvell-ccic: add dma burst mode support in marvell-ccic driver Albert Wang
2012-12-16 16:49 ` Jonathan Corbet
2012-12-16 22:22 ` Albert Wang
2012-12-15 9:58 ` [PATCH V3 14/15] [media] marvell-ccic: use unsigned int type replace int type Albert Wang
2012-12-16 16:50 ` Jonathan Corbet
2012-12-15 9:58 ` [PATCH V3 15/15] [media] marvell-ccic: add 3 frame buffers support in DMA_CONTIG mode Albert Wang
2012-12-16 16:56 ` Jonathan Corbet
2012-12-16 22:34 ` Albert Wang
2012-12-16 22:55 ` Jonathan Corbet
2012-12-17 5:06 ` Albert Wang
2012-12-16 16:57 ` [PATCH V3 00/15] [media] marvell-ccic: add soc camera support on marvell-ccic Jonathan Corbet
2012-12-16 22:34 ` Albert Wang
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=1355565484-15791-10-git-send-email-twang13@marvell.com \
--to=twang13@marvell.com \
--cc=corbet@lwn.net \
--cc=g.liakhovetski@gmx.de \
--cc=lbyang@marvell.com \
--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).