Patchwork [06/12] ARM: mxc: Setup consistent dma size at boot time

login
register
mail settings
Submitter Tixy
Date Aug. 22, 2011, 11:05 a.m.
Message ID <1314011150.3604.9.camel@computer2>
Download mbox | patch
Permalink /patch/110905/
State New
Headers show

Comments

Tixy - Aug. 22, 2011, 11:05 a.m.
Hi Sascha, does the following revised patch gain receive your
Acked-by?...

From: Jon Medhurst <tixy@yxit.co.uk>

All in tree MX boards using video use memblock_* functions to get their coherent
dma space for the camera, so there is no need to increase CONSISTENT_DMA_SIZE
beyond the default and we can simply remove the defines which do this.

Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
CC: Sascha Hauer <kernel@pengutronix.de>
---
 arch/arm/plat-mxc/include/mach/memory.h |   15 ---------------
 1 files changed, 0 insertions(+), 15 deletions(-)
Sascha Hauer - Aug. 22, 2011, 11:37 a.m.
On Mon, Aug 22, 2011 at 12:05:50PM +0100, Tixy wrote:
> Hi Sascha, does the following revised patch gain receive your
> Acked-by?...
> 
> From: Jon Medhurst <tixy@yxit.co.uk>
> 
> All in tree MX boards using video use memblock_* functions to get their coherent
> dma space for the camera, so there is no need to increase CONSISTENT_DMA_SIZE
> beyond the default and we can simply remove the defines which do this.
> 
> Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
> CC: Sascha Hauer <kernel@pengutronix.de>

Acked-by: Sascha Hauer <s.hauer@pengutronix.de>

> ---
>  arch/arm/plat-mxc/include/mach/memory.h |   15 ---------------
>  1 files changed, 0 insertions(+), 15 deletions(-)
> 
> diff --git a/arch/arm/plat-mxc/include/mach/memory.h b/arch/arm/plat-mxc/include/mach/memory.h
> index 11be5cd..3ec84b9 100644
> --- a/arch/arm/plat-mxc/include/mach/memory.h
> +++ b/arch/arm/plat-mxc/include/mach/memory.h
> @@ -40,19 +40,4 @@
>  # endif
>  #endif
>  
> -#if defined(CONFIG_MX3_VIDEO)
> -/*
> - * Increase size of DMA-consistent memory region.
> - * This is required for mx3 camera driver to capture at least two QXGA frames.
> - */
> -#define CONSISTENT_DMA_SIZE SZ_8M
> -
> -#elif defined(CONFIG_MX1_VIDEO) || defined(CONFIG_VIDEO_MX2_HOSTSUPPORT)
> -/*
> - * Increase size of DMA-consistent memory region.
> - * This is required for i.MX camera driver to capture at least four VGA frames.
> - */
> -#define CONSISTENT_DMA_SIZE SZ_4M
> -#endif /* CONFIG_MX1_VIDEO || CONFIG_VIDEO_MX2_HOSTSUPPORT */
> -
>  #endif /* __ASM_ARCH_MXC_MEMORY_H__ */
> -- 
> 1.7.2.5
> 
> 
>

Patch

diff --git a/arch/arm/plat-mxc/include/mach/memory.h b/arch/arm/plat-mxc/include/mach/memory.h
index 11be5cd..3ec84b9 100644
--- a/arch/arm/plat-mxc/include/mach/memory.h
+++ b/arch/arm/plat-mxc/include/mach/memory.h
@@ -40,19 +40,4 @@ 
 # endif
 #endif
 
-#if defined(CONFIG_MX3_VIDEO)
-/*
- * Increase size of DMA-consistent memory region.
- * This is required for mx3 camera driver to capture at least two QXGA frames.
- */
-#define CONSISTENT_DMA_SIZE SZ_8M
-
-#elif defined(CONFIG_MX1_VIDEO) || defined(CONFIG_VIDEO_MX2_HOSTSUPPORT)
-/*
- * Increase size of DMA-consistent memory region.
- * This is required for i.MX camera driver to capture at least four VGA frames.
- */
-#define CONSISTENT_DMA_SIZE SZ_4M
-#endif /* CONFIG_MX1_VIDEO || CONFIG_VIDEO_MX2_HOSTSUPPORT */
-
 #endif /* __ASM_ARCH_MXC_MEMORY_H__ */