Re: [RFCv3 PATCH 02/10] vb2: change result code of buf_finish to void.
Thanks!
vb2 parts:
Acked-by: Pawel Osciak
others:
Reviewed-by: Pawel Osciak
On Thu, Feb 13, 2014 at 6:40 PM, Hans Verkuil wrote:
> From: Hans Verkuil
>
> The buf_finish op should always work, so change the return type to void.
> Update the few drivers that use it. Note that buf_finish can be called
> both when the DMA is streaming and when it isn't (during queue_cancel).
> Update drivers to check that where appropriate.
>
> Signed-off-by: Hans Verkuil
> ---
> drivers/media/parport/bw-qcam.c | 6 --
> drivers/media/pci/sta2x11/sta2x11_vip.c | 7 +++
> drivers/media/platform/marvell-ccic/mcam-core.c | 3 +--
> drivers/media/usb/pwc/pwc-if.c | 16 +---
> drivers/media/usb/uvc/uvc_queue.c | 6 +++---
> drivers/media/v4l2-core/videobuf2-core.c| 6 +-
> drivers/staging/media/go7007/go7007-v4l2.c | 3 +--
> include/media/videobuf2-core.h | 2 +-
> 8 files changed, 23 insertions(+), 26 deletions(-)
>
> diff --git a/drivers/media/parport/bw-qcam.c b/drivers/media/parport/bw-qcam.c
> index d12bd33..8d69bfb 100644
> --- a/drivers/media/parport/bw-qcam.c
> +++ b/drivers/media/parport/bw-qcam.c
> @@ -667,13 +667,16 @@ static void buffer_queue(struct vb2_buffer *vb)
> vb2_buffer_done(vb, VB2_BUF_STATE_DONE);
> }
>
> -static int buffer_finish(struct vb2_buffer *vb)
> +static void buffer_finish(struct vb2_buffer *vb)
> {
> struct qcam *qcam = vb2_get_drv_priv(vb->vb2_queue);
> void *vbuf = vb2_plane_vaddr(vb, 0);
> int size = vb->vb2_queue->plane_sizes[0];
> int len;
>
> + if (!vb2_is_streaming(vb->vb2_queue))
> + return;
> +
> mutex_lock(&qcam->lock);
> parport_claim_or_block(qcam->pdev);
>
> @@ -691,7 +694,6 @@ static int buffer_finish(struct vb2_buffer *vb)
> if (len != size)
> vb->state = VB2_BUF_STATE_ERROR;
> vb2_set_plane_payload(vb, 0, len);
> - return 0;
> }
>
> static struct vb2_ops qcam_video_qops = {
> diff --git a/drivers/media/pci/sta2x11/sta2x11_vip.c
> b/drivers/media/pci/sta2x11/sta2x11_vip.c
> index e5cfb6c..bb11443 100644
> --- a/drivers/media/pci/sta2x11/sta2x11_vip.c
> +++ b/drivers/media/pci/sta2x11/sta2x11_vip.c
> @@ -327,7 +327,7 @@ static void buffer_queue(struct vb2_buffer *vb)
> }
> spin_unlock(&vip->lock);
> }
> -static int buffer_finish(struct vb2_buffer *vb)
> +static void buffer_finish(struct vb2_buffer *vb)
> {
> struct sta2x11_vip *vip = vb2_get_drv_priv(vb->vb2_queue);
> struct vip_buffer *vip_buf = to_vip_buffer(vb);
> @@ -337,9 +337,8 @@ static int buffer_finish(struct vb2_buffer *vb)
> list_del_init(&vip_buf->list);
> spin_unlock(&vip->lock);
>
> - vip_active_buf_next(vip);
> -
> - return 0;
> + if (vb2_is_streaming(vb->vb2_queue))
> + vip_active_buf_next(vip);
> }
>
> static int start_streaming(struct vb2_queue *vq, unsigned int count)
> diff --git a/drivers/media/platform/marvell-ccic/mcam-core.c
> b/drivers/media/platform/marvell-ccic/mcam-core.c
> index 32fab30..8b34c48 100644
> --- a/drivers/media/platform/marvell-ccic/mcam-core.c
> +++ b/drivers/media/platform/marvell-ccic/mcam-core.c
> @@ -1238,7 +1238,7 @@ static int mcam_vb_sg_buf_prepare(struct vb2_buffer *vb)
> return 0;
> }
>
> -static int mcam_vb_sg_buf_finish(struct vb2_buffer *vb)
> +static void mcam_vb_sg_buf_finish(struct vb2_buffer *vb)
> {
> struct mcam_camera *cam = vb2_get_drv_priv(vb->vb2_queue);
> struct sg_table *sg_table = vb2_dma_sg_plane_desc(vb, 0);
> @@ -1246,7 +1246,6 @@ static int mcam_vb_sg_buf_finish(struct vb2_buffer *vb)
> if (sg_table)
> dma_unmap_sg(cam->dev, sg_table->sgl,
> sg_table->nents, DMA_FROM_DEVICE);
> - return 0;
> }
>
> static void mcam_vb_sg_buf_cleanup(struct vb2_buffer *vb)
> diff --git a/drivers/media/usb/pwc/pwc-if.c b/drivers/media/usb/pwc/pwc-if.c
> index abf365a..b9c9f10 100644
> --- a/drivers/media/usb/pwc/pwc-if.c
> +++ b/drivers/media/usb/pwc/pwc-if.c
> @@ -614,17 +614,19 @@ static int buffer_prepare(struct vb2_buffer *vb)
> return 0;
> }
>
> -static int buffer_finish(struct vb2_buffer *vb)
> +static void buffer_finish(struct vb2_buffer *vb)
> {
> struct pwc_device *pdev = vb2_get_drv_priv(vb->vb2_queue);
> struct pwc_frame_buf *buf = container_of(vb, struct pwc_frame_buf,
> vb);
>
> - /*
> -* Application has called dqbuf and is getting back a buffer we've
> -* filled, take the pwc data we've stored in buf->data and decompress
> -* it into a usable format, storing the result in the vb2_buffer
> -*/
> - return pwc_decompress(pdev, buf);
> + if (vb->state == VB2_BUF_STATE_DONE) {
> + /*
> +* Application has called dqbuf and is getting back a buffer
> we've
> +
[RFCv3 PATCH 02/10] vb2: change result code of buf_finish to void.
From: Hans Verkuil
The buf_finish op should always work, so change the return type to void.
Update the few drivers that use it. Note that buf_finish can be called
both when the DMA is streaming and when it isn't (during queue_cancel).
Update drivers to check that where appropriate.
Signed-off-by: Hans Verkuil
---
drivers/media/parport/bw-qcam.c | 6 --
drivers/media/pci/sta2x11/sta2x11_vip.c | 7 +++
drivers/media/platform/marvell-ccic/mcam-core.c | 3 +--
drivers/media/usb/pwc/pwc-if.c | 16 +---
drivers/media/usb/uvc/uvc_queue.c | 6 +++---
drivers/media/v4l2-core/videobuf2-core.c| 6 +-
drivers/staging/media/go7007/go7007-v4l2.c | 3 +--
include/media/videobuf2-core.h | 2 +-
8 files changed, 23 insertions(+), 26 deletions(-)
diff --git a/drivers/media/parport/bw-qcam.c b/drivers/media/parport/bw-qcam.c
index d12bd33..8d69bfb 100644
--- a/drivers/media/parport/bw-qcam.c
+++ b/drivers/media/parport/bw-qcam.c
@@ -667,13 +667,16 @@ static void buffer_queue(struct vb2_buffer *vb)
vb2_buffer_done(vb, VB2_BUF_STATE_DONE);
}
-static int buffer_finish(struct vb2_buffer *vb)
+static void buffer_finish(struct vb2_buffer *vb)
{
struct qcam *qcam = vb2_get_drv_priv(vb->vb2_queue);
void *vbuf = vb2_plane_vaddr(vb, 0);
int size = vb->vb2_queue->plane_sizes[0];
int len;
+ if (!vb2_is_streaming(vb->vb2_queue))
+ return;
+
mutex_lock(&qcam->lock);
parport_claim_or_block(qcam->pdev);
@@ -691,7 +694,6 @@ static int buffer_finish(struct vb2_buffer *vb)
if (len != size)
vb->state = VB2_BUF_STATE_ERROR;
vb2_set_plane_payload(vb, 0, len);
- return 0;
}
static struct vb2_ops qcam_video_qops = {
diff --git a/drivers/media/pci/sta2x11/sta2x11_vip.c
b/drivers/media/pci/sta2x11/sta2x11_vip.c
index e5cfb6c..bb11443 100644
--- a/drivers/media/pci/sta2x11/sta2x11_vip.c
+++ b/drivers/media/pci/sta2x11/sta2x11_vip.c
@@ -327,7 +327,7 @@ static void buffer_queue(struct vb2_buffer *vb)
}
spin_unlock(&vip->lock);
}
-static int buffer_finish(struct vb2_buffer *vb)
+static void buffer_finish(struct vb2_buffer *vb)
{
struct sta2x11_vip *vip = vb2_get_drv_priv(vb->vb2_queue);
struct vip_buffer *vip_buf = to_vip_buffer(vb);
@@ -337,9 +337,8 @@ static int buffer_finish(struct vb2_buffer *vb)
list_del_init(&vip_buf->list);
spin_unlock(&vip->lock);
- vip_active_buf_next(vip);
-
- return 0;
+ if (vb2_is_streaming(vb->vb2_queue))
+ vip_active_buf_next(vip);
}
static int start_streaming(struct vb2_queue *vq, unsigned int count)
diff --git a/drivers/media/platform/marvell-ccic/mcam-core.c
b/drivers/media/platform/marvell-ccic/mcam-core.c
index 32fab30..8b34c48 100644
--- a/drivers/media/platform/marvell-ccic/mcam-core.c
+++ b/drivers/media/platform/marvell-ccic/mcam-core.c
@@ -1238,7 +1238,7 @@ static int mcam_vb_sg_buf_prepare(struct vb2_buffer *vb)
return 0;
}
-static int mcam_vb_sg_buf_finish(struct vb2_buffer *vb)
+static void mcam_vb_sg_buf_finish(struct vb2_buffer *vb)
{
struct mcam_camera *cam = vb2_get_drv_priv(vb->vb2_queue);
struct sg_table *sg_table = vb2_dma_sg_plane_desc(vb, 0);
@@ -1246,7 +1246,6 @@ static int mcam_vb_sg_buf_finish(struct vb2_buffer *vb)
if (sg_table)
dma_unmap_sg(cam->dev, sg_table->sgl,
sg_table->nents, DMA_FROM_DEVICE);
- return 0;
}
static void mcam_vb_sg_buf_cleanup(struct vb2_buffer *vb)
diff --git a/drivers/media/usb/pwc/pwc-if.c b/drivers/media/usb/pwc/pwc-if.c
index abf365a..b9c9f10 100644
--- a/drivers/media/usb/pwc/pwc-if.c
+++ b/drivers/media/usb/pwc/pwc-if.c
@@ -614,17 +614,19 @@ static int buffer_prepare(struct vb2_buffer *vb)
return 0;
}
-static int buffer_finish(struct vb2_buffer *vb)
+static void buffer_finish(struct vb2_buffer *vb)
{
struct pwc_device *pdev = vb2_get_drv_priv(vb->vb2_queue);
struct pwc_frame_buf *buf = container_of(vb, struct pwc_frame_buf, vb);
- /*
-* Application has called dqbuf and is getting back a buffer we've
-* filled, take the pwc data we've stored in buf->data and decompress
-* it into a usable format, storing the result in the vb2_buffer
-*/
- return pwc_decompress(pdev, buf);
+ if (vb->state == VB2_BUF_STATE_DONE) {
+ /*
+* Application has called dqbuf and is getting back a buffer
we've
+* filled, take the pwc data we've stored in buf->data and
decompress
+* it into a usable format, storing the result in the vb2_buffer
+*/
+ pwc_decompress(pdev, buf);
+ }
}
static void buffer_cleanup(struct vb2_buffer *vb)
diff --git a/drivers/media/usb/uvc/uvc_queue.c
b/drivers/media/u
