mm-video: Add NO_IOMMU flag and enable it by default for msm8660

[mikeioannina]: Add msm8660 to the build barrier

Change-Id: Ibb76e4dead9db55619dc7fc64bfd17fa96208dc9

Author: hyperb1iss

Android.mk

@@ -1,6 +1,6 @@
 ifeq ($(call my-dir),$(call project-path-for,qcom-media))
 
-ifneq ($(filter msm8960 msm7x30,$(TARGET_BOARD_PLATFORM)),)
+ifneq ($(filter msm8960 msm8660 msm7x30,$(TARGET_BOARD_PLATFORM)),)
 
 include $(call all-subdir-makefiles)
 

mm-video/vidc/vdec/Android.mk

@@ -25,6 +25,7 @@ ifeq ($(TARGET_BOARD_PLATFORM),msm8660)
 libOmxVdec-def += -DMAX_RES_1080P
 libOmxVdec-def += -DPROCESS_EXTRADATA_IN_OUTPUT_PORT
 libOmxVdec-def += -DTEST_TS_FROM_SEI
+libOmxVdec-def += -DNO_IOMMU
 endif
 ifeq ($(TARGET_BOARD_PLATFORM),msm8960)
 libOmxVdec-def += -DMAX_RES_1080P

mm-video/vidc/vdec/src/omx_vdec.cpp

@@ -3084,6 +3084,9 @@ OMX_ERRORTYPE  omx_vdec::get_parameter(OMX_IN OMX_HANDLETYPE     hComp,
                 } else {
                         DEBUG_PRINT_HIGH("get_parameter: CACHED buffers from IOMMU heap");
                         nativeBuffersUsage->nUsage = (GRALLOC_USAGE_PRIVATE_IOMMU_HEAP);
+#ifdef NO_IOMMU
+                        nativeBuffersUsage->nUsage |= GRALLOC_USAGE_PRIVATE_MM_HEAP;
+#endif
                 }
 #endif //(MAX_RES_720P)
 #else
@@ -8092,6 +8095,9 @@ int omx_vdec::alloc_map_ion_memory(OMX_U32 buffer_size,
       alloc_data->flags |= ION_SECURE;
     } else if (external_meta_buffer_iommu) {
       alloc_data->heap_mask = ION_HEAP(ION_IOMMU_HEAP_ID);
+#ifdef NO_IOMMU
+      alloc_data->heap_mask |= ION_HEAP(MEM_HEAP_ID);
+#endif
     } else {
       alloc_data->heap_mask = ION_HEAP(MEM_HEAP_ID);
       alloc_data->flags |= ION_SECURE;
@@ -8101,6 +8107,9 @@ int omx_vdec::alloc_map_ion_memory(OMX_U32 buffer_size,
     alloc_data->heap_mask = ION_HEAP(MEM_HEAP_ID);
 #else
     alloc_data->heap_mask = (ION_HEAP(ION_IOMMU_HEAP_ID));
+#ifdef NO_IOMMU
+      alloc_data->heap_mask |= ION_HEAP(MEM_HEAP_ID);
+#endif
 #endif
   }
   pthread_mutex_lock(&m_vdec_ionlock);

mm-video/vidc/venc/Android.mk

@@ -22,6 +22,7 @@ libmm-venc-def += -UOUTPUT_BUFFER_LOG
 libmm-venc-def += -USINGLE_ENCODER_INSTANCE
 ifeq ($(TARGET_BOARD_PLATFORM),msm8660)
 libmm-venc-def += -DMAX_RES_1080P
+libmm-venc-def += -DNO_IOMMU
 endif
 ifeq ($(TARGET_BOARD_PLATFORM),msm8960)
 libmm-venc-def += -DMAX_RES_1080P