upstream: [media] videobuf2-dc: Fix support for mappings without struct page in userp...
authorMarek Szyprowski <m.szyprowski@samsung.com>
Wed, 19 Jun 2013 11:56:46 +0000 (08:56 -0300)
committerChanho Park <chanho61.park@samsung.com>
Tue, 18 Nov 2014 02:55:20 +0000 (11:55 +0900)
commit3681ebbfb902b3d6af0ae2d824fdddb75e4e3769
tree3af2acbac3de0da59e7384cded035a70a37c8d49
parent90712e950908a9af49d4655e21b239eb617f215d
upstream: [media] videobuf2-dc: Fix support for mappings without struct page in userptr mode

Earlier version of dma-contig allocator in user ptr mode assumed that in
all cases DMA address equals physical address. This was just a special case.
Commit e15dab752d4c588544ccabdbe020a7cc092e23c8 introduced correct support
for converting userpage to dma address, but unfortunately it broke the
support for simple dma address = physical address for the case, when given
physical frame has no struct page associated with it (this happens if one
use for example dma_declare_coherent api or other reserved memory approach).
This commit restores support for such cases.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
[s.nawrocki@samsung.com: replaced #elsif with #elif]
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Conflicts:
drivers/media/v4l2-core/videobuf2-dma-contig.c
drivers/media/v4l2-core/videobuf2-dma-contig.c