aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mach-omap2/omap4_ion.c3
-rw-r--r--drivers/remoteproc/remoteproc.c4
2 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/omap4_ion.c b/arch/arm/mach-omap2/omap4_ion.c
index 7a703a2..f3900c2 100644
--- a/arch/arm/mach-omap2/omap4_ion.c
+++ b/arch/arm/mach-omap2/omap4_ion.c
@@ -117,14 +117,15 @@ void __init omap_ion_init(void)
omap4_ion_heap_nonsec_tiler_mem_size = 0;
omap4_ion_heap_tiler_mem_size = 0;
} else {
- omap4_ion_heap_secure_input_size = omap4_ion_pdata.tiler1d_size;
omap4_ion_heap_secure_output_wfdhdcp_size =
omap4_ion_pdata.secure_output_wfdhdcp_size;
omap4_ducati_heap_size = omap4_ion_pdata.ducati_heap_size;
#ifdef CONFIG_ION_OMAP_TILER_DYNAMIC_ALLOC
+ omap4_ion_heap_secure_input_size = 0;
omap4_ion_heap_nonsec_tiler_mem_size = 0;
omap4_ion_heap_tiler_mem_size = 0;
#else
+ omap4_ion_heap_secure_input_size = omap4_ion_pdata.tiler1d_size;
omap4_ion_heap_nonsec_tiler_mem_size =
omap4_ion_pdata.nonsecure_tiler2d_size;
omap4_ion_heap_tiler_mem_size = omap4_ion_pdata.tiler2d_size;
diff --git a/drivers/remoteproc/remoteproc.c b/drivers/remoteproc/remoteproc.c
index 438cd48..722a9ba 100644
--- a/drivers/remoteproc/remoteproc.c
+++ b/drivers/remoteproc/remoteproc.c
@@ -885,6 +885,10 @@ static int rproc_handle_resources(struct rproc *rproc, struct fw_resource *rsc,
}
break;
case RSC_CARVEOUT:
+#ifdef CONFIG_ION_OMAP_TILER_DYNAMIC_ALLOC
+ if (!strncmp("IPU_MEM_IOBUFS", rsc->name, 14))
+ break;
+#endif
if (!pa) {
ret = rproc_alloc_poolmem(rproc, rsc->len, &pa);
if (ret) {