summaryrefslogtreecommitdiffstats
path: root/camera/MemoryManager.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'camera/MemoryManager.cpp')
-rw-r--r--camera/MemoryManager.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/camera/MemoryManager.cpp b/camera/MemoryManager.cpp
index 8d40b76..b684203 100644
--- a/camera/MemoryManager.cpp
+++ b/camera/MemoryManager.cpp
@@ -91,8 +91,13 @@ CameraBuffer* MemoryManager::allocateBufferList(int width, int height, const cha
///1D buffers
for (int i = 0; i < numBufs; i++) {
unsigned char *data;
+#ifdef USE_LIBION_TI
int ret = ion_alloc(mIonFd, size, 0, 1 << ION_HEAP_TYPE_CARVEOUT,
&handle);
+#else
+ int ret = ion_alloc(mIonFd, size, 0, 1 << ION_HEAP_TYPE_CARVEOUT, 0,
+ &handle);
+#endif
if((ret < 0) || ((int)handle == -ENOMEM)) {
ret = ion_alloc_tiler(mIonFd, (size_t)size, 1, TILER_PIXEL_FMT_PAGE,
OMAP_ION_HEAP_TILER_MASK, &handle, &stride);