]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
[media] sta2x11: use monotonic timestamp
authorHans Verkuil <hverkuil@xs4all.nl>
Thu, 7 May 2015 06:22:14 +0000 (03:22 -0300)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Mon, 18 May 2015 19:27:29 +0000 (16:27 -0300)
V4L2 drivers should use MONOTONIC timestamps instead of gettimeofday, which is
affected by daylight savings time.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Federico Vaga <federico.vaga@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
drivers/media/pci/sta2x11/sta2x11_vip.c

index d384a6b0b09f58a81d6b9dd70a45f5404f14dabf..59b3a36a3639d86167736b224b8aae88d57c4e09 100644 (file)
@@ -813,7 +813,7 @@ static irqreturn_t vip_irq(int irq, struct sta2x11_vip *vip)
                /* Disable acquisition */
                reg_write(vip, DVP_CTL, reg_read(vip, DVP_CTL) & ~DVP_CTL_ENA);
                /* Remove the active buffer from the list */
-               do_gettimeofday(&vip->active->vb.v4l2_buf.timestamp);
+               v4l2_get_timestamp(&vip->active->vb.v4l2_buf.timestamp);
                vip->active->vb.v4l2_buf.sequence = vip->sequence++;
                vb2_buffer_done(&vip->active->vb, VB2_BUF_STATE_DONE);
        }
@@ -864,6 +864,7 @@ static int sta2x11_vip_init_buffer(struct sta2x11_vip *vip)
        vip->vb_vidq.buf_struct_size = sizeof(struct vip_buffer);
        vip->vb_vidq.ops = &vip_video_qops;
        vip->vb_vidq.mem_ops = &vb2_dma_contig_memops;
+       vip->vb_vidq.timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
        err = vb2_queue_init(&vip->vb_vidq);
        if (err)
                return err;