commit bb3530c1da59ee7c300f069b34691a647c2a917c
author Song Bing <bing.song@nxp.com> Tue Jul 10 17:50:29 2018 -0700
committer Lyon Wang <lyon.wang@nxp.com> Wed Dec 19 10:50:33 2018 +0800
tree b2137b7380366778566954a875b45efcb7a33d04
parent 4b3e37f9b7d7b1c011f4878a5f274d2b2aaff899

MMFMWK-8113 [ion] Enable ion allocator based on Kernel 4.14

ion driver changed. Enable ion allocator based on Kernel 4.14.

Signed-off-by: Song Bing <bing.song@nxp.com>

gst-libs/gst/allocators/gstionmemory.c

diff --git a/gst-libs/gst/allocators/gstionmemory.c b/gst-libs/gst/allocators/gstionmemory.c
index fad53db..5e0455c 100644
--- a/gst-libs/gst/allocators/gstionmemory.c
+++ b/gst-libs/gst/allocators/gstionmemory.c
@@ -27,6 +27,9 @@
 #include <sys/mman.h>
 #include <sys/types.h>
 #include <linux/ion.h>
+#include <linux/dma-buf.h>
+#include <linux/version.h>
+
 
 #include <gst/allocators/gstdmabuf.h>
 #include "gstphysmemory.h"
@@ -72,12 +75,12 @@
 
   GST_DEBUG ("ion DMA FD: %d", fd);
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 34)
   struct ion_phys_dma_data data = {
     .phys = 0,
     .size = 0,
     .dmafd = fd,
   };
-
   struct ion_custom_data custom = {
     .cmd = ION_IOC_PHYS_DMA,
     .arg = (unsigned long)&data,
@@ -88,6 +91,15 @@
     return 0;
 
   return data.phys;
+#else
+  struct dma_buf_phys dma_phys;
+
+  ret = ioctl(fd, DMA_BUF_IOCTL_PHYS, &dma_phys);
+  if (ret < 0)
+    return 0;
+
+  return dma_phys.phys;
+#endif
 }
 
 static void gst_ion_allocator_iface_init(gpointer g_iface)
@@ -149,6 +161,7 @@
     GstAllocationParams * params)
 {
   GstIONAllocator *self = GST_ION_ALLOCATOR (allocator);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 34)
   struct ion_allocation_data allocation_data = { 0 };
   struct ion_fd_data fd_data = { 0 };
   struct ion_handle_data handle_data = { 0 };
@@ -185,6 +198,53 @@
   handle_data.handle = ion_handle;
   gst_ion_ioctl (self->fd, ION_IOC_FREE, &handle_data);
 
+#else
+  gint heapCnt = 0;
+  gint heap_mask = 0;
+  GstMemory *mem;
+  gsize ion_size;
+  gint dma_fd = -1;
+  gint ret;
+
+  struct ion_heap_query query;
+  memset(&query, 0, sizeof(query));
+  ret = gst_ion_ioctl (self->fd, ION_IOC_HEAP_QUERY, &query);
+  if (ret != 0 || query.cnt == 0) {
+    GST_ERROR ("can't query heap count");
+    return NULL;
+  }
+  heapCnt = query.cnt;
+
+  struct ion_heap_data ihd[heapCnt];
+  memset(&ihd, 0, sizeof(ihd));
+  query.cnt = heapCnt;
+  query.heaps = &ihd;
+  ret = gst_ion_ioctl (self->fd, ION_IOC_HEAP_QUERY, &query);
+  if (ret != 0) {
+    GST_ERROR ("can't get ion heaps");
+    return NULL;
+  }
+
+  for (gint i=0; i<heapCnt; i++) {
+    if (ihd[i].type == ION_HEAP_TYPE_DMA) {
+      heap_mask |=  1 << ihd[i].heap_id;
+    }
+  }
+
+  ion_size = size + params->prefix + params->padding;
+  struct ion_allocation_data data = {
+    .len = ion_size,
+    .heap_id_mask = heap_mask,
+    .flags = self->flags,
+  };
+  ret = gst_ion_ioctl (self->fd, ION_IOC_ALLOC, &data);
+  if (ret < 0) {
+    GST_ERROR ("ion allocate failed.");
+    return NULL;
+  }
+  dma_fd = data.fd;
+#endif
+
   mem = gst_dmabuf_allocator_alloc (allocator, dma_fd, size);
 
   GST_DEBUG ("ion allocated size: %" G_GSIZE_FORMAT "DMA FD: %d", ion_size,
@@ -196,8 +256,10 @@
   if (dma_fd >= 0) {
     close (dma_fd);
   }
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 34)
   handle_data.handle = ion_handle;
   gst_ion_ioctl (self->fd, ION_IOC_FREE, &handle_data);
+#endif
 
   return NULL;
 }