diff options
| author | Jason Chen <b02280@freescale.com> | 2011-10-27 10:21:29 +0800 |
|---|---|---|
| committer | Jason Liu <r64343@freescale.com> | 2012-01-09 21:04:42 +0800 |
| commit | 122cefcf235075c2a0b2a00a0b2b1618eba62b08 (patch) | |
| tree | 87f48684d34b125595f2dce373909316e029cff5 /drivers/media | |
| parent | 5d4646f98e3615082f33955a2bc92027107f2c1e (diff) | |
ENGR00160876 videobuf: add timestamp for user point buffer
1. add timestamp for userpoint buffer
2. use pgprot_writecombine for mmap
Signed-off-by: Jason Chen <b02280@freescale.com>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/video/videobuf-core.c | 1 | ||||
| -rw-r--r-- | drivers/media/video/videobuf-dma-contig.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/video/videobuf-core.c b/drivers/media/video/videobuf-core.c index de4fa4eb8844..2149f4dbfba0 100644 --- a/drivers/media/video/videobuf-core.c +++ b/drivers/media/video/videobuf-core.c @@ -600,6 +600,7 @@ int videobuf_qbuf(struct videobuf_queue *q, struct v4l2_buffer *b) buf->baddr != b->m.userptr) q->ops->buf_release(q, buf); buf->baddr = b->m.userptr; + buf->ts = b->timestamp; break; case V4L2_MEMORY_OVERLAY: buf->boff = b->m.offset; diff --git a/drivers/media/video/videobuf-dma-contig.c b/drivers/media/video/videobuf-dma-contig.c index c47195b5b45a..af7ff78c9259 100644 --- a/drivers/media/video/videobuf-dma-contig.c +++ b/drivers/media/video/videobuf-dma-contig.c @@ -298,7 +298,7 @@ static int __videobuf_mmap_mapper(struct videobuf_queue *q, size = vma->vm_end - vma->vm_start; size = (size < mem->size) ? size : mem->size; - vma->vm_page_prot = pgprot_writethru(vma->vm_page_prot); + vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot); retval = remap_pfn_range(vma, vma->vm_start, mem->dma_handle >> PAGE_SHIFT, size, vma->vm_page_prot); |