Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07d19e3c authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

[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: default avatarAntoine Reversat <a.reversat@gmail.com>
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: default avatarSakari Ailus <sakari.ailus@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 64ae9958

drivers/media/platform/omap3isp/ispstat.c

+3 −2
Original line number Diff line number Diff line
@@ -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;

drivers/media/platform/omap3isp/ispstat.h

+1 −1
Original line number Diff line number Diff line
@@ -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;