From 57d10799c62b110e1bd20478a421dd726a645cac Mon Sep 17 00:00:00 2001
From: Gabriel Valcazar <gabriel.valcazar@digi.com>
Date: Fri, 17 Dec 2021 13:56:02 +0100
Subject: [PATCH] hardknott: imx-dpu-g2d: sync with meta-imx
 hardknott-5.10.72-2.2.0 branch

Update to v1.9.4

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
---
 .../imx-dpu-g2d/imx-dpu-g2d_1.9.0.bb          |  8 -----
 .../imx-g2d/imx-dpu-g2d_1.9.4.bb              | 34 +++++++++++++++++++
 2 files changed, 34 insertions(+), 8 deletions(-)
 delete mode 100644 meta-digi-dey/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.9.0.bb
 create mode 100644 meta-digi-dey/recipes-graphics/imx-g2d/imx-dpu-g2d_1.9.4.bb

diff --git a/meta-digi-dey/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.9.0.bb b/meta-digi-dey/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.9.0.bb
deleted file mode 100644
index d0289b2a3..000000000
--- a/meta-digi-dey/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.9.0.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.8.12.bb
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=a632fefd1c359980434f9389833cab3a"
-
-SRC_URI[md5sum] = "22130817f758bcb844aa8495e53b24f1"
-SRC_URI[sha256sum] = "96d40b1a27c8fda1465d24ad5e402d357956f9442b4e14e816efcd60e48a9874"
-
-RDEPENDS_${PN} += "libopencl-imx"
diff --git a/meta-digi-dey/recipes-graphics/imx-g2d/imx-dpu-g2d_1.9.4.bb b/meta-digi-dey/recipes-graphics/imx-g2d/imx-dpu-g2d_1.9.4.bb
new file mode 100644
index 000000000..7b5a9e24a
--- /dev/null
+++ b/meta-digi-dey/recipes-graphics/imx-g2d/imx-dpu-g2d_1.9.4.bb
@@ -0,0 +1,34 @@
+# Copyright (C) 2016 Freescale Semiconductor
+# Copyright 2017-2021 NXP
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+DESCRIPTION = "GPU G2D library and apps for i.MX with 2D GPU and DPU"
+LICENSE = "Proprietary"
+LIC_FILES_CHKSUM = "file://COPYING;md5=e565271ec9a80ce47abbddc4bffe56fa"
+PROVIDES += "virtual/libg2d"
+
+SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true"
+SRC_URI[md5sum] = "0b7fc529b3af3ecc3087a99cca0c627d"
+SRC_URI[sha256sum] = "42d470373fd72b2e2aa8d8a226e133c61b0a88e4e5bddbfec9509f7d2764f206"
+
+inherit fsl-eula-unpack
+
+do_install () {
+    install -d ${D}${libdir}
+    install -d ${D}${includedir}
+    cp -r --no-preserve=ownership ${S}/g2d/usr/lib/*.so* ${D}${libdir}
+    cp -r --no-preserve=ownership ${S}/g2d/usr/include/* ${D}${includedir}
+    cp -r -d --no-preserve=ownership ${S}/gpu-demos/opt ${D}
+}
+
+FILES_${PN} += "/opt"
+INSANE_SKIP_${PN} += "ldflags"
+
+RDEPENDS_${PN} = "libgal-imx libdrm"
+
+# This is required to provide support for VPU Amphion HEVC tile format
+# From NXP [MGS-5547] (commit e175d6b4f78deab24d319b852998bef55cdecc99):
+# VPU Amphion HEVC tile support was added using OpenCL, so add a dependency on libopencl-imx.
+RDEPENDS_${PN} += "libopencl-imx"
+
+COMPATIBLE_MACHINE = "(imxdpu)"