libimxdmabuffer: Upgrade to version 1.1.2

* waf: update to 2.0.23
* dma-heap: Add support for uncached dma-heap memory
  imx_dma_buffer_dma_heap_allocator_new_from_fd() is
  a new function that partially deprecates the dma_heap_fd
  argument of imx_dma_buffer_dma_heap_allocator_new().
* Add sync access functions to ensure cache
  coherency when allocating cached DMA memory;
  only done by dma-heap allocator at this time
* Relax buffer mapping flags checks
* Add API functions to retrieve dma-heap / ION FDs

Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>

2 files changed, 32 insertions, 1 deletions

diff --git a/recipes-bsp/libimxdmabuffer/files/0001-g2d-Fix-typo.patch b/recipes-bsp/libimxdmabuffer/files/0001-g2d-Fix-typo.patch
new file mode 100644
index 00000000..490d3a2f
--- /dev/null
+++ b/recipes-bsp/libimxdmabuffer/files/0001-g2d-Fix-typo.patch
@@ -0,0 +1,28 @@
+From 41825b11289be251fed64470893d18b89b0dd38b Mon Sep 17 00:00:00 2001
+From: Carlos Rafael Giani <crg7475@mailbox.org>
+Date: Sun, 8 May 2022 16:25:44 +0200
+Subject: [PATCH] g2d: Fix typo
+
+Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
+
+Upstream-Status: Backport [41825b11289be251fed64470893d18b89b0dd38b]
+---
+ imxdmabuffer/imxdmabuffer_g2d_allocator.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/imxdmabuffer/imxdmabuffer_g2d_allocator.c b/imxdmabuffer/imxdmabuffer_g2d_allocator.c
+index f10a909..497dcea 100644
+--- a/imxdmabuffer/imxdmabuffer_g2d_allocator.c
++++ b/imxdmabuffer/imxdmabuffer_g2d_allocator.c
+@@ -139,7 +139,7 @@ static uint8_t* imx_dma_buffer_g2d_allocator_map(ImxDmaBufferAllocator *allocato
+         * (Other allocators perform more steps than this.) */
+        if (imx_g2d_buffer->mapping_refcount > 0)
+        {
+-               assert((imx_dwl_buffer->map_flags & flags & IMX_DMA_BUFFER_MAPPING_READWRITE_FLAG_MASK) == (flags & IMX_DMA_BUFFER_MAPPING_READWRITE_FLAG_MASK));
++               assert((imx_g2d_buffer->map_flags & flags & IMX_DMA_BUFFER_MAPPING_READWRITE_FLAG_MASK) == (flags & IMX_DMA_BUFFER_MAPPING_READWRITE_FLAG_MASK));
+                imx_g2d_buffer->mapping_refcount++;
+        }
+        else
+-- 
+2.32.0
+
diff --git a/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.0.1.bb b/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.1.2.bb
index b5ac6cd4..dd3b65da 100644
--- a/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.0.1.bb
+++ b/recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.1.2.bb
@@ -8,8 +8,9 @@ SECTION = "base"
 PV .= "+git${SRCPV}"
 
 SRCBRANCH ?= "master"
-SRCREV = "d2058aa404ee1e8e8abd552c6a637787bcdcf514"
+SRCREV = "5410b44fb0c5bbd9fb1f3ba0681e65068d8cde57"
 SRC_URI = "git://github.com/Freescale/libimxdmabuffer.git;branch=${SRCBRANCH};protocol=https \
+           file://0001-g2d-Fix-typo.patch \
            file://run-ptest \
           "
 
@@ -18,8 +19,10 @@ S = "${WORKDIR}/git"
 
 inherit pkgconfig waf use-imx-headers ptest
 
+# dma-heap allocator is unavailable because it requires kernel 5.6 or newer.
 EXTRA_OECONF = "--imx-linux-headers-path=${STAGING_INCDIR_IMX} \
                 --libdir=${libdir} \
+                --with-dma-heap-allocator=no \
                 ${PACKAGECONFIG_CONFARGS}"
 
 # If imxdpu is in use, the DPU is also used for implementing