commit a1579150f5e37fb104ec0e8a25ec34e391688c20
author Hridya Valsaraju <hridya@google.com> Fri Sep 06 12:20:32 2019 -0700
committer Hridya Valsaraju <hridya@google.com> Thu Oct 03 15:05:13 2019 -0700
tree 0a1e03234588b97194be920d24b13465544b19d4
parent d64c70edb28d1cde2fc091b4547e99ea39c81985

Add libion API to check if modular heaps are being used

Bug: 140916230
Test: ./ion-unit-tests

Change-Id: Iabb050a70d9a838f2720c509df4017d6031ce1fe

libion/include/ion/ion.h

diff --git a/libion/include/ion/ion.h b/libion/include/ion/ion.h
index a60d24e..1480bd9 100644
--- a/libion/include/ion/ion.h
+++ b/libion/include/ion/ion.h
@@ -49,6 +49,7 @@
 int ion_query_get_heaps(int fd, int cnt, void* buffers);
 
 int ion_is_legacy(int fd);
+int ion_is_using_modular_heaps(int fd);
 
 __END_DECLS
 

libion/ion.c

diff --git a/libion/ion.c b/libion/ion.c
index 55979fa..5141ea8 100644
--- a/libion/ion.c
+++ b/libion/ion.c
@@ -35,6 +35,8 @@
 
 #include <log/log.h>
 
+#define ION_ABI_VERSION_MODULAR_HEAPS 2
+
 enum ion_version { ION_VERSION_UNKNOWN, ION_VERSION_MODERN, ION_VERSION_LEGACY };
 
 static atomic_int g_ion_version = ATOMIC_VAR_INIT(ION_VERSION_UNKNOWN);
@@ -75,6 +77,14 @@
     return ret;
 }
 
+int ion_is_using_modular_heaps(int fd) {
+    int ion_abi_version = 0;
+    int ret = 0;
+
+    ret = ion_ioctl(fd, ION_IOC_ABI_VERSION, &ion_abi_version);
+    return (ret == 0 && ion_abi_version >= ION_ABI_VERSION_MODULAR_HEAPS);
+}
+
 int ion_alloc(int fd, size_t len, size_t align, unsigned int heap_mask, unsigned int flags,
               ion_user_handle_t* handle) {
     int ret = 0;