aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorTrulan Martin <trulanm@gmail.com>2016-05-28 12:08:35 -0400
committerTrulan Martin <trulanm@gmail.com>2016-05-29 13:38:06 -0400
commita90f29b5fca09850e5f4c50cd2612eb448441fd2 (patch)
tree8560db5184dd1327acc8a242aea47774cb2ae9d2 /arch/arm
parentf5899ac868e8e65f92c5a40cd7f532df32069e44 (diff)
downloadkernel_samsung_tuna-a90f29b5fca09850e5f4c50cd2612eb448441fd2.tar.gz
kernel_samsung_tuna-a90f29b5fca09850e5f4c50cd2612eb448441fd2.tar.bz2
kernel_samsung_tuna-a90f29b5fca09850e5f4c50cd2612eb448441fd2.zip
tuna: enable CMA in defconfig
Change-Id: Ibd1164e6fa56d4a1bd8439fa18b23935171a9420
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/configs/cyanogenmod_tuna_defconfig18
-rw-r--r--arch/arm/configs/tuna_defconfig18
2 files changed, 34 insertions, 2 deletions
diff --git a/arch/arm/configs/cyanogenmod_tuna_defconfig b/arch/arm/configs/cyanogenmod_tuna_defconfig
index 7730f445ac8..6abb0790b71 100644
--- a/arch/arm/configs/cyanogenmod_tuna_defconfig
+++ b/arch/arm/configs/cyanogenmod_tuna_defconfig
@@ -150,6 +150,7 @@ CONFIG_HAVE_OPROFILE=y
# CONFIG_KPROBES is not set
CONFIG_HAVE_KPROBES=y
CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_DMA_CONTIGUOUS=y
CONFIG_USE_GENERIC_SMP_HELPERS=y
CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
CONFIG_HAVE_CLK=y
@@ -313,7 +314,7 @@ CONFIG_OMAP_REMOTEPROC_MEMPOOL_SIZE=0x0
# CONFIG_OMAP_PM_NONE is not set
# CONFIG_OMAP_PM_NOOP is not set
CONFIG_OMAP_PM=y
-# CONFIG_ION_OMAP_TILER2D_SIZE is not set
+CONFIG_ION_OMAP_TILER2D_SIZE=128
CONFIG_ION_OMAP_TILER_DYNAMIC_ALLOC=y
CONFIG_ION_OMAP_IPU_MEM_IOBUFS_SIZE=9
@@ -992,6 +993,21 @@ CONFIG_EXTRA_FIRMWARE=""
# CONFIG_DEBUG_DEVRES is not set
# CONFIG_SYS_HYPERVISOR is not set
CONFIG_SYNC=y
+# CONFIG_DMA_SHARED_BUFFER is not set
+CONFIG_CMA=y
+# CONFIG_CMA_DEBUG is not set
+# CONFIG_CMA_DEBUG_VERBOSE is not set
+
+#
+# Default contiguous memory area size:
+#
+CONFIG_CMA_SIZE_MBYTES=16
+CONFIG_CMA_SIZE_SEL_MBYTES=y
+# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
+# CONFIG_CMA_SIZE_SEL_MIN is not set
+# CONFIG_CMA_SIZE_SEL_MAX is not set
+CONFIG_CMA_ALIGNMENT=8
+CONFIG_CMA_AREAS=7
# CONFIG_SW_SYNC is not set
# CONFIG_CONNECTOR is not set
CONFIG_MTD=y
diff --git a/arch/arm/configs/tuna_defconfig b/arch/arm/configs/tuna_defconfig
index 2669e3f00ac..37195888e36 100644
--- a/arch/arm/configs/tuna_defconfig
+++ b/arch/arm/configs/tuna_defconfig
@@ -150,6 +150,7 @@ CONFIG_HAVE_OPROFILE=y
# CONFIG_KPROBES is not set
CONFIG_HAVE_KPROBES=y
CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_DMA_CONTIGUOUS=y
CONFIG_USE_GENERIC_SMP_HELPERS=y
CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
CONFIG_HAVE_CLK=y
@@ -313,7 +314,7 @@ CONFIG_OMAP_REMOTEPROC_MEMPOOL_SIZE=0x0
# CONFIG_OMAP_PM_NONE is not set
# CONFIG_OMAP_PM_NOOP is not set
CONFIG_OMAP_PM=y
-# CONFIG_ION_OMAP_TILER2D_SIZE is not set
+CONFIG_ION_OMAP_TILER2D_SIZE=128
CONFIG_ION_OMAP_TILER_DYNAMIC_ALLOC=y
CONFIG_ION_OMAP_IPU_MEM_IOBUFS_SIZE=9
@@ -992,6 +993,21 @@ CONFIG_EXTRA_FIRMWARE=""
# CONFIG_DEBUG_DEVRES is not set
# CONFIG_SYS_HYPERVISOR is not set
CONFIG_SYNC=y
+# CONFIG_DMA_SHARED_BUFFER is not set
+CONFIG_CMA=y
+# CONFIG_CMA_DEBUG is not set
+# CONFIG_CMA_DEBUG_VERBOSE is not set
+
+#
+# Default contiguous memory area size:
+#
+CONFIG_CMA_SIZE_MBYTES=16
+CONFIG_CMA_SIZE_SEL_MBYTES=y
+# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
+# CONFIG_CMA_SIZE_SEL_MIN is not set
+# CONFIG_CMA_SIZE_SEL_MAX is not set
+CONFIG_CMA_ALIGNMENT=8
+CONFIG_CMA_AREAS=7
# CONFIG_SW_SYNC is not set
# CONFIG_CONNECTOR is not set
CONFIG_MTD=y