]> git.ipfire.org Git - people/arne_f/kernel.git/commitdiff
[media] media: platform: pxa_camera: add buffer sequencing
authorRobert Jarzmik <robert.jarzmik@free.fr>
Tue, 6 Sep 2016 09:04:18 +0000 (06:04 -0300)
committerMauro Carvalho Chehab <mchehab@s-opensource.com>
Fri, 9 Sep 2016 13:49:59 +0000 (10:49 -0300)
Add sequence numbers to completed buffers.

Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
drivers/media/platform/soc_camera/pxa_camera.c

index 026ed308fea82967b571c206b55d28a7d1dbfc09..d9e2570d3931a915e2a22ffe6d8c181e7df2dc38 100644 (file)
@@ -223,6 +223,7 @@ struct pxa_camera_dev {
        struct list_head        capture;
 
        spinlock_t              lock;
+       unsigned int            buf_sequence;
 
        struct pxa_buffer       *active;
        struct tasklet_struct   task_eof;
@@ -423,10 +424,13 @@ static void pxa_camera_wakeup(struct pxa_camera_dev *pcdev,
                              struct pxa_buffer *buf)
 {
        struct vb2_buffer *vb = &buf->vbuf.vb2_buf;
+       struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
 
        /* _init is used to debug races, see comment in pxa_camera_reqbufs() */
        list_del_init(&buf->queue);
        vb->timestamp = ktime_get_ns();
+       vbuf->sequence = pcdev->buf_sequence++;
+       vbuf->field = V4L2_FIELD_NONE;
        vb2_buffer_done(vb, VB2_BUF_STATE_DONE);
        dev_dbg(pcdev_to_dev(pcdev), "%s dequeud buffer (buf=0x%p)\n",
                __func__, buf);
@@ -1022,6 +1026,7 @@ static int pxac_vb2_start_streaming(struct vb2_queue *vq, unsigned int count)
        dev_dbg(pcdev_to_dev(pcdev), "%s(count=%d) active=%p\n",
                __func__, count, pcdev->active);
 
+       pcdev->buf_sequence = 0;
        if (!pcdev->active)
                pxa_camera_start_capture(pcdev);