diff options
| author | Lajos Molnar <lajos@ti.com> | 2012-03-08 19:29:37 -0600 |
|---|---|---|
| committer | Ziyann <jaraidaniel@gmail.com> | 2014-10-01 12:59:38 +0200 |
| commit | 17276ac15e7a055bb58009423985beff518fbd17 (patch) | |
| tree | 3d20ce194097edbeff551a1c591f9bf92d169acd /arch/arm/mach-omap2/include/mach | |
| parent | 511b431b8f4f566369f8ac76a5be9991621ba9d8 (diff) | |
| download | kernel_samsung_tuna-17276ac15e7a055bb58009423985beff518fbd17.zip kernel_samsung_tuna-17276ac15e7a055bb58009423985beff518fbd17.tar.gz kernel_samsung_tuna-17276ac15e7a055bb58009423985beff518fbd17.tar.bz2 | |
OMAP4: ion: Calculate carveout addresses based on sizes
Calculate carveout addresses somewhat dynamically.
- calculate the carveout addresses based on starting or ending
address and size.
- get the tiler2D and nonsecure tiler2D sizes from a separate
platform config variable
- lay out nonsecure tiler2D carveout before tiler2D carvout.
This allows only aligning the sum of these two carveout to
2MB, instead of the size of each.
Change-Id: I38c12459e6229ab9ef2deb89c0bce712e424a2a9
Signed-off-by: Lajos Molnar <lajos@ti.com>
Signed-off-by: Dima Svetlov <svetlov@ti.com>
Conflicts:
arch/arm/mach-omap2/omap4_ion.c
Diffstat (limited to 'arch/arm/mach-omap2/include/mach')
| -rwxr-xr-x | arch/arm/mach-omap2/include/mach/omap4_ion.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/include/mach/omap4_ion.h b/arch/arm/mach-omap2/include/mach/omap4_ion.h index a2da407..ea4bb32 100755 --- a/arch/arm/mach-omap2/include/mach/omap4_ion.h +++ b/arch/arm/mach-omap2/include/mach/omap4_ion.h @@ -17,6 +17,8 @@ #ifndef _OMAP4_ION_H #define _OMAP4_ION_H +#include <linux/ion.h> + #define OMAP4_ION_HEAP_SECURE_INPUT_SIZE (SZ_1M * 90) #define OMAP4_ION_HEAP_TILER_SIZE (SZ_1M * 81) #define OMAP4_ION_HEAP_NONSECURE_TILER_SIZE (SZ_1M * 15) @@ -34,6 +36,15 @@ PHYS_ADDR_TESLA_SIZE) #endif + +struct omap_ion_platform_data { + struct ion_platform_data *ion; + u32 tiler2d_size; + u32 nonsecure_tiler2d_size; +}; + +struct omap_ion_platform_data *get_omap_ion_platform_data(void); + #ifdef CONFIG_ION_OMAP void omap_ion_init(void); void omap4_register_ion(void); |