diff options
| author | Prasanna Kumar M.R <prasanna.kumarmr@ti.com> | 2012-06-25 14:56:20 -0500 |
|---|---|---|
| committer | Ziyann <jaraidaniel@gmail.com> | 2014-11-19 21:07:07 +0100 |
| commit | 9f71d5ec3e1f0b2ac57ba218c08399e8c1e12acd (patch) | |
| tree | 1ed92aac6502769ef1d81cf617a2de15355353cd /arch/arm/mach-omap2/include/mach/omap4_ion.h | |
| parent | a2fc03c6766a7c8cf2e9c26c4e286ab445263b42 (diff) | |
| download | kernel_samsung_tuna-9f71d5ec3e1f0b2ac57ba218c08399e8c1e12acd.zip kernel_samsung_tuna-9f71d5ec3e1f0b2ac57ba218c08399e8c1e12acd.tar.gz kernel_samsung_tuna-9f71d5ec3e1f0b2ac57ba218c08399e8c1e12acd.tar.bz2 | |
omap: ion: defining a new Ion 1D heap for WFD HDCP
Conflicts:
arch/arm/mach-omap2/board-bowser.c
arch/arm/mach-omap2/board-omap4panda.c
arch/arm/mach-omap2/omap4_ion.c
Diffstat (limited to 'arch/arm/mach-omap2/include/mach/omap4_ion.h')
| -rwxr-xr-x | arch/arm/mach-omap2/include/mach/omap4_ion.h | 8 |
1 files changed, 8 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 e1d8a84..e9ba577 100755 --- a/arch/arm/mach-omap2/include/mach/omap4_ion.h +++ b/arch/arm/mach-omap2/include/mach/omap4_ion.h @@ -22,6 +22,8 @@ #define OMAP4_RAM_SIZE (omap_total_ram_size()) #define PHYS_ADDR_SMC_MEM (omap_smc_addr()) #define PHYS_ADDR_ION_HEAP_SECURE_INPUT_MEM (omap_ion_heap_secure_input_addr()) +#define PHYS_ADDR_ION_HEAP_SECURE_OUTPUT_WFDHDCP_MEM \ + (omap_ion_heap_secure_output_wfdhdcp_addr()) #define PHYS_ADDR_DUCATI_MEM (omap_ducati_heap_addr()) #define PHYS_ADDR_ION_HEAP_TILER_MEM (omap_ion_heap_tiler_mem_addr()) #define PHYS_ADDR_ION_HEAP_NONSECURE_TILER_MEM \ @@ -29,6 +31,8 @@ #define PHYS_ADDR_SMC_SIZE (omap_smc_size()) #define OMAP4_ION_HEAP_SECURE_INPUT_SIZE (omap_ion_heap_secure_input_size()) +#define OMAP4_ION_HEAP_SECURE_OUTPUT_WFDHDCP_SIZE \ + (omap_ion_heap_secure_output_wfdhdcp_size()) #define PHYS_ADDR_DUCATI_SIZE (omap_ducati_heap_size()) #define OMAP4_ION_HEAP_TILER_SIZE (omap_ion_heap_tiler_mem_size()) #define OMAP4_ION_HEAP_NONSECURE_TILER_SIZE \ @@ -63,10 +67,12 @@ void omap_ion_init(void); void omap4_register_ion(void); phys_addr_t omap_ion_heap_secure_input_addr(void); +phys_addr_t omap_ion_heap_secure_output_wfdhdcp_addr(void); phys_addr_t omap_ion_heap_tiler_mem_addr(void); phys_addr_t omap_ion_heap_nonsec_tiler_mem_addr(void); size_t omap_ion_heap_secure_input_size(void); +size_t omap_ion_heap_secure_output_wfdhdcp_size(void); size_t omap_ion_heap_tiler_mem_size(void); size_t omap_ion_heap_nonsec_tiler_mem_size(void); @@ -75,10 +81,12 @@ static inline void omap_ion_init(void) { return; } static inline void omap4_register_ion(void) { return; } phys_addr_t omap_ion_heap_secure_input_addr(void) { return 0; } +phys_addr_t omap_ion_heap_secure_output_wfdhdcp_addr(void) { return 0; } phys_addr_t omap_ion_heap_tiler_mem_addr(void) { return 0; } phys_addr_t omap_ion_heap_nonsec_tiler_mem_addr(void) { return 0; } size_t omap_ion_heap_secure_input_size(void) { return 0; } +size_t omap_ion_heap_secure_output_wfdhdcp_size(void) { return 0; } size_t omap_ion_heap_tiler_mem_size(void) { return 0; } size_t omap_ion_heap_nonsec_tiler_mem_size(void) { return 0; } #endif |