evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

arm/imx: choose sane CONSISTENT_DMA_SIZE if video is enabled for both mx1 and mx3

Browse source 
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
This commit is contained in:
Uwe Kleine-König 2010-02-17 21:05:27 +01:00
parent abf6163288
commit 8e3a6e7fa7
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
arch/arm/plat-mxc/include/mach/memory.h
View file

@ -34,7 +34,14 @@
# endif # endif
#endif #endif
#if defined(CONFIG_MX1_VIDEO) #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)
/* /*
* Increase size of DMA-consistent memory region. * Increase size of DMA-consistent memory region.
* This is required for i.MX camera driver to capture at least four VGA frames. * This is required for i.MX camera driver to capture at least four VGA frames.
@ -42,12 +49,4 @@
#define CONSISTENT_DMA_SIZE SZ_4M #define CONSISTENT_DMA_SIZE SZ_4M
#endif /* CONFIG_MX1_VIDEO */ #endif /* CONFIG_MX1_VIDEO */
#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
#endif /* CONFIG_MX3_VIDEO */
#endif /* __ASM_ARCH_MXC_MEMORY_H__ */ #endif /* __ASM_ARCH_MXC_MEMORY_H__ */