diff options
| author | James Harper <james.harper@ejbdigital.com.au> | 2014-06-12 06:53:38 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-07-26 11:33:15 -0300 |
| commit | 7b4eeed174b71c325705ff8c53f333bc79d0ee7a (patch) | |
| tree | 3f23ad213911ab98dd30694109c6c0bcfe17afd7 /include/media | |
| parent | b601fe5688ae285693c64e833003c14acb38378a (diff) | |
| download | linux-stable-7b4eeed174b71c325705ff8c53f333bc79d0ee7a.tar.gz linux-stable-7b4eeed174b71c325705ff8c53f333bc79d0ee7a.tar.bz2 linux-stable-7b4eeed174b71c325705ff8c53f333bc79d0ee7a.zip | |
[media] vmalloc_sg: make sure all pages in vmalloc area are really DMA-ready
Patch originally written by Konrad. Rebased on current linux media tree.
Under Xen, vmalloc_32() isn't guaranteed to return pages which are really
under 4G in machine physical addresses (only in virtual pseudo-physical
addresses). To work around this, implement a vmalloc variant which
allocates each page with dma_alloc_coherent() to guarantee that each
page is suitable for the device in question.
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: James Harper <james.harper@ejbdigital.com.au>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/videobuf-dma-sg.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/media/videobuf-dma-sg.h b/include/media/videobuf-dma-sg.h index d8fb6012c10d..fb6fd4d8f4ed 100644 --- a/include/media/videobuf-dma-sg.h +++ b/include/media/videobuf-dma-sg.h @@ -53,6 +53,9 @@ struct videobuf_dmabuf { /* for kernel buffers */ void *vaddr; + struct page **vaddr_pages; + dma_addr_t *dma_addr; + struct device *dev; /* for overlay buffers (pci-pci dma) */ dma_addr_t bus_addr; |