diff options
Diffstat (limited to 'drivers/media/platform/vino.c')
-rw-r--r-- | drivers/media/platform/vino.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/media/platform/vino.c b/drivers/media/platform/vino.c index 70b0bf4b2900..eb5d6f955709 100644 --- a/drivers/media/platform/vino.c +++ b/drivers/media/platform/vino.c | |||
@@ -2474,8 +2474,8 @@ static irqreturn_t vino_interrupt(int irq, void *dev_id) | |||
2474 | 2474 | ||
2475 | if ((!handled_a) && (done_a || skip_a)) { | 2475 | if ((!handled_a) && (done_a || skip_a)) { |
2476 | if (!skip_a) { | 2476 | if (!skip_a) { |
2477 | do_gettimeofday(&vino_drvdata-> | 2477 | v4l2_get_timestamp( |
2478 | a.int_data.timestamp); | 2478 | &vino_drvdata->a.int_data.timestamp); |
2479 | vino_drvdata->a.int_data.frame_counter = fc_a; | 2479 | vino_drvdata->a.int_data.frame_counter = fc_a; |
2480 | } | 2480 | } |
2481 | vino_drvdata->a.int_data.skip = skip_a; | 2481 | vino_drvdata->a.int_data.skip = skip_a; |
@@ -2489,8 +2489,8 @@ static irqreturn_t vino_interrupt(int irq, void *dev_id) | |||
2489 | 2489 | ||
2490 | if ((!handled_b) && (done_b || skip_b)) { | 2490 | if ((!handled_b) && (done_b || skip_b)) { |
2491 | if (!skip_b) { | 2491 | if (!skip_b) { |
2492 | do_gettimeofday(&vino_drvdata-> | 2492 | v4l2_get_timestamp( |
2493 | b.int_data.timestamp); | 2493 | &vino_drvdata->b.int_data.timestamp); |
2494 | vino_drvdata->b.int_data.frame_counter = fc_b; | 2494 | vino_drvdata->b.int_data.frame_counter = fc_b; |
2495 | } | 2495 | } |
2496 | vino_drvdata->b.int_data.skip = skip_b; | 2496 | vino_drvdata->b.int_data.skip = skip_b; |
@@ -3410,6 +3410,9 @@ static void vino_v4l2_get_buffer_status(struct vino_channel_settings *vcs, | |||
3410 | if (fb->map_count > 0) | 3410 | if (fb->map_count > 0) |
3411 | b->flags |= V4L2_BUF_FLAG_MAPPED; | 3411 | b->flags |= V4L2_BUF_FLAG_MAPPED; |
3412 | 3412 | ||
3413 | b->flags &= ~V4L2_BUF_FLAG_TIMESTAMP_MASK; | ||
3414 | b->flags |= V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; | ||
3415 | |||
3413 | b->index = fb->id; | 3416 | b->index = fb->id; |
3414 | b->memory = (vcs->fb_queue.type == VINO_MEMORY_MMAP) ? | 3417 | b->memory = (vcs->fb_queue.type == VINO_MEMORY_MMAP) ? |
3415 | V4L2_MEMORY_MMAP : V4L2_MEMORY_USERPTR; | 3418 | V4L2_MEMORY_MMAP : V4L2_MEMORY_USERPTR; |