aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-omap
diff options
context:
space:
mode:
authorKyle Repinski <repinski23@gmail.com>2014-10-14 20:41:00 -0500
committerZiyann <jaraidaniel@gmail.com>2014-11-19 21:16:28 +0100
commitd6633d24173ca2b7f3130557a20a8cf093bf38b4 (patch)
tree252727d02dc65622269e9cfca928f6c9b092784a /arch/arm/plat-omap
parent52d47d88e7ea59f7b2a5eeb6ed7aa3bdbd05621c (diff)
downloadkernel_samsung_tuna-d6633d24173ca2b7f3130557a20a8cf093bf38b4.zip
kernel_samsung_tuna-d6633d24173ca2b7f3130557a20a8cf093bf38b4.tar.gz
kernel_samsung_tuna-d6633d24173ca2b7f3130557a20a8cf093bf38b4.tar.bz2
ion: omap: Allow specifying a custom 2d tiler size.
128MB is generally excessive, so let's allow an easy way to tweak it.
Diffstat (limited to 'arch/arm/plat-omap')
-rw-r--r--arch/arm/plat-omap/Kconfig6
-rw-r--r--arch/arm/plat-omap/android-display.c4
2 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
index 6bfd9a6..1d374bb 100644
--- a/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@ -304,6 +304,12 @@ config OMAP_PM
bool "OMAP PM layer implementation"
endchoice
+config ION_OMAP_TILER2D_SIZE
+ int "Carveout size for tiler 2d, default 128M."
+ range 0 1024
+ depends on ION_OMAP
+ default 128
+
endmenu
endif
diff --git a/arch/arm/plat-omap/android-display.c b/arch/arm/plat-omap/android-display.c
index 1735858..c044b59 100644
--- a/arch/arm/plat-omap/android-display.c
+++ b/arch/arm/plat-omap/android-display.c
@@ -221,7 +221,11 @@ static void set_ion_carveouts(struct sgx_omaplfb_config *sgx_config,
/* actual pages used is the same */
ion->nonsecure_tiler2d_size = alloc_pages * PAGE_SIZE * num_buffers;
+#ifdef CONFIG_ION_OMAP_TILER2D_SIZE
+ ion->tiler2d_size = SZ_1M * CONFIG_ION_OMAP_TILER2D_SIZE;
+#else
ion->tiler2d_size = SZ_128M;
+#endif
/* min pages used from TILER2D container */
alloc_pages = tiler_backpages(fmt,