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

Commit 8e6057b5 authored by Sakari Ailus's avatar Sakari Ailus Committed by Mauro Carvalho Chehab
Browse files

[media] v4l: Convert drivers to use monotonic timestamps 



Convert drivers using wall clock time (CLOCK_REALTIME) to timestamp from the
monotonic timer (CLOCK_MONOTONIC).

Signed-off-by: default avatarSakari Ailus <sakari.ailus@iki.fi>
Acked-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent abd23295

drivers/media/common/saa7146/saa7146_fops.c

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ void saa7146_buffer_finish(struct saa7146_dev *dev, 
	}



	q->curr->vb.state = state;

	do_gettimeofday(&q->curr->vb.ts);

	v4l2_get_timestamp(&q->curr->vb.ts);

	wake_up(&q->curr->vb.done);



	q->curr = NULL;

drivers/media/pci/bt8xx/bttv-driver.c

+3 −3
Original line number Diff line number Diff line
@@ -3835,7 +3835,7 @@ bttv_irq_wakeup_video(struct bttv *btv, struct bttv_buffer_set *wakeup, 
{

	struct timeval ts;



	do_gettimeofday(&ts);

	v4l2_get_timestamp(&ts);



	if (wakeup->top == wakeup->bottom) {

		if (NULL != wakeup->top && curr->top != wakeup->top) {
@@ -3878,7 +3878,7 @@ bttv_irq_wakeup_vbi(struct bttv *btv, struct bttv_buffer *wakeup, 
	if (NULL == wakeup)

		return;



	do_gettimeofday(&ts);

	v4l2_get_timestamp(&ts);

	wakeup->vb.ts = ts;

	wakeup->vb.field_count = btv->field_count;

	wakeup->vb.state = state;
@@ -3949,7 +3949,7 @@ bttv_irq_wakeup_top(struct bttv *btv) 
	btv->curr.top = NULL;

	bttv_risc_hook(btv, RISC_SLOT_O_FIELD, NULL, 0);



	do_gettimeofday(&wakeup->vb.ts);

	v4l2_get_timestamp(&wakeup->vb.ts);

	wakeup->vb.field_count = btv->field_count;

	wakeup->vb.state = VIDEOBUF_DONE;

	wake_up(&wakeup->vb.done);

drivers/media/pci/cx23885/cx23885-core.c

+1 −1
Original line number Diff line number Diff line
@@ -439,7 +439,7 @@ void cx23885_wakeup(struct cx23885_tsport *port, 
		if ((s16) (count - buf->count) < 0)

			break;



		do_gettimeofday(&buf->vb.ts);

		v4l2_get_timestamp(&buf->vb.ts);

		dprintk(2, "[%p/%d] wakeup reg=%d buf=%d\n", buf, buf->vb.i,

			count, buf->count);

		buf->vb.state = VIDEOBUF_DONE;

drivers/media/pci/cx23885/cx23885-video.c

+1 −1
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ void cx23885_video_wakeup(struct cx23885_dev *dev, 
		if ((s16) (count - buf->count) < 0)

			break;



		do_gettimeofday(&buf->vb.ts);

		v4l2_get_timestamp(&buf->vb.ts);

		dprintk(2, "[%p/%d] wakeup reg=%d buf=%d\n", buf, buf->vb.i,

			count, buf->count);

		buf->vb.state = VIDEOBUF_DONE;

drivers/media/pci/cx25821/cx25821-video.c

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ void cx25821_video_wakeup(struct cx25821_dev *dev, struct cx25821_dmaqueue *q, 
		if ((s16) (count - buf->count) < 0)

			break;



		do_gettimeofday(&buf->vb.ts);

		v4l2_get_timestamp(&buf->vb.ts);

		buf->vb.state = VIDEOBUF_DONE;

		list_del(&buf->vb.queue);

		wake_up(&buf->vb.done);