From a6188747f416f8d9eb66f5b77096dc29ac5bb361 Mon Sep 17 00:00:00 2001
From: Tom Hochstein <tom.hochstein@nxp.com>
Date: Mon, 30 Oct 2023 14:32:17 -0700
Subject: imx-gpu-viv: Upgrade 6.4.11.p1.2 -> 6.4.11.p2.0

- Added GLES3 support for 8M Mini
- Updated Vulkan support to 1.3.239
- For more details:
  https://github.com/nxp-imx/imx-manifest/blob/imx-linux-mickledore/GraphicsChangeLogv6.

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
---
 recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc                 |  3 +--
 .../imx-gpu-viv/imx-gpu-viv_6.4.11.p1.2-aarch32.bb             | 10 ----------
 .../imx-gpu-viv/imx-gpu-viv_6.4.11.p1.2-aarch64.bb             | 10 ----------
 .../imx-gpu-viv/imx-gpu-viv_6.4.11.p2.0-aarch32.bb             | 10 ++++++++++
 .../imx-gpu-viv/imx-gpu-viv_6.4.11.p2.0-aarch64.bb             | 10 ++++++++++
 5 files changed, 21 insertions(+), 22 deletions(-)
 delete mode 100644 recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p1.2-aarch32.bb
 delete mode 100644 recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p1.2-aarch64.bb
 create mode 100644 recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.0-aarch32.bb
 create mode 100644 recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.0-aarch64.bb

diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
index 64f367a41..52802e29d 100644
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
@@ -59,7 +59,6 @@ PROVIDES_OPENCL:mx8mm-nxp-bsp = ""
 
 PROVIDES_OPENGLES3               = ""
 PROVIDES_OPENGLES3:mx8-nxp-bsp   = "virtual/libgles3"
-PROVIDES_OPENGLES3:mx8mm-nxp-bsp = ""
 
 # Note: OpenVX is fully supported on i.MX 8 QuadMax and 8 QuadPlus.
 # However, only limited support is provided on other i.MX 8 machines
@@ -189,7 +188,7 @@ IMX_SOC:mx8mq-nxp-bsp  = "mx8mq"
 IMX_SOC:mx8mn-nxp-bsp  = "mx8mn"
 IMX_SOC:mx8ulp-nxp-bsp = "mx8ulp"
 
-LIBVULKAN_API_VERSION   = "1.2.182"
+LIBVULKAN_API_VERSION   = "1.3.239"
 
 do_install () {
     install -d ${D}${libdir}
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p1.2-aarch32.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p1.2-aarch32.bb
deleted file mode 100644
index 07834a3ba..000000000
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p1.2-aarch32.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require imx-gpu-viv-6.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=63a38e9f392d8813d6f1f4d0d6fbe657"
-
-IMX_SRCREV_ABBREV = "1e0c396"
-
-SRC_URI[md5sum] = "ac711ff819a31602021b7700b41c1ecc"
-SRC_URI[sha256sum] = "491ac012d691e27856769296e2334ad1b6f45e31ffe7313fcdb028c75b3b69ae"
-
-COMPATIBLE_MACHINE = "(mx6q-nxp-bsp|mx6dl-nxp-bsp|mx6sx-nxp-bsp|mx6sl-nxp-bsp|mx7ulp-nxp-bsp)"
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p1.2-aarch64.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p1.2-aarch64.bb
deleted file mode 100644
index 6201ee380..000000000
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p1.2-aarch64.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require imx-gpu-viv-6.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=63a38e9f392d8813d6f1f4d0d6fbe657"
-
-IMX_SRCREV_ABBREV = "1e0c396"
-
-SRC_URI[md5sum] = "34b1a4de2fc9fba8b15fc1f204096603"
-SRC_URI[sha256sum] = "d5904cbbe33a3c1160e9cd15c44d78df25d0dbd7b251add796673af53d3046f6"
-
-COMPATIBLE_MACHINE = "(mx8-nxp-bsp)"
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.0-aarch32.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.0-aarch32.bb
new file mode 100644
index 000000000..c43c9c2d9
--- /dev/null
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.0-aarch32.bb
@@ -0,0 +1,10 @@
+require imx-gpu-viv-6.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=db4762b09b6bda63da103963e6e081de"
+
+IMX_SRCREV_ABBREV = "173c22a"
+
+SRC_URI[md5sum] = "73f3bb663ebb6b632d2cd19b4cb48eab"
+SRC_URI[sha256sum] = "18f25c68db762953ccbf051fc3559ab8587fdcbf84e1248275f91f8bdc9853ec"
+
+COMPATIBLE_MACHINE = "(mx6q-nxp-bsp|mx6dl-nxp-bsp|mx6sx-nxp-bsp|mx6sl-nxp-bsp|mx7ulp-nxp-bsp)"
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.0-aarch64.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.0-aarch64.bb
new file mode 100644
index 000000000..bc2265969
--- /dev/null
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.0-aarch64.bb
@@ -0,0 +1,10 @@
+require imx-gpu-viv-6.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=db4762b09b6bda63da103963e6e081de"
+
+IMX_SRCREV_ABBREV = "173c22a"
+
+SRC_URI[md5sum] = "ac54634f6d9b1e20f99abd02ed433ef9"
+SRC_URI[sha256sum] = "b28828549a75cfd5d86716e3697e9f770e1cef1e90e919b22ea3b1df5de821ca"
+
+COMPATIBLE_MACHINE = "(mx8-nxp-bsp)"
-- 
cgit v1.2.3-54-g00ecf