aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/platform
diff options
context:
space:
mode:
authorPrabhakar Lad <prabhakar.csengg@gmail.com>2014-09-06 11:26:47 -0400
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2014-09-21 19:14:11 -0400
commit55d3b439acad5c9faf34765f8391a13d153a1e81 (patch)
tree400f1db2938b66c5083025ecd912148adb5ac3cb /drivers/media/platform
parentb7900eedfb393dcea9794fbb6d57e4d43338a16b (diff)
[media] media: davinci: vpif_display: 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>
Diffstat (limited to 'drivers/media/platform')
-rw-r--r--drivers/media/platform/davinci/vpif_display.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/media/platform/davinci/vpif_display.c b/drivers/media/platform/davinci/vpif_display.c
index 2ce3ddfcca80..76f829d6b10b 100644
--- a/drivers/media/platform/davinci/vpif_display.c
+++ b/drivers/media/platform/davinci/vpif_display.c
@@ -196,8 +196,6 @@ static int vpif_start_streaming(struct vb2_queue *vq, unsigned int count)
196 196
197 list_del(&common->cur_frm->list); 197 list_del(&common->cur_frm->list);
198 spin_unlock_irqrestore(&common->irqlock, flags); 198 spin_unlock_irqrestore(&common->irqlock, flags);
199 /* Mark state of the current frame to active */
200 common->cur_frm->vb.state = VB2_BUF_STATE_ACTIVE;
201 199
202 addr = vb2_dma_contig_plane_dma_addr(&common->cur_frm->vb, 0); 200 addr = vb2_dma_contig_plane_dma_addr(&common->cur_frm->vb, 0);
203 common->set_addr((addr + common->ytop_off), 201 common->set_addr((addr + common->ytop_off),
@@ -306,8 +304,6 @@ static void process_progressive_mode(struct common_obj *common)
306 /* Remove that buffer from the buffer queue */ 304 /* Remove that buffer from the buffer queue */
307 list_del(&common->next_frm->list); 305 list_del(&common->next_frm->list);
308 spin_unlock(&common->irqlock); 306 spin_unlock(&common->irqlock);
309 /* Mark status of the buffer as active */
310 common->next_frm->vb.state = VB2_BUF_STATE_ACTIVE;
311 307
312 /* Set top and bottom field addrs in VPIF registers */ 308 /* Set top and bottom field addrs in VPIF registers */
313 addr = vb2_dma_contig_plane_dma_addr(&common->next_frm->vb, 0); 309 addr = vb2_dma_contig_plane_dma_addr(&common->next_frm->vb, 0);