diff --git a/libgralloc/alloc_controller.cpp b/libgralloc/alloc_controller.cpp
index c6709b4..daf95d3 100644
--- a/libgralloc/alloc_controller.cpp
+++ b/libgralloc/alloc_controller.cpp
@@ -212,7 +212,11 @@ int IonController::allocate(alloc_data& data, int usage)
         ALOGW("GRALLOC_USAGE_PRIVATE_MM_HEAP \
                                 cannot be used as an insecure heap!\
                                 trying to use IOMMU instead !!");
-        ionFlags |= ION_HEAP(ION_IOMMU_HEAP_ID);
+        if (mUseTZProtection) {
+            ionFlags |= ION_HEAP(ION_CP_MM_HEAP_ID);
+        } else {
+            ionFlags |= ION_HEAP(ION_IOMMU_HEAP_ID);
+        }
     }

     if(usage & GRALLOC_USAGE_PRIVATE_CAMERA_HEAP)