lkml.org 
[lkml]   [2014]   [Jan]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 53/77] ARM: shmobile: armadillo: Fix coherent DMA mask
    Date
    3.12-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

    commit dcd740b645003b866d7eb30d13d34d0729cce9db upstream.

    Commit 4dcfa60071b3d23f0181f27d8519f12e37cefbb9 ("ARM: DMA-API: better
    handing of DMA masks for coherent allocations") added an additional
    check to the coherent DMA mask that results in an error when the mask is
    larger than what dma_addr_t can address.

    Set the LCDC coherent DMA mask to DMA_BIT_MASK(32) instead of ~0 to fix
    the problem.

    Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
    Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/arm/mach-shmobile/board-armadillo800eva.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/arch/arm/mach-shmobile/board-armadillo800eva.c
    +++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
    @@ -482,7 +482,7 @@ static struct platform_device lcdc0_devi
    .id = 0,
    .dev = {
    .platform_data = &lcdc0_info,
    - .coherent_dma_mask = ~0,
    + .coherent_dma_mask = DMA_BIT_MASK(32),
    },
    };

    @@ -579,7 +579,7 @@ static struct platform_device hdmi_lcdc_
    .id = 1,
    .dev = {
    .platform_data = &hdmi_lcdc_info,
    - .coherent_dma_mask = ~0,
    + .coherent_dma_mask = DMA_BIT_MASK(32),
    },
    };




    \
     
     \ /
      Last update: 2014-01-14 02:01    [W:4.022 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site