summaryrefslogtreecommitdiff
path: root/camera
diff options
context:
space:
mode:
authorMansoor Aftab <maftab@codeaurora.org>2013-05-01 14:37:51 -0700
committerIliyan Malchev <malchev@google.com>2013-05-01 15:11:56 -0700
commitc6b54b7d0b3b477acaa9f4e57241be77d234a8d5 (patch)
tree97603fbe45b7cf014182bf2fb56893c25e526550 /camera
parentb00f6d05113828ff21ec73070653e1d4d7f736e1 (diff)
downloadmako-c6b54b7d0b3b477acaa9f4e57241be77d234a8d5.tar.gz
Camera: Correct the Heap ID used for preview buffer allocation
Changed the heap id usage flags used for allocating camera preview buffers. Previous use of GRALLOC_USAGE_PRIVATE_MM_HEAP was incorrect since that is reserved for secure video. Changing usage flags to use IOMMU HEAP & use SYSTEM HEAP as fallback. Change-Id: If89fd9594bdee6d4efdbc4e54e616e2a61e7b9e5
Diffstat (limited to 'camera')
-rwxr-xr-xcamera/Android.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/camera/Android.mk b/camera/Android.mk
index 3ce0d1a..d34c60c 100755
--- a/camera/Android.mk
+++ b/camera/Android.mk
@@ -33,8 +33,8 @@ ifeq ($(USE_DEVICE_SPECIFIC_CAMERA),true)
LOCAL_CFLAGS += -DCAMERA_ION_HEAP_ID=ION_CP_MM_HEAP_ID # 8660=SMI, Rest=EBI
LOCAL_CFLAGS += -DCAMERA_ZSL_ION_HEAP_ID=ION_CP_MM_HEAP_ID
ifeq ($(TARGET_BOARD_PLATFORM),msm8960)
- LOCAL_CFLAGS += -DCAMERA_GRALLOC_HEAP_ID=GRALLOC_USAGE_PRIVATE_MM_HEAP
- LOCAL_CFLAGS += -DCAMERA_GRALLOC_FALLBACK_HEAP_ID=GRALLOC_USAGE_PRIVATE_IOMMU_HEAP
+ LOCAL_CFLAGS += -DCAMERA_GRALLOC_HEAP_ID=GRALLOC_USAGE_PRIVATE_IOMMU_HEAP
+ LOCAL_CFLAGS += -DCAMERA_GRALLOC_FALLBACK_HEAP_ID=GRALLOC_USAGE_PRIVATE_SYSTEM_HEAP
LOCAL_CFLAGS += -DCAMERA_ION_FALLBACK_HEAP_ID=ION_IOMMU_HEAP_ID
LOCAL_CFLAGS += -DCAMERA_ZSL_ION_FALLBACK_HEAP_ID=ION_IOMMU_HEAP_ID
LOCAL_CFLAGS += -DCAMERA_GRALLOC_CACHING_ID=0