[PATCH 2/2] PXA: add configurable consistent memory DMA size.

[Rodolfo Giometti <giometti@enneenne.com>]

From: Rodolfo Giometti <giometti@linux.it>

Signed-off-by: Rodolfo Giometti <giometti@linux.it>
---
 arch/arm/mach-pxa/include/mach/memory.h |   13 +++++++++++++
 drivers/video/Kconfig                   |   11 +++++++++++
 2 files changed, 24 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-pxa/include/mach/memory.h b/arch/arm/mach-pxa/include/mach/memory.h
index 552eb7f..247c2ef 100644
--- a/arch/arm/mach-pxa/include/mach/memory.h
+++ b/arch/arm/mach-pxa/include/mach/memory.h
@@ -49,4 +49,17 @@ void cmx270_pci_adjust_zones(int node, unsigned long *size,
 #define ISA_DMA_THRESHOLD	(PHYS_OFFSET + SZ_64M - 1)
 #endif
 
+/* Override the ARM default */
+#ifdef CONFIG_FB_PXA_CONSISTENT_DMA_SIZE
+
+#if (CONFIG_FB_PXA_CONSISTENT_DMA_SIZE == 0)
+#undef CONFIG_FB_PXA_CONSISTENT_DMA_SIZE
+#define CONFIG_FB_PXA_CONSISTENT_DMA_SIZE 2
+#endif
+
+#define CONSISTENT_DMA_SIZE \
+	(((CONFIG_FB_PXA_CONSISTENT_DMA_SIZE + 1) & ~1) * 1024 * 1024)
+
+#endif
+
 #endif
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 5d5c8c8..6720d78 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -1808,6 +1808,17 @@ config FB_PXA_OVERLAY
 	---help---
 	  Frame buffer overlay driver for PXA27x
 
+config FB_PXA_CONSISTENT_DMA_SIZE
+	int "Consistent DMA memory size (MB)"
+	depends on FB_PXA
+	range 1 14
+	default 2
+	help
+	  Increase the DMA consistent memory size according to your video
+	  memory needs, for example if you want to use overlay support.
+	  The size must be 2MB aligned.
+	  If unsure say 2.
+
 config FB_PXA_PARAMETERS
 	bool "PXA LCD command line parameters"
 	default n
-- 
1.5.4.3