Commit 35d9f510 authored Feb 28, 2011 by Jiri Slaby Committed by Mauro Carvalho Chehab Mar 22, 2011

[media] V4L: videobuf, don't use dma addr as physical



mem->dma_handle is a dma address obtained by dma_alloc_coherent which
needn't be a physical address in presence of IOMMU, as
a hardware IOMMU can (and most likely) will return a bus address where
physical != bus address.

So ensure we are remapping (remap_pfn_range) the right page in
__videobuf_mmap_mapper by using virt_to_phys(mem->vaddr) and not
mem->dma_handle.

While at it, use PFN_DOWN instead of explicit shift.

[mchehab@redhat.com: Fix compilation breakage due to the lack of a comma]
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

parent 4093a5c4

drivers/media/video/videobuf-dma-contig.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -300,7 +300,7 @@ static int __videobuf_mmap_mapper(struct videobuf_queue *q,

		vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
		retval = remap_pfn_range(vma, vma->vm_start,
		mem->dma_handle >> PAGE_SHIFT,
		PFN_DOWN(virt_to_phys(mem->vaddr)),
		size, vma->vm_page_prot);
		if (retval) {
		dev_err(q->dev, "mmap: remap failed with error %d. ", retval);