mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-20 17:41:09 +00:00
Code Issues Releases Wiki Activity

media: atomisp: Fix support for time 64 API

Browse source 
The time 64 API patchset changed the ts stamp to u64.

Update this driver accordingly.

Fixes: 15a40b27be ("media: videobuf: use u64 for the timestamp internally")
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Mauro Carvalho Chehab 2020-04-19 13:05:47 +02:00
parent e58eeb5a73
commit a9d7bbcc6b
1 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c
View file

@ -686,14 +686,6 @@ static struct videobuf_buffer *atomisp_css_frame_to_vbuf(
return NULL;
}
static void get_buf_timestamp(struct timeval *tv)
{
struct timespec ts;
ktime_get_ts(&ts);
tv->tv_sec = ts.tv_sec;
tv->tv_usec = ts.tv_nsec / NSEC_PER_USEC;
}
static void atomisp_flush_video_pipe(struct atomisp_sub_device *asd,
struct atomisp_video_pipe *pipe)
{
@ -707,7 +699,7 @@ static void atomisp_flush_video_pipe(struct atomisp_sub_device *asd,
spin_lock_irqsave(&pipe->irq_lock, irqflags);
if (pipe->capq.bufs[i]->state == VIDEOBUF_ACTIVE ||
pipe->capq.bufs[i]->state == VIDEOBUF_QUEUED) {
get_buf_timestamp(&pipe->capq.bufs[i]->ts);
pipe->capq.bufs[i]->ts = ktime_get_ns();
pipe->capq.bufs[i]->field_count =
atomic_read(&asd->sequence) << 1;
dev_dbg(asd->isp->dev, "release buffers on device %s\n",
@ -1206,7 +1198,7 @@ void atomisp_buf_done(struct atomisp_sub_device *asd, int error,
break;
}
if (vb) {
get_buf_timestamp(&vb->ts);
vb->ts = ktime_get_ns();
vb->field_count = atomic_read(&asd->sequence) << 1;
/*mark videobuffer done for dequeue*/
spin_lock_irqsave(&pipe->irq_lock, irqflags);