diff options
author | Prabhakar Lad <prabhakar.csengg@gmail.com> | 2014-09-06 11:26:48 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2014-09-21 19:14:33 -0400 |
commit | 3b8a269b7dd64cab4645f95daf3e470e72adfed8 (patch) | |
tree | 77512385551129572a01ebb6824bc913dfcceeff | |
parent | 55d3b439acad5c9faf34765f8391a13d153a1e81 (diff) |
[media] media: davinci: vpif_capture: drop setting of vb2 buffer state to ACTIVE
this patch drops setting of vb2 buffer state to VB2_BUF_STATE_ACTIVE,
as any buffer queued to the driver is marked ACTIVE by the vb2 core.
Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
-rw-r--r-- | drivers/media/platform/davinci/vpif_capture.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c index cf15bb1962ef..881efcdbee87 100644 --- a/drivers/media/platform/davinci/vpif_capture.c +++ b/drivers/media/platform/davinci/vpif_capture.c | |||
@@ -213,8 +213,6 @@ static int vpif_start_streaming(struct vb2_queue *vq, unsigned int count) | |||
213 | /* Remove buffer from the buffer queue */ | 213 | /* Remove buffer from the buffer queue */ |
214 | list_del(&common->cur_frm->list); | 214 | list_del(&common->cur_frm->list); |
215 | spin_unlock_irqrestore(&common->irqlock, flags); | 215 | spin_unlock_irqrestore(&common->irqlock, flags); |
216 | /* Mark state of the current frame to active */ | ||
217 | common->cur_frm->vb.state = VB2_BUF_STATE_ACTIVE; | ||
218 | 216 | ||
219 | addr = vb2_dma_contig_plane_dma_addr(&common->cur_frm->vb, 0); | 217 | addr = vb2_dma_contig_plane_dma_addr(&common->cur_frm->vb, 0); |
220 | 218 | ||
@@ -350,7 +348,6 @@ static void vpif_schedule_next_buffer(struct common_obj *common) | |||
350 | /* Remove that buffer from the buffer queue */ | 348 | /* Remove that buffer from the buffer queue */ |
351 | list_del(&common->next_frm->list); | 349 | list_del(&common->next_frm->list); |
352 | spin_unlock(&common->irqlock); | 350 | spin_unlock(&common->irqlock); |
353 | common->next_frm->vb.state = VB2_BUF_STATE_ACTIVE; | ||
354 | addr = vb2_dma_contig_plane_dma_addr(&common->next_frm->vb, 0); | 351 | addr = vb2_dma_contig_plane_dma_addr(&common->next_frm->vb, 0); |
355 | 352 | ||
356 | /* Set top and bottom field addresses in VPIF registers */ | 353 | /* Set top and bottom field addresses in VPIF registers */ |