ENGR00153762 imx6q MSL: increase DMA zone size to max 184

when we need enable 1080p 32bpp display and play a 1080p h264 clip,
it may meet memory allocation fail issue. This patch fix this issue.

Signed-off-by: Jason Chen <b02280@freescale.com>

diff --git a/arch/arm/mach-mx5/Kconfig b/arch/arm/mach-mx5/Kconfig
index d41b560ac72e24d6884fbfabbcce32e80c6070f1..ccb8e7dc46b2de6cf16693513573ffcf3aaf443e 100755 (executable)
--- a/arch/arm/mach-mx5/Kconfig
+++ b/arch/arm/mach-mx5/Kconfig
@@ -258,4 +258,12 @@ config MACH_IMX_BLUETOOTH_RFKILL
        depends on RFKILL
        ---help---
        Say Y to get the standard rfkill interface of Bluetooth
+
+config DMA_ZONE_SIZE
+        int "DMA memory zone size"
+        range 0 96
+        default 24
+        help
+          This is the size in MB for the DMA zone. The DMA zone is used for
+          dedicated memory for large contiguous video buffers
 endif

diff --git a/arch/arm/mach-mx6/Kconfig b/arch/arm/mach-mx6/Kconfig
index 604a0294d0ffacd49e4e5fd61416b5b3899bcdf4..8b716eb177e5aca3c5ca4cfdcc05df01050976ea 100644 (file)
--- a/arch/arm/mach-mx6/Kconfig
+++ b/arch/arm/mach-mx6/Kconfig
@@ -48,4 +48,11 @@ config MACH_MX6Q_SABREAUTO
 
 comment "MX6 Options:"
 
+config DMA_ZONE_SIZE
+        int "DMA memory zone size"
+        range 0 184
+        default 24
+        help
+          This is the size in MB for the DMA zone. The DMA zone is used for
+          dedicated memory for large contiguous video buffers
 endif

diff --git a/arch/arm/plat-mxc/Kconfig b/arch/arm/plat-mxc/Kconfig
index 356358ca6eca8bd00abde1e02c00d47b13564d4e..3558748ffcca8ac8c7ab1d61d65d121dc7497125 100755 (executable)
--- a/arch/arm/plat-mxc/Kconfig
+++ b/arch/arm/plat-mxc/Kconfig
@@ -144,14 +144,6 @@ config IRAM_ALLOC
         default y
        select GENERIC_ALLOCATOR
 
-config DMA_ZONE_SIZE
-        int "DMA memory zone size"
-        range 0 96
-        default 24
-        help
-          This is the size in MB for the DMA zone. The DMA zone is used for
-          dedicated memory for large contiguous video buffers
-
 config CLK_DEBUG
        bool "clock debug information export to user space"
        depends on PM_DEBUG && DEBUG_FS

diff --git a/arch/arm/plat-mxc/include/mach/memory.h b/arch/arm/plat-mxc/include/mach/memory.h
index 89015a1de5c99bce843cff1fdedefea4be599b91..e33df1969e9e660702916d9ac39f46909d7dd73c 100755 (executable)
--- a/arch/arm/plat-mxc/include/mach/memory.h
+++ b/arch/arm/plat-mxc/include/mach/memory.h
@@ -63,8 +63,10 @@
 #define CONSISTENT_DMA_SIZE SZ_4M
 #else
 
-#if defined(CONFIG_ARCH_MX5) || defined(CONFIG_ARCH_MX6)
+#if defined(CONFIG_ARCH_MX5)
 #define CONSISTENT_DMA_SIZE     (96 * SZ_1M)
+#elif defined(CONFIG_ARCH_MX6)
+#define CONSISTENT_DMA_SIZE     (184 * SZ_1M)
 #else
 #define CONSISTENT_DMA_SIZE     (32 * SZ_1M)
 #endif

diff --git a/arch/arm/plat-mxc/include/mach/mx6.h b/arch/arm/plat-mxc/include/mach/mx6.h
index f59d9a149703f9a46d25b5b58a30e145e99a6199..7ff17ad0d0c126863930c15836ee9ab919f5de07 100644 (file)
--- a/arch/arm/plat-mxc/include/mach/mx6.h
+++ b/arch/arm/plat-mxc/include/mach/mx6.h
@@ -242,7 +242,7 @@
 #define MX6Q_FEC_BASE_ADDR      ENET_BASE_ADDR
 
 /* define virtual address */
-#define PERIPBASE_VIRT 0xF4000000
+#define PERIPBASE_VIRT 0xF2000000
 #define AIPS1_BASE_ADDR_VIRT (PERIPBASE_VIRT + AIPS1_ARB_BASE_ADDR)
 #define AIPS2_BASE_ADDR_VIRT (PERIPBASE_VIRT + AIPS2_ARB_BASE_ADDR)
 #define ARM_PERIPHBASE_VIRT     (PERIPBASE_VIRT + ARM_PERIPHBASE)