[media] omap3isp: Use monotonic timestamps for statistics buffers

V4L2 buffers use the monotonic clock, while statistics buffers use wall
time. This makes it difficult to correlate video frames and statistics.
Switch statistics buffers to the monotonic clock to fix this.

Reported-by: Antoine Reversat <a.reversat@gmail.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Sakari Ailus <sakari.ailus@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/platform/omap3isp/ispstat.c b/drivers/media/platform/omap3isp/ispstat.c
index b8640be692f1aef7f093b6364ddb62c15a881504..6e24895002a5ce9f3a5ac43615f408ced560b341 100644 (file)
--- a/drivers/media/platform/omap3isp/ispstat.c
+++ b/drivers/media/platform/omap3isp/ispstat.c
@@ -256,7 +256,7 @@ static int isp_stat_buf_queue(struct ispstat *stat)
        if (!stat->active_buf)
                return STAT_NO_BUF;
 
-       do_gettimeofday(&stat->active_buf->ts);
+       ktime_get_ts(&stat->active_buf->ts);
 
        stat->active_buf->buf_size = stat->buf_size;
        if (isp_stat_buf_check_magic(stat, stat->active_buf)) {
@@ -536,7 +536,8 @@ int omap3isp_stat_request_statistics(struct ispstat *stat,
                return PTR_ERR(buf);
        }
 
-       data->ts = buf->ts;
+       data->ts.tv_sec = buf->ts.tv_sec;
+       data->ts.tv_usec = buf->ts.tv_nsec / NSEC_PER_USEC;
        data->config_counter = buf->config_counter;
        data->frame_number = buf->frame_number;
        data->buf_size = buf->buf_size;

diff --git a/drivers/media/platform/omap3isp/ispstat.h b/drivers/media/platform/omap3isp/ispstat.h
index 9b7c8654dc8a4cadea05dd1ff629ad35b8ebae85..8221d0c05b6b4b177b598d83c453c743f6ecf5aa 100644 (file)
--- a/drivers/media/platform/omap3isp/ispstat.h
+++ b/drivers/media/platform/omap3isp/ispstat.h
@@ -50,7 +50,7 @@ struct ispstat_buffer {
        struct iovm_struct *iovm;
        void *virt_addr;
        dma_addr_t dma_addr;
-       struct timeval ts;
+       struct timespec ts;
        u32 buf_size;
        u32 frame_number;
        u16 config_counter;