lkml.org 
[lkml]   [2013]   [Jan]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4/9] cris: Provide dma_mmap_coherent() and dma_get_sgtable()
    Date
    cris/allmodconfig:

    drivers/media/v4l2-core/videobuf2-dma-contig.c: In function ‘vb2_dc_mmap’:
    drivers/media/v4l2-core/videobuf2-dma-contig.c:204: error: implicit declaration of function ‘dma_mmap_coherent’
    drivers/media/v4l2-core/videobuf2-dma-contig.c: In function ‘vb2_dc_get_base_sgt’:
    drivers/media/v4l2-core/videobuf2-dma-contig.c:387: error: implicit declaration of function ‘dma_get_sgtable’

    For architectures using dma_map_ops, dma_mmap_coherent() and
    dma_get_sgtable() are provided in <asm-generic/dma-mapping-common.h>.

    Cris does not use dma_map_ops, hence it should implement them as inline
    stubs using dma_common_mmap() and dma_common_get_sgtable().

    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Cc: Marek Szyprowski <m.szyprowski@samsung.com>
    Cc: linux-cris-kernel@axis.com
    ---
    arch/cris/include/asm/dma-mapping.h | 10 ++++++++++
    1 files changed, 10 insertions(+), 0 deletions(-)

    diff --git a/arch/cris/include/asm/dma-mapping.h b/arch/cris/include/asm/dma-mapping.h
    index 8588b2c..2f0f654 100644
    --- a/arch/cris/include/asm/dma-mapping.h
    +++ b/arch/cris/include/asm/dma-mapping.h
    @@ -158,5 +158,15 @@ dma_cache_sync(struct device *dev, void *vaddr, size_t size,
    {
    }

    +/* drivers/base/dma-mapping.c */
    +extern int dma_common_mmap(struct device *dev, struct vm_area_struct *vma,
    + void *cpu_addr, dma_addr_t dma_addr, size_t size);
    +extern int dma_common_get_sgtable(struct device *dev, struct sg_table *sgt,
    + void *cpu_addr, dma_addr_t dma_addr,
    + size_t size);
    +
    +#define dma_mmap_coherent(d, v, c, h, s) dma_common_mmap(d, v, c, h, s)
    +#define dma_get_sgtable(d, t, v, h, s) dma_common_get_sgtable(d, t, v, h, s)
    +

    #endif
    --
    1.7.0.4
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2013-01-13 12:21    [W:3.150 / U:0.532 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site