Commit 71460af5 authored by Linus Torvalds's avatar Linus Torvalds

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

This reverts commit 35d9f510.

Quoth Jiri Slaby:
 "It fixes mmap when IOMMU is used on x86 only, but breaks architectures
  like ARM or PPC where virt_to_phys(dma_alloc_coherent) doesn't work.
  We need there dma_mmap_coherent or similar (the trickery what
  snd_pcm_default_mmap does but in some saner way).  But this cannot be
  done at this phase."
Requested-by: default avatarJiri Slaby <jslaby@suse.cz>
Cc: Russell King - ARM Linux <linux@arm.linux.org.uk>
Cc: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
Acked-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f28c6179
...@@ -300,7 +300,7 @@ static int __videobuf_mmap_mapper(struct videobuf_queue *q, ...@@ -300,7 +300,7 @@ static int __videobuf_mmap_mapper(struct videobuf_queue *q,
vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot); vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
retval = remap_pfn_range(vma, vma->vm_start, retval = remap_pfn_range(vma, vma->vm_start,
PFN_DOWN(virt_to_phys(mem->vaddr)), mem->dma_handle >> PAGE_SHIFT,
size, vma->vm_page_prot); size, vma->vm_page_prot);
if (retval) { if (retval) {
dev_err(q->dev, "mmap: remap failed with error %d. ", retval); dev_err(q->dev, "mmap: remap failed with error %d. ", retval);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment