commit 5872040df789c9cd8d7f075a8c5d9ae8f9d452f7
author Linux Build Service Account <lnxbuild@localhost> Tue Dec 11 16:36:11 2012 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Dec 11 16:36:11 2012 -0800
tree 63e4a4818ce1043c20a98b8ce764a889ee0963f6
parent 7571da1c08b7704c0dd91dd9ce34bfe399560949
parent 37529ad4569b2ab42d5b5690b6b286da58491b3b

Merge "msm: vidc: Fallback to IOMMU heap"

drivers/media/video/msm_vidc/msm_smem.c

diff --git a/drivers/media/video/msm_vidc/msm_smem.c b/drivers/media/video/msm_vidc/msm_smem.c
index e1b73ef..eae18c4 100644
--- a/drivers/media/video/msm_vidc/msm_smem.c
+++ b/drivers/media/video/msm_vidc/msm_smem.c
@@ -134,6 +134,9 @@
 	}
 
 	heap_mask = ION_HEAP(ION_CP_MM_HEAP_ID);
+	if (!(flags & SMEM_SECURE))
+		heap_mask |= ION_HEAP(ION_IOMMU_HEAP_ID);
+
 	dprintk(VIDC_DBG, "domain: %d, partition: %d\n",
 		domain, partition);
 	hndl = ion_alloc(client->clnt, size, align, heap_mask, ionflags);