dmabuffer usage added to gst ducati plugins as per IPC3.x

According to IPC3.x input and output buffers need to be passed as
dmabuffer fd and all the output buffers need to be lock/unlock
before and after process call.This patch is to add support to
dmabuf fd and lock/unlock mechanism.

Signed-off-by: Chandramohan <chandramohan.c@ti.com>

4 files changed, 37 insertions, 13 deletions

diff --git a/src/gstducati.h b/src/gstducati.h
index d552c8f..e54151b 100644
--- a/src/gstducati.h
+++ b/src/gstducati.h
@@ -23,7 +23,7 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <dce.h>
+#include <libdce.h>
 #include <xdc/std.h>
 #include <ti/sdo/ce/Engine.h>
 #include <ti/sdo/ce/video3/viddec3.h>
diff --git a/src/gstducatih264dec.c b/src/gstducatih264dec.c
index eae93e9..0f506ea 100644
--- a/src/gstducatih264dec.c
+++ b/src/gstducatih264dec.c
@@ -141,11 +141,14 @@ gst_ducati_h264dec_allocate_params (GstDucatiVidDec * self, gint params_sz,
       h264dec->bo_mberror =
           omap_bo_new (self->device, nmb + SIZE_OF_CONCEALMENT_DATA,
           OMAP_BO_WC);
-      self->outBufs->descs[2].memType = XDM_MEMTYPE_BO;
+      /* XDM_MemoryType required by drm to allcoate buffer */
+      self->outBufs->descs[2].memType = XDM_MEMTYPE_RAW;
       self->outBufs->descs[2].buf =
-          (XDAS_Int8 *) omap_bo_handle (h264dec->bo_mberror);
+           (XDAS_Int8 *) omap_bo_dmabuf (h264dec->bo_mberror);
       self->outBufs->descs[2].bufSize.bytes = nmb + SIZE_OF_CONCEALMENT_DATA;
       self->params->metadataType[0] = IVIDEO_METADATAPLANE_MBINFO;
+      /* need to lock the buffer to get the page pinned */
+      dce_buf_lock(1,(size_t *) &self->outBufs->descs[2].buf);
     }
   }
 
diff --git a/src/gstducatividdec.c b/src/gstducatividdec.c
index db58afb..687b0e5 100644
--- a/src/gstducatividdec.c
+++ b/src/gstducatividdec.c
@@ -216,7 +216,8 @@ codec_create (GstDucatiVidDec * self)
       self->width * self->height, OMAP_BO_WC);
   self->input = omap_bo_map (self->input_bo);
   self->inBufs->numBufs = 1;
-  self->inBufs->descs[0].buf = (XDAS_Int8 *) omap_bo_handle (self->input_bo);
+  /* IPC requires dmabuf fd in place of bo handle */
+  self->inBufs->descs[0].buf = (XDAS_Int8 *) omap_bo_dmabuf (self->input_bo);
 
   /* Actual buffers will be set later, as they will be different for every
      frame. We allow derived classes to add their own buffers, however, so
@@ -281,6 +282,7 @@ codec_prepare_outbuf (GstDucatiVidDec * self, GstBuffer ** buf,
     gboolean force_internal)
 {
   GstDucatiBufferPriv *priv = NULL;
+  GstDmaBuf *dmabuf = NULL;
 
   if (!force_internal)
     priv = get_buffer_priv (self, *buf);
@@ -298,11 +300,19 @@ codec_prepare_outbuf (GstDucatiVidDec * self, GstBuffer ** buf,
 
   /* There are at least two buffers. Derived classes may add codec specific
      buffers (eg, debug info) after these two if they want to. */
-  self->outBufs->descs[0].memType = XDM_MEMTYPE_BO;
-  self->outBufs->descs[0].buf = (XDAS_Int8 *) omap_bo_handle (priv->bo);
+  dmabuf = gst_buffer_get_dma_buf (*buf);
+  /* XDM_MemoryType required by drm to allcoate buffer */
+  self->outBufs->descs[0].memType = XDM_MEMTYPE_RAW;
+  /* IPC requires dmabuf fd in place of bo handle */
+  self->outBufs->descs[0].buf = (XDAS_Int8 *) gst_dma_buf_get_fd (dmabuf);
   self->outBufs->descs[0].bufSize.bytes = priv->uv_offset;
-  self->outBufs->descs[1].memType = XDM_MEMTYPE_BO_OFFSET;
-  self->outBufs->descs[1].buf = (XDAS_Int8 *) priv->uv_offset;
+  self->outBufs->descs[1].memType = XDM_MEMTYPE_RAW;
+  /* For singleplaner buffer pass a single dmabuf fd for both the outBufs
+     ie: self->outBufs->descs[0].buf and self->outBufs->descs[1].buf
+     should point to a single buffer fd and need to update the
+     descs[0].bufSize.bytes with the size of luminance(Y) data
+     and descs[1].bufSize.bytes with crominance(UV) */
+  self->outBufs->descs[1].buf = (XDAS_Int8 *) self->outBufs->descs[0].buf;
   self->outBufs->descs[1].bufSize.bytes = priv->size - priv->uv_offset;
 
   return (XDAS_Int32) * buf;
@@ -325,9 +335,14 @@ static void
 codec_unlock_outbuf (GstDucatiVidDec * self, XDAS_Int32 id)
 {
   GstBuffer *buf = (GstBuffer *) id;
+  SizeT fd;
 
   if (buf) {
     GST_DEBUG_OBJECT (self, "free buffer: %d %p", id, buf);
+    /* Get dmabuf fd of the buffer to unlock */
+    fd = gst_dma_buf_get_fd(gst_buffer_get_dma_buf(buf));
+    /* Must unlock the buffer before free */
+    dce_buf_unlock(1,&fd);
     g_hash_table_remove (self->passed_in_bufs, buf);
   }
 }
@@ -1084,6 +1099,7 @@ gst_ducati_viddec_chain (GstPad * pad, GstBuffer * buf)
   GstPad *mypad = NULL;
   GstPad *peerpad = NULL;
   GstElement *peerelement = NULL;
+  SizeT fd;
 
   GstDucatiVidDec *self = GST_DUCATIVIDDEC (GST_OBJECT_PARENT (pad));
   GstClockTime ts = GST_BUFFER_TIMESTAMP (buf);
@@ -1200,6 +1216,10 @@ allocate_buffer:
    * things in case we need to renegotiate */
   self->inArgs->inputID =
       codec_prepare_outbuf (self, &outbuf, self->first_out_buffer);
+  /* Get dmabuf fd of the buffer to lock it*/
+  fd = gst_dma_buf_get_fd(gst_buffer_get_dma_buf((GstBuffer *) self->inArgs->inputID));
+  /* Must lock all the buffer passed to ducati */
+  dce_buf_lock(1,&fd);
   if (!self->inArgs->inputID) {
     GST_ERROR_OBJECT (self, "could not prepare output buffer");
     gst_buffer_unref (buf);
@@ -1233,7 +1253,8 @@ have_out_buf:
 
   self->inArgs->numBytes = self->in_size;
   self->inBufs->descs[0].bufSize.bytes = self->in_size;
-  self->inBufs->descs[0].memType = XDM_MEMTYPE_BO;
+  /* XDM_MemoryType required by drm to allcoate buffer */
+  self->inBufs->descs[0].memType = XDM_MEMTYPE_RAW;
 
   err = codec_process (self, TRUE, FALSE, &ret);
   if (err) {
diff --git a/src/gstducatividenc.c b/src/gstducatividenc.c
index 83862e3..9f810ad 100644
--- a/src/gstducatividenc.c
+++ b/src/gstducatividenc.c
@@ -611,12 +611,12 @@ have_inbuf:
   outbuf = GST_BUFFER (gst_drm_buffer_pool_get (self->output_pool, FALSE));
   priv_out = get_buffer_priv (self, outbuf, state->width, state->height);
 
-  self->inBufs->planeDesc[0].buf = (XDAS_Int8 *) omap_bo_handle (priv_in->bo);
-  self->inBufs->planeDesc[0].memType = XDM_MEMTYPE_BO;
+  self->inBufs->planeDesc[0].buf = (XDAS_Int8 *) omap_bo_dmabuf (priv_in->bo);
+  self->inBufs->planeDesc[0].memType = XDM_MEMTYPE_RAW;
   self->inBufs->planeDesc[0].bufSize.tileMem.width = state->width;
   self->inBufs->planeDesc[0].bufSize.tileMem.height = state->height;
   self->inBufs->planeDesc[1].buf = (XDAS_Int8 *) priv_in->uv_offset;
-  self->inBufs->planeDesc[1].memType = XDM_MEMTYPE_BO_OFFSET;
+  self->inBufs->planeDesc[1].memType = XDM_MEMTYPE_RAW;
   self->inBufs->planeDesc[1].bufSize.tileMem.width = state->width;
   self->inBufs->planeDesc[1].bufSize.tileMem.height = state->height / 2;
   /* setting imageRegion doesn't seem to be strictly needed if activeFrameRegion
@@ -637,7 +637,7 @@ have_inbuf:
   self->outBufs->numBufs = 1;
   self->outBufs->descs[0].buf = (XDAS_Int8 *) omap_bo_handle (priv_out->bo);
   self->outBufs->descs[0].bufSize.bytes = GST_BUFFER_SIZE (outbuf);
-  self->outBufs->descs[0].memType = XDM_MEMTYPE_BO;
+  self->outBufs->descs[0].memType = XDM_MEMTYPE_RAW;
 
   self->inArgs->inputID = GPOINTER_TO_INT (inbuf);