From fc287f98d9590354e2d83614ad7452608d7b7c73 Mon Sep 17 00:00:00 2001
From: Valentin Jec <valentin.jec@nxp.com>
Date: Fri, 25 Oct 2024 13:48:21 +0300
Subject: Upgrade BSP to LF6.6.36_2.1.0

spir: Update downgrade spir: 1.3.261.1.imx -> 1.3.275.0.imx

vulkan: Update downgrade vulkan: 1.3.261.1.imx -> 1.3.275.0.imx

vulkan-loader_1.3.261.1.imx.bbappend: Upgrade vulkan-loader: 1.3.261.1.imx -> 1.3.275.0.imx

Add patch for wsi layer

imx-base.inc: Update `PREFFERED_VERSION` for vulkan and spir

Signed-off-by: Valentin Jec <valentin.jec@nxp.com>
---
 conf/machine/include/imx-base.inc                  | 12 ++---
 .../spir/spirv-headers_1.3.261.1.imx.bb            | 19 --------
 .../spir/spirv-headers_1.3.275.0.imx.bb            | 20 +++++++++
 .../spir/spirv-tools_1.3.261.1.imx.bb              | 46 -------------------
 .../spir/spirv-tools_1.3.275.0.imx.bb              | 47 +++++++++++++++++++
 .../vulkan/vulkan-headers_1.3.261.1.imx.bb         | 27 -----------
 .../vulkan/vulkan-headers_1.3.275.0.imx.bb         | 28 ++++++++++++
 .../vulkan/vulkan-loader_1.3.261.1.imx.bb          | 42 -----------------
 .../vulkan/vulkan-loader_1.3.275.0.imx.bb          | 43 ++++++++++++++++++
 .../vulkan/vulkan-tools_1.3.261.1.imx.bb           | 36 ---------------
 .../vulkan/vulkan-tools_1.3.275.0.imx.bb           | 37 +++++++++++++++
 .../vulkan-validation-layers_1.3.261.1.imx.bb      | 48 --------------------
 .../vulkan-validation-layers_1.3.275.0.imx.bb      | 49 ++++++++++++++++++++
 ...69-change-mali-wsi-layer-activating-order.patch | 52 ++++++++++++++++++++++
 .../vulkan/vulkan-loader_1.3.261.1.imx.bbappend    |  9 ----
 .../vulkan/vulkan-loader_1.3.275.0.imx.bbappend    | 15 +++++++
 16 files changed, 297 insertions(+), 233 deletions(-)
 delete mode 100644 recipes-downgrade/spir/spirv-headers_1.3.261.1.imx.bb
 create mode 100644 recipes-downgrade/spir/spirv-headers_1.3.275.0.imx.bb
 delete mode 100644 recipes-downgrade/spir/spirv-tools_1.3.261.1.imx.bb
 create mode 100644 recipes-downgrade/spir/spirv-tools_1.3.275.0.imx.bb
 delete mode 100644 recipes-downgrade/vulkan/vulkan-headers_1.3.261.1.imx.bb
 create mode 100644 recipes-downgrade/vulkan/vulkan-headers_1.3.275.0.imx.bb
 delete mode 100644 recipes-downgrade/vulkan/vulkan-loader_1.3.261.1.imx.bb
 create mode 100644 recipes-downgrade/vulkan/vulkan-loader_1.3.275.0.imx.bb
 delete mode 100644 recipes-downgrade/vulkan/vulkan-tools_1.3.261.1.imx.bb
 create mode 100644 recipes-downgrade/vulkan/vulkan-tools_1.3.275.0.imx.bb
 delete mode 100644 recipes-downgrade/vulkan/vulkan-validation-layers_1.3.261.1.imx.bb
 create mode 100644 recipes-downgrade/vulkan/vulkan-validation-layers_1.3.275.0.imx.bb
 create mode 100644 recipes-graphics/vulkan/vulkan-loader/0001-LF-11869-change-mali-wsi-layer-activating-order.patch
 delete mode 100644 recipes-graphics/vulkan/vulkan-loader_1.3.261.1.imx.bbappend
 create mode 100644 recipes-graphics/vulkan/vulkan-loader_1.3.275.0.imx.bbappend

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 9d06b4649..5fa502444 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -587,12 +587,12 @@ PREFERRED_VERSION_xwayland:imx-nxp-bsp ??= "23.1.1.imx"
 # Use i.MX libdrm Version
 PREFERRED_VERSION_libdrm:imx-nxp-bsp ??= "2.4.116.imx"
 
-PREFERRED_VERSION_spirv-headers:imxvulkan            ??= "1.3.261.1.imx"
-PREFERRED_VERSION_spirv-tools:imxvulkan              ??= "1.3.261.1.imx"
-PREFERRED_VERSION_vulkan-headers:imxvulkan           ??= "1.3.261.1.imx"
-PREFERRED_VERSION_vulkan-loader:imxvulkan            ??= "1.3.261.1.imx"
-PREFERRED_VERSION_vulkan-tools:imxvulkan             ??= "1.3.261.1.imx"
-PREFERRED_VERSION_vulkan-validation-layers:imxvulkan ??= "1.3.261.1.imx"
+PREFERRED_VERSION_spirv-headers:imxvulkan            ??= "1.3.275.0.imx"
+PREFERRED_VERSION_spirv-tools:imxvulkan              ??= "1.3.275.0.imx"
+PREFERRED_VERSION_vulkan-headers:imxvulkan           ??= "1.3.275.0.imx"
+PREFERRED_VERSION_vulkan-loader:imxvulkan            ??= "1.3.275.0.imx"
+PREFERRED_VERSION_vulkan-tools:imxvulkan             ??= "1.3.275.0.imx"
+PREFERRED_VERSION_vulkan-validation-layers:imxvulkan ??= "1.3.275.0.imx"
 
 # Use i.MX optee Version
 PREFERRED_VERSION_optee-os:mx8-nxp-bsp     ??= "4.2.0.imx"
diff --git a/recipes-downgrade/spir/spirv-headers_1.3.261.1.imx.bb b/recipes-downgrade/spir/spirv-headers_1.3.261.1.imx.bb
deleted file mode 100644
index 945f0879f..000000000
--- a/recipes-downgrade/spir/spirv-headers_1.3.261.1.imx.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-SUMMARY = "Machine-readable files for the SPIR-V Registry"
-SECTION = "graphics"
-HOMEPAGE = "https://www.khronos.org/registry/spir-v"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=c938b85bceb8fb26c1a807f28a52ae2d"
-
-SRCREV = "124a9665e464ef98b8b718d572d5f329311061eb"
-SRC_URI = "git://github.com/KhronosGroup/SPIRV-Headers;protocol=https;branch=main"
-PE = "1"
-# These recipes need to be updated in lockstep with each other:
-# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools
-# The tags versions should always be sdk-x.y.z, as this is what
-# upstream considers a release.
-UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
-S = "${WORKDIR}/git"
-
-inherit cmake
-
-BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-downgrade/spir/spirv-headers_1.3.275.0.imx.bb b/recipes-downgrade/spir/spirv-headers_1.3.275.0.imx.bb
new file mode 100644
index 000000000..598a8fc20
--- /dev/null
+++ b/recipes-downgrade/spir/spirv-headers_1.3.275.0.imx.bb
@@ -0,0 +1,20 @@
+SUMMARY = "Machine-readable files for the SPIR-V Registry"
+SECTION = "graphics"
+HOMEPAGE = "https://www.khronos.org/registry/spir-v"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=c938b85bceb8fb26c1a807f28a52ae2d"
+
+SRCREV = "1c6bb2743599e6eb6f37b2969acc0aef812e32e3"
+SRC_URI = "git://github.com/KhronosGroup/SPIRV-Headers;protocol=https;branch=main"
+PE = "1"
+# These recipes need to be updated in lockstep with each other:
+# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools
+# vulkan-validation-layers, vulkan-utility-libraries.
+# The tags versions should always be sdk-x.y.z, as this is what
+# upstream considers a release.
+UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
+S = "${WORKDIR}/git"
+
+inherit cmake
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-downgrade/spir/spirv-tools_1.3.261.1.imx.bb b/recipes-downgrade/spir/spirv-tools_1.3.261.1.imx.bb
deleted file mode 100644
index 690428829..000000000
--- a/recipes-downgrade/spir/spirv-tools_1.3.261.1.imx.bb
+++ /dev/null
@@ -1,46 +0,0 @@
-SUMMARY  = "The SPIR-V Tools project provides an API and commands for \
-processing SPIR-V modules"
-DESCRIPTION = "The project includes an assembler, binary module parser, \
-disassembler, validator, and optimizer for SPIR-V."
-HOMEPAGE = "https://github.com/KhronosGroup/SPIRV-Tools"
-SECTION = "graphics"
-LICENSE  = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-SRCREV = "e553b884c7c9febaa4e52334f683641fb5f196a0"
-SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=main;protocol=https"
-PE = "1"
-# These recipes need to be updated in lockstep with each other:
-# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools
-# The tags versions should always be sdk-x.y.z, as this is what
-# upstream considers a release.
-UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
-S = "${WORKDIR}/git"
-
-inherit cmake
-
-DEPENDS = "spirv-headers"
-
-EXTRA_OECMAKE += "\
-    -DSPIRV-Headers_SOURCE_DIR=${STAGING_EXECPREFIXDIR} \
-    -DSPIRV_TOOLS_BUILD_STATIC=OFF \
-    -DBUILD_SHARED_LIBS=ON \
-    -DSPIRV_SKIP_TESTS=ON \
-"
-
-do_install:append:class-target() {
-    # Properly set _IMPORT_PREFIX in INTERFACE_LINK_LIBRARIES so that dependent
-    # tools can find the right library
-    sed -i ${D}${libdir}/cmake/SPIRV-Tools/SPIRV-ToolsTarget.cmake \
-        -e 's:INTERFACE_LINK_LIBRARIES.*$:INTERFACE_LINK_LIBRARIES "\$\{_IMPORT_PREFIX\}/${baselib}":'
-}
-
-# all the libraries are unversioned, so don't pack it on PN-dev
-SOLIBS = ".so"
-FILES_SOLIBSDEV = ""
-
-PACKAGES =+ "${PN}-lesspipe"
-FILES:${PN}-lesspipe = "${base_bindir}/spirv-lesspipe.sh"
-RDEPENDS:${PN}-lesspipe += "${PN} bash"
-
-BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-downgrade/spir/spirv-tools_1.3.275.0.imx.bb b/recipes-downgrade/spir/spirv-tools_1.3.275.0.imx.bb
new file mode 100644
index 000000000..05c6de1b5
--- /dev/null
+++ b/recipes-downgrade/spir/spirv-tools_1.3.275.0.imx.bb
@@ -0,0 +1,47 @@
+SUMMARY  = "The SPIR-V Tools project provides an API and commands for \
+processing SPIR-V modules"
+DESCRIPTION = "The project includes an assembler, binary module parser, \
+disassembler, validator, and optimizer for SPIR-V."
+HOMEPAGE = "https://github.com/KhronosGroup/SPIRV-Tools"
+SECTION = "graphics"
+LICENSE  = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
+
+SRCREV = "f0cc85efdbbe3a46eae90e0f915dc1509836d0fc"
+SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=main;protocol=https"
+PE = "1"
+# These recipes need to be updated in lockstep with each other:
+# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools
+# vulkan-validation-layers, vulkan-utility-libraries.
+# The tags versions should always be sdk-x.y.z, as this is what
+# upstream considers a release.
+UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
+S = "${WORKDIR}/git"
+
+inherit cmake
+
+DEPENDS = "spirv-headers"
+
+EXTRA_OECMAKE += "\
+    -DSPIRV-Headers_SOURCE_DIR=${STAGING_EXECPREFIXDIR} \
+    -DSPIRV_TOOLS_BUILD_STATIC=OFF \
+    -DBUILD_SHARED_LIBS=ON \
+    -DSPIRV_SKIP_TESTS=ON \
+"
+
+do_install:append:class-target() {
+    # Properly set _IMPORT_PREFIX in INTERFACE_LINK_LIBRARIES so that dependent
+    # tools can find the right library
+    sed -i ${D}${libdir}/cmake/SPIRV-Tools/SPIRV-ToolsTarget.cmake \
+        -e 's:INTERFACE_LINK_LIBRARIES.*$:INTERFACE_LINK_LIBRARIES "\$\{_IMPORT_PREFIX\}/${baselib}":'
+}
+
+# all the libraries are unversioned, so don't pack it on PN-dev
+SOLIBS = ".so"
+FILES_SOLIBSDEV = ""
+
+PACKAGES =+ "${PN}-lesspipe"
+FILES:${PN}-lesspipe = "${base_bindir}/spirv-lesspipe.sh"
+RDEPENDS:${PN}-lesspipe += "${PN} bash"
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-downgrade/vulkan/vulkan-headers_1.3.261.1.imx.bb b/recipes-downgrade/vulkan/vulkan-headers_1.3.261.1.imx.bb
deleted file mode 100644
index 01eb14b9f..000000000
--- a/recipes-downgrade/vulkan/vulkan-headers_1.3.261.1.imx.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-SUMMARY = "Vulkan Header files and API registry"
-DESCRIPTION = "Vulkan is a 3D graphics and compute API providing cross-platform access \
-to modern GPUs with low overhead and targeting realtime graphics applications such as \
-games and interactive media. This package contains the development headers \
-for packages wanting to make use of Vulkan."
-HOMEPAGE = "https://www.khronos.org/vulkan/"
-BUGTRACKER = "https://github.com/KhronosGroup/Vulkan-Headers"
-SECTION = "libs"
-
-LICENSE = "Apache-2.0 & MIT"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=1bc355d8c4196f774c8b87ed1a8dd625"
-SRC_URI = "git://github.com/KhronosGroup/Vulkan-Headers.git;branch=main;protocol=https"
-
-SRCREV = "85c2334e92e215cce34e8e0ed8b2dce4700f4a50"
-
-S = "${WORKDIR}/git"
-
-inherit cmake
-
-FILES:${PN} += "${datadir}/vulkan"
-RDEPENDS:${PN} += "python3-core"
-
-# These recipes need to be updated in lockstep with each other:
-# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools
-# The tags versions should always be sdk-x.y.z, as this is what
-# upstream considers a release.
-UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
diff --git a/recipes-downgrade/vulkan/vulkan-headers_1.3.275.0.imx.bb b/recipes-downgrade/vulkan/vulkan-headers_1.3.275.0.imx.bb
new file mode 100644
index 000000000..aacec8cab
--- /dev/null
+++ b/recipes-downgrade/vulkan/vulkan-headers_1.3.275.0.imx.bb
@@ -0,0 +1,28 @@
+SUMMARY = "Vulkan Header files and API registry"
+DESCRIPTION = "Vulkan is a 3D graphics and compute API providing cross-platform access \
+to modern GPUs with low overhead and targeting realtime graphics applications such as \
+games and interactive media. This package contains the development headers \
+for packages wanting to make use of Vulkan."
+HOMEPAGE = "https://www.khronos.org/vulkan/"
+BUGTRACKER = "https://github.com/KhronosGroup/Vulkan-Headers"
+SECTION = "libs"
+
+LICENSE = "Apache-2.0 & MIT"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=1bc355d8c4196f774c8b87ed1a8dd625"
+SRC_URI = "git://github.com/KhronosGroup/Vulkan-Headers.git;branch=main;protocol=https"
+
+SRCREV = "217e93c664ec6704ec2d8c36fa116c1a4a1e2d40"
+
+S = "${WORKDIR}/git"
+
+inherit cmake
+
+FILES:${PN} += "${datadir}/vulkan"
+RDEPENDS:${PN} += "python3-core"
+
+# These recipes need to be updated in lockstep with each other:
+# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools,
+# vulkan-validation-layers, vulkan-utility-libraries.
+# The tags versions should always be sdk-x.y.z, as this is what
+# upstream considers a release.
+UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
diff --git a/recipes-downgrade/vulkan/vulkan-loader_1.3.261.1.imx.bb b/recipes-downgrade/vulkan/vulkan-loader_1.3.261.1.imx.bb
deleted file mode 100644
index 01cbeafa3..000000000
--- a/recipes-downgrade/vulkan/vulkan-loader_1.3.261.1.imx.bb
+++ /dev/null
@@ -1,42 +0,0 @@
-SUMMARY = "3D graphics and compute API common loader"
-DESCRIPTION = "Vulkan is a new generation graphics and compute API \
-that provides efficient access to modern GPUs. These packages \
-provide only the common vendor-agnostic library loader, headers and \
-the vulkaninfo utility."
-HOMEPAGE = "https://www.khronos.org/vulkan/"
-BUGTRACKER = "https://github.com/KhronosGroup/Vulkan-Loader"
-SECTION = "libs"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7dbefed23242760aa3475ee42801c5ac"
-SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git;branch=main;protocol=https"
-SRCREV = "afdd025ead2b63b2c73d900ab128a2d3b512cdf0"
-
-S = "${WORKDIR}/git"
-
-REQUIRED_DISTRO_FEATURES = "vulkan"
-
-inherit cmake features_check pkgconfig
-
-DEPENDS += "vulkan-headers"
-
-EXTRA_OECMAKE = "\
-                 -DBUILD_TESTS=OFF \
-                 -DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python3 \
-                 -DASSEMBLER_WORKS=FALSE \
-                 -DVulkanHeaders_INCLUDE_DIR=${STAGING_INCDIR} \
-                 -DVulkanRegistry_DIR=${RECIPE_SYSROOT}/${datadir} \
-                 "
-
-PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)}"
-
-PACKAGECONFIG[x11] = "-DBUILD_WSI_XLIB_SUPPORT=ON -DBUILD_WSI_XCB_SUPPORT=ON, -DBUILD_WSI_XLIB_SUPPORT=OFF -DBUILD_WSI_XCB_SUPPORT=OFF, libxcb libx11 libxrandr"
-PACKAGECONFIG[wayland] = "-DBUILD_WSI_WAYLAND_SUPPORT=ON, -DBUILD_WSI_WAYLAND_SUPPORT=OFF, wayland"
-
-RRECOMMENDS:${PN} = "mesa-vulkan-drivers"
-
-# These recipes need to be updated in lockstep with each other:
-# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools
-# The tags versions should always be sdk-x.y.z, as this is what
-# upstream considers a release.
-UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
diff --git a/recipes-downgrade/vulkan/vulkan-loader_1.3.275.0.imx.bb b/recipes-downgrade/vulkan/vulkan-loader_1.3.275.0.imx.bb
new file mode 100644
index 000000000..7caed6720
--- /dev/null
+++ b/recipes-downgrade/vulkan/vulkan-loader_1.3.275.0.imx.bb
@@ -0,0 +1,43 @@
+SUMMARY = "3D graphics and compute API common loader"
+DESCRIPTION = "Vulkan is a new generation graphics and compute API \
+that provides efficient access to modern GPUs. These packages \
+provide only the common vendor-agnostic library loader, headers and \
+the vulkaninfo utility."
+HOMEPAGE = "https://www.khronos.org/vulkan/"
+BUGTRACKER = "https://github.com/KhronosGroup/Vulkan-Loader"
+SECTION = "libs"
+
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7dbefed23242760aa3475ee42801c5ac"
+SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git;branch=vulkan-sdk-1.3.275;protocol=https"
+SRCREV = "00893b9a03e526aec2c5bf487521d16dfa435229"
+
+S = "${WORKDIR}/git"
+
+REQUIRED_DISTRO_FEATURES = "vulkan"
+
+inherit cmake features_check pkgconfig
+
+DEPENDS += "vulkan-headers"
+
+EXTRA_OECMAKE = "\
+                 -DBUILD_TESTS=OFF \
+                 -DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python3 \
+                 -DASSEMBLER_WORKS=FALSE \
+                 -DVulkanHeaders_INCLUDE_DIR=${STAGING_INCDIR} \
+                 -DVulkanRegistry_DIR=${RECIPE_SYSROOT}/${datadir} \
+                 "
+
+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)}"
+
+PACKAGECONFIG[x11] = "-DBUILD_WSI_XLIB_SUPPORT=ON -DBUILD_WSI_XCB_SUPPORT=ON, -DBUILD_WSI_XLIB_SUPPORT=OFF -DBUILD_WSI_XCB_SUPPORT=OFF, libxcb libx11 libxrandr"
+PACKAGECONFIG[wayland] = "-DBUILD_WSI_WAYLAND_SUPPORT=ON, -DBUILD_WSI_WAYLAND_SUPPORT=OFF, wayland"
+
+RRECOMMENDS:${PN} = "mesa-vulkan-drivers"
+
+# These recipes need to be updated in lockstep with each other:
+# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools,
+# vulkan-validation-layers, vulkan-utility-libraries.
+# The tags versions should always be sdk-x.y.z, as this is what
+# upstream considers a release.
+UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
diff --git a/recipes-downgrade/vulkan/vulkan-tools_1.3.261.1.imx.bb b/recipes-downgrade/vulkan/vulkan-tools_1.3.261.1.imx.bb
deleted file mode 100644
index 7a7edc9eb..000000000
--- a/recipes-downgrade/vulkan/vulkan-tools_1.3.261.1.imx.bb
+++ /dev/null
@@ -1,36 +0,0 @@
-SUMMARY = "Vulkan Utilities and Tools"
-DESCRIPTION = "Assist development by enabling developers to verify their applications correct use of the Vulkan API."
-HOMEPAGE = "https://www.khronos.org/vulkan/"
-BUGTRACKER = "https://github.com/KhronosGroup/Vulkan-Tools"
-SECTION = "libs"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
-SRC_URI = "git://github.com/KhronosGroup/Vulkan-Tools.git;branch=main;protocol=https"
-SRCREV = "a7da7027ca9fd0901639f02619c226da9c6036f1"
-
-S = "${WORKDIR}/git"
-
-inherit cmake features_check pkgconfig
-ANY_OF_DISTRO_FEATURES = "x11 wayland"
-REQUIRED_DISTRO_FEATURES = "vulkan"
-
-DEPENDS += "vulkan-headers vulkan-loader"
-
-EXTRA_OECMAKE = "\
-                 -DBUILD_TESTS=OFF \
-                 -DBUILD_CUBE=OFF \
-                 -DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python3 \
-                 "
-
-# must choose x11 or wayland or both
-PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)}"
-
-PACKAGECONFIG[x11] = "-DBUILD_WSI_XLIB_SUPPORT=ON -DBUILD_WSI_XCB_SUPPORT=ON, -DBUILD_WSI_XLIB_SUPPORT=OFF -DBUILD_WSI_XCB_SUPPORT=OFF, libxcb libx11 libxrandr"
-PACKAGECONFIG[wayland] = "-DBUILD_WSI_WAYLAND_SUPPORT=ON, -DBUILD_WSI_WAYLAND_SUPPORT=OFF, wayland"
-
-# These recipes need to be updated in lockstep with each other:
-# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools
-# The tags versions should always be sdk-x.y.z, as this is what
-# upstream considers a release.
-UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
diff --git a/recipes-downgrade/vulkan/vulkan-tools_1.3.275.0.imx.bb b/recipes-downgrade/vulkan/vulkan-tools_1.3.275.0.imx.bb
new file mode 100644
index 000000000..f86912c90
--- /dev/null
+++ b/recipes-downgrade/vulkan/vulkan-tools_1.3.275.0.imx.bb
@@ -0,0 +1,37 @@
+SUMMARY = "Vulkan Utilities and Tools"
+DESCRIPTION = "Assist development by enabling developers to verify their applications correct use of the Vulkan API."
+HOMEPAGE = "https://www.khronos.org/vulkan/"
+BUGTRACKER = "https://github.com/KhronosGroup/Vulkan-Tools"
+SECTION = "libs"
+
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
+SRC_URI = "git://github.com/KhronosGroup/Vulkan-Tools.git;branch=main;protocol=https"
+SRCREV = "c86d42cf9eb620eeac377e3bff46ae342c5cd664"
+
+S = "${WORKDIR}/git"
+
+inherit cmake features_check pkgconfig
+ANY_OF_DISTRO_FEATURES = "x11 wayland"
+REQUIRED_DISTRO_FEATURES = "vulkan"
+
+DEPENDS += "vulkan-headers vulkan-loader vulkan-volk"
+
+EXTRA_OECMAKE = "\
+                 -DBUILD_TESTS=OFF \
+                 -DBUILD_CUBE=OFF \
+                 -DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python3 \
+                 "
+
+# must choose x11 or wayland or both
+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)}"
+
+PACKAGECONFIG[x11] = "-DBUILD_WSI_XLIB_SUPPORT=ON -DBUILD_WSI_XCB_SUPPORT=ON, -DBUILD_WSI_XLIB_SUPPORT=OFF -DBUILD_WSI_XCB_SUPPORT=OFF, libxcb libx11 libxrandr"
+PACKAGECONFIG[wayland] = "-DBUILD_WSI_WAYLAND_SUPPORT=ON, -DBUILD_WSI_WAYLAND_SUPPORT=OFF, wayland"
+
+# These recipes need to be updated in lockstep with each other:
+# glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools
+# vulkan-validation-layers, vulkan-utility-libraries.
+# The tags versions should always be sdk-x.y.z, as this is what
+# upstream considers a release.
+UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
diff --git a/recipes-downgrade/vulkan/vulkan-validation-layers_1.3.261.1.imx.bb b/recipes-downgrade/vulkan/vulkan-validation-layers_1.3.261.1.imx.bb
deleted file mode 100644
index 1e2a0aced..000000000
--- a/recipes-downgrade/vulkan/vulkan-validation-layers_1.3.261.1.imx.bb
+++ /dev/null
@@ -1,48 +0,0 @@
-SUMMARY = "Vulkan Validation layers"
-DESCRIPTION = "Khronos official Vulkan validation layers to assist developers \
-in verifying that their applications correctly use the Vulkan API"
-HOMEPAGE = "https://www.khronos.org/vulkan/"
-BUGTRACKER = "https://github.com/KhronosGroup/Vulkan-ValidationLayers"
-SECTION = "libs"
-
-LICENSE = "Apache-2.0 & MIT"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=cd3c0bc366cd9b6a906e22f0bcb5910f"
-
-SRC_URI = "git://git@github.com/KhronosGroup/Vulkan-ValidationLayers.git;branch=sdk-1.3.261;protocol=https"
-SRCREV = "628cd310bef6d54b4e6b25b5ac2ed013473409d6"
-
-S = "${WORKDIR}/git"
-
-REQUIRED_DISTRO_FEATURES = "vulkan"
-
-DEPENDS = "vulkan-headers vulkan-loader spirv-headers spirv-tools glslang"
-
-# BUILD_TESTS            - Not required for OE builds
-# USE_ROBIN_HOOD_HASHING - Provides substantial performance improvements on all platforms.
-#                          Yocto project doesn't contain a recipe for package so disabled it.
-EXTRA_OECMAKE = "\
-    -DBUILD_TESTS=OFF \
-    -DUSE_ROBIN_HOOD_HASHING=OFF \
-    -DGLSLANG_INSTALL_DIR=${STAGING_LIBDIR} \
-    -DVULKAN_HEADERS_INSTALL_DIR=${STAGING_EXECPREFIXDIR} \
-    -DSPIRV_HEADERS_INSTALL_DIR=${STAGING_EXECPREFIXDIR} \
-    "
-
-PACKAGECONFIG[x11] = "-DBUILD_WSI_XLIB_SUPPORT=ON -DBUILD_WSI_XCB_SUPPORT=ON, -DBUILD_WSI_XLIB_SUPPORT=OFF -DBUILD_WSI_XCB_SUPPORT=OFF, libxcb libx11 libxrandr"
-PACKAGECONFIG[wayland] = "-DBUILD_WSI_WAYLAND_SUPPORT=ON, -DBUILD_WSI_WAYLAND_SUPPORT=OFF, wayland"
-
-PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'x11 wayland', d)}"
-
-inherit cmake features_check pkgconfig
-
-FILES:${PN} += "${datadir}/vulkan"
-
-SOLIBS = ".so"
-FILES_SOLIBSDEV = ""
-
-# These recipes need to be updated in lockstep with each other:
-# glslang, vulkan-headers, vulkan-loader, vulkan-tools,
-# vulkan-validation-layers, spirv-headers, spirv-tools
-# The tags versions should always be sdk-x.y.z, as this is what
-# upstream considers a release.
-UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
diff --git a/recipes-downgrade/vulkan/vulkan-validation-layers_1.3.275.0.imx.bb b/recipes-downgrade/vulkan/vulkan-validation-layers_1.3.275.0.imx.bb
new file mode 100644
index 000000000..239589108
--- /dev/null
+++ b/recipes-downgrade/vulkan/vulkan-validation-layers_1.3.275.0.imx.bb
@@ -0,0 +1,49 @@
+SUMMARY = "Vulkan Validation layers"
+DESCRIPTION = "Khronos official Vulkan validation layers to assist developers \
+in verifying that their applications correctly use the Vulkan API"
+HOMEPAGE = "https://www.khronos.org/vulkan/"
+BUGTRACKER = "https://github.com/KhronosGroup/Vulkan-ValidationLayers"
+SECTION = "libs"
+
+LICENSE = "Apache-2.0 & MIT"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=cd3c0bc366cd9b6a906e22f0bcb5910f"
+
+SRC_URI = "git://github.com/KhronosGroup/Vulkan-ValidationLayers.git;branch=vulkan-sdk-1.3.275;protocol=https"
+SRCREV = "780c65337e111c7385109c7b720d757a778e4fe2"
+
+S = "${WORKDIR}/git"
+
+REQUIRED_DISTRO_FEATURES = "vulkan"
+
+DEPENDS = "vulkan-headers vulkan-loader spirv-headers spirv-tools glslang vulkan-utility-libraries"
+
+# BUILD_TESTS            - Not required for OE builds
+# USE_ROBIN_HOOD_HASHING - Provides substantial performance improvements on all platforms.
+#                          Yocto project doesn't contain a recipe for package so disabled it.
+EXTRA_OECMAKE = "\
+    -DBUILD_TESTS=OFF \
+    -DUSE_ROBIN_HOOD_HASHING=OFF \
+    -DGLSLANG_INSTALL_DIR=${STAGING_LIBDIR} \
+    -DVULKAN_HEADERS_INSTALL_DIR=${STAGING_EXECPREFIXDIR} \
+    -DSPIRV_HEADERS_INSTALL_DIR=${STAGING_EXECPREFIXDIR} \
+    "
+
+PACKAGECONFIG[x11] = "-DBUILD_WSI_XLIB_SUPPORT=ON -DBUILD_WSI_XCB_SUPPORT=ON, -DBUILD_WSI_XLIB_SUPPORT=OFF -DBUILD_WSI_XCB_SUPPORT=OFF, libxcb libx11 libxrandr"
+PACKAGECONFIG[wayland] = "-DBUILD_WSI_WAYLAND_SUPPORT=ON, -DBUILD_WSI_WAYLAND_SUPPORT=OFF, wayland"
+
+PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'x11 wayland', d)}"
+
+inherit cmake features_check pkgconfig
+
+FILES:${PN} += "${datadir}/vulkan"
+
+SOLIBS = ".so"
+FILES_SOLIBSDEV = ""
+
+# These recipes need to be updated in lockstep with each other:
+# glslang, vulkan-headers, vulkan-loader, vulkan-tools,
+# vulkan-validation-layers, spirv-headers, spirv-tools,
+# vulkan-utility-libraries.
+# The tags versions should always be sdk-x.y.z, as this is what
+# upstream considers a release.
+UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
diff --git a/recipes-graphics/vulkan/vulkan-loader/0001-LF-11869-change-mali-wsi-layer-activating-order.patch b/recipes-graphics/vulkan/vulkan-loader/0001-LF-11869-change-mali-wsi-layer-activating-order.patch
new file mode 100644
index 000000000..da738aabe
--- /dev/null
+++ b/recipes-graphics/vulkan/vulkan-loader/0001-LF-11869-change-mali-wsi-layer-activating-order.patch
@@ -0,0 +1,52 @@
+From 3448c245b15928aa5a5a3695d9271fb201eb2e3b Mon Sep 17 00:00:00 2001
+From: Yuan Tian <yuan.tian@nxp.com>
+Date: Sat, 27 Apr 2024 06:06:54 +0800
+Subject: [PATCH] LF-11869 change mali wsi layer activating order
+
+Upstream-Status: Inappropriate [i.MX specific]
+
+Signed-off-by: Yuan Tian <yuan.tian@nxp.com>
+---
+ loader/loader.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/loader/loader.c b/loader/loader.c
+index e646b28b4..55912c178 100644
+--- a/loader/loader.c
++++ b/loader/loader.c
+@@ -2906,6 +2906,7 @@ VkResult add_data_files(const struct loader_instance *inst, char *search_path, s
+ #if !defined(_WIN32)
+     char temp_path[2048];
+ #endif
++    bool has_wsi_layer = false;
+ 
+     // Now, parse the paths
+     next_file = search_path;
+@@ -2965,6 +2966,10 @@ VkResult add_data_files(const struct loader_instance *inst, char *search_path, s
+                 name = full_path;
+ 
+                 VkResult local_res;
++                if(!strcmp(name,"/etc/vulkan/implicit_layer.d/VkLayer_window_system_integration.json")) {
++                    has_wsi_layer = true;
++                    continue;
++                }
+                 local_res = add_if_manifest_file(inst, name, out_files);
+ 
+                 // Incomplete means this was not a valid data file.
+@@ -2975,6 +2980,13 @@ VkResult add_data_files(const struct loader_instance *inst, char *search_path, s
+                     break;
+                 }
+             }
++
++            if(has_wsi_layer) {
++                name = "/etc/vulkan/implicit_layer.d/VkLayer_window_system_integration.json";
++                vk_result = add_if_manifest_file(inst, name, out_files);
++                has_wsi_layer = false;
++            }
++
+             loader_closedir(inst, dir_stream);
+             if (vk_result != VK_SUCCESS) {
+                 goto out;
+-- 
+2.34.1
+
diff --git a/recipes-graphics/vulkan/vulkan-loader_1.3.261.1.imx.bbappend b/recipes-graphics/vulkan/vulkan-loader_1.3.261.1.imx.bbappend
deleted file mode 100644
index c1a9902b7..000000000
--- a/recipes-graphics/vulkan/vulkan-loader_1.3.261.1.imx.bbappend
+++ /dev/null
@@ -1,9 +0,0 @@
-# libvulkan.so is loaded dynamically, so put it in the main package
-SOLIBS          = ".so*"
-FILES_SOLIBSDEV = ""
-INSANE_SKIP:${PN} += "dev-so"
-
-# Override default mesa drivers with i.MX GPU drivers
-RRECOMMENDS:${PN}:imxvulkan = "libvulkan-imx"
-# Override default mesa drivers with i.MX GPU drivers
-RRECOMMENDS:${PN}:mx95-nxp-bsp = "mali-imx-libvulkan"
diff --git a/recipes-graphics/vulkan/vulkan-loader_1.3.275.0.imx.bbappend b/recipes-graphics/vulkan/vulkan-loader_1.3.275.0.imx.bbappend
new file mode 100644
index 000000000..9b0ce3b99
--- /dev/null
+++ b/recipes-graphics/vulkan/vulkan-loader_1.3.275.0.imx.bbappend
@@ -0,0 +1,15 @@
+FILESEXTRAPATHS:prepend:imx-nxp-bsp := "${THISDIR}/${PN}:"
+
+SRC_URI:append:imx-nxp-bsp = " \
+    file://0001-LF-11869-change-mali-wsi-layer-activating-order.patch \
+"
+
+# libvulkan.so is loaded dynamically, so put it in the main package
+SOLIBS          = ".so*"
+FILES_SOLIBSDEV = ""
+INSANE_SKIP:${PN} += "dev-so"
+
+# Override default mesa drivers with i.MX GPU drivers
+RRECOMMENDS:${PN}:imxvulkan = "libvulkan-imx"
+# Override default mesa drivers with i.MX GPU drivers
+RRECOMMENDS:${PN}:mx95-nxp-bsp = "mali-imx-libvulkan"
-- 
cgit v1.2.3-54-g00ecf


From 640880536da477a2c38e6522f4678a7b4b3819fb Mon Sep 17 00:00:00 2001
From: Valentin Jec <valentin.jec@nxp.com>
Date: Fri, 25 Oct 2024 13:58:18 +0300
Subject: Upgrade NXP BSP to LF6.6.36_2.1.0

imx-g2d: Upgrade 2.1.14 -> 2.2.0

Signed-off-by: Valentin Jec <valentin.jec@nxp.com>
---
 recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.14.bb     | 49 ----------------------
 recipes-graphics/imx-g2d/imx-dpu-g2d_2.2.0.bb      | 47 +++++++++++++++++++++
 recipes-graphics/imx-g2d/imx-g2d-samples_git.bb    |  4 +-
 .../imx-g2d/imx-gpu-g2d_6.4.11.p2.6.bb             | 44 -------------------
 recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb        | 10 ++---
 5 files changed, 54 insertions(+), 100 deletions(-)
 delete mode 100644 recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.14.bb
 create mode 100644 recipes-graphics/imx-g2d/imx-dpu-g2d_2.2.0.bb
 delete mode 100644 recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.6.bb

diff --git a/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.14.bb b/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.14.bb
deleted file mode 100644
index 23168ae16..000000000
--- a/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.14.bb
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright (C) 2016 Freescale Semiconductor
-# Copyright 2017-2024 NXP
-# Released under the MIT license (see COPYING.MIT for the terms)
-
-DESCRIPTION = "G2D library using i.MX DPU"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a" 
-
-DEPENDS = "libdrm ${LIBGAL_IMX}"
-LIBGAL_IMX              = "libgal-imx"
-LIBGAL_IMX:mx95-nxp-bsp = ""
-
-PROVIDES += "virtual/libg2d"
-
-SRC_URI = "${FSL_MIRROR}/${IMX_BIN_NAME}.bin;fsl-eula=true;name=${IMX_SRC_URI_NAME}"
-IMX_BIN_NAME = "${BPN}-${IMX_SRC_URI_NAME}-${PV}-${IMX_SRCREV_ABBREV}"
-
-IMX_SRCREV_ABBREV = "6a00326"
-IMX_SRC_URI_NAME = "v1"
-SRC_URI[v1.md5sum] = "470ad0bdef7dec171395991d47b39e2c"
-SRC_URI[v1.sha256sum] = "4d8e4b536bd24eedfbce375a06c19ab74603291b8b5a5be36b03fbf6e016e940"
-
-IMX_SRCREV_ABBREV:mx95-nxp-bsp = "6a00326"
-IMX_SRC_URI_NAME:mx95-nxp-bsp = "v2"
-SRC_URI[v2.md5sum] = "cf807c38a110763c19a12d6d595b4b09"
-SRC_URI[v2.sha256sum] = "1b86d4fecd5026e871da0de8ed6382c962460468d8151ae2f95b72d00bca17ee"
-
-S = "${WORKDIR}/${IMX_BIN_NAME}"
-
-inherit fsl-eula-unpack
-
-do_install () {
-    install -d ${D}${libdir}
-    install -d ${D}${includedir}
-    cp -d ${S}/g2d/usr/lib/*.so* ${D}${libdir}
-    cp -Pr ${S}/g2d/usr/include/* ${D}${includedir}
-}
-
-INSANE_SKIP:append:libc-musl = " file-rdeps"
-RDEPENDS:${PN}:append:libc-musl = " gcompat"
-
-# The packaged binaries have been stripped of debug info, so disable
-# operations accordingly.
-INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
-INHIBIT_PACKAGE_STRIP = "1"
-INHIBIT_SYSROOT_STRIP = "1"
-
-PACKAGE_ARCH = "${MACHINE_SOCARCH}"
-COMPATIBLE_MACHINE = "(imxdpu)"
diff --git a/recipes-graphics/imx-g2d/imx-dpu-g2d_2.2.0.bb b/recipes-graphics/imx-g2d/imx-dpu-g2d_2.2.0.bb
new file mode 100644
index 000000000..5e8f5402e
--- /dev/null
+++ b/recipes-graphics/imx-g2d/imx-dpu-g2d_2.2.0.bb
@@ -0,0 +1,47 @@
+# Copyright (C) 2016 Freescale Semiconductor
+# Copyright 2017-2024 NXP
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+DESCRIPTION = "G2D library using i.MX DPU"
+LICENSE = "Proprietary"
+LIC_FILES_CHKSUM = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837" 
+
+DEPENDS = "libdrm ${LIBGAL_IMX}"
+LIBGAL_IMX              = "libgal-imx"
+LIBGAL_IMX:mx95-nxp-bsp = ""
+
+PROVIDES += "virtual/libg2d"
+
+SRC_URI = "${FSL_MIRROR}/${IMX_BIN_NAME}.bin;fsl-eula=true;name=${IMX_SRC_URI_NAME}"
+IMX_BIN_NAME = "${BPN}-${IMX_SRC_URI_NAME}-${PV}-${IMX_SRCREV_ABBREV}"
+
+IMX_SRCREV_ABBREV = "7943590"
+IMX_SRC_URI_NAME = "v1"
+SRC_URI[v1.sha256sum] = "bf347f53e8f390a0554c0db76707819bb50cf4aaa564a9c86821ae9add26e113"
+
+IMX_SRCREV_ABBREV:mx95-nxp-bsp = "7943590"
+IMX_SRC_URI_NAME:mx95-nxp-bsp = "v2"
+SRC_URI[v2.sha256sum] = "c0a87908cd04c208659423746a57eaee6a30b4d680ec871f3495ad4a2acb5076"
+
+S = "${WORKDIR}/${IMX_BIN_NAME}"
+
+inherit fsl-eula-unpack
+
+do_install () {
+    install -d ${D}${libdir}
+    install -d ${D}${includedir}
+    cp -d ${S}/g2d/usr/lib/*.so* ${D}${libdir}
+    cp -Pr ${S}/g2d/usr/include/* ${D}${includedir}
+}
+
+INSANE_SKIP:append:libc-musl = " file-rdeps"
+RDEPENDS:${PN}:append:libc-musl = " gcompat"
+
+# The packaged binaries have been stripped of debug info, so disable
+# operations accordingly.
+INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
+INHIBIT_PACKAGE_STRIP = "1"
+INHIBIT_SYSROOT_STRIP = "1"
+
+PACKAGE_ARCH = "${MACHINE_SOCARCH}"
+COMPATIBLE_MACHINE = "(imxdpu)"
diff --git a/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb b/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb
index 0f0c18967..ab0819c69 100644
--- a/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb
+++ b/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb
@@ -5,11 +5,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0858ec9c7a80c4a2cf16e4f825a2cc91"
 
 DEPENDS = "cairo"
 
-PV = "2.1+git${SRCPV}"
+PV = "2.2+git${SRCPV}"
 
 SRC_URI = "${GPU_G2D_SAMPLES_SRC};branch=${SRCBRANCH}"
 GPU_G2D_SAMPLES_SRC ?= "git://github.com/nxp-imx/g2d-samples.git;protocol=https"
-SRCBRANCH = "imx_2.1"
+SRCBRANCH = "imx_2.2"
 SRCREV = "431f311a41ca052902ea0d6445e74defe0a4df2d"
 
 S = "${WORKDIR}/git"
diff --git a/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.6.bb b/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.6.bb
deleted file mode 100644
index d12d9c1a8..000000000
--- a/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.6.bb
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright (C) 2016 Freescale Semiconductor
-# Copyright 2017-2024 NXP
-# Copyright 2018 (C) O.S. Systems Software LTDA.
-# Released under the MIT license (see COPYING.MIT for the terms)
-
-DESCRIPTION = "G2D library using i.MX GPU"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a" 
-DEPENDS = "libgal-imx"
-PROVIDES = "virtual/libg2d"
-
-SRC_URI = "${FSL_MIRROR}/${IMX_BIN_NAME}.bin;name=${TARGET_ARCH};fsl-eula=true"
-IMX_BIN_NAME = "${BP}-${TARGET_ARCH}-${IMX_SRCREV_ABBREV}"
-IMX_SRCREV_ABBREV = "bc7b6a2"
-SRC_URI[aarch64.md5sum] = "4b12d0434d612b57ff4d7df690c3154f"
-SRC_URI[aarch64.sha256sum] = "b2e4c580bf887042f479fde7c8b07c6215794d8123263d10ff0c167af7ba5918"
-SRC_URI[arm.md5sum] = "4bead15838f47793f59cb374c10c2dd2"
-SRC_URI[arm.sha256sum] = "413610ce4730eb9adbde30c8ad4a72df3edd69d84e1154a0c29efa7f33a30663"
-
-S = "${WORKDIR}/${IMX_BIN_NAME}"
-
-inherit fsl-eula-unpack
-
-SOC_INSTALL_DIR               = "SOC_INSTALL_DIR_NOT_SET"
-SOC_INSTALL_DIR:mx8mm-nxp-bsp = "mx8mm"
-
-do_install () {
-    install -d ${D}${libdir}
-    install -d ${D}${includedir}
-    cp -d ${S}/g2d/usr/lib/*.so* ${D}${libdir}
-    if [ -d ${S}/g2d/usr/lib/${SOC_INSTALL_DIR} ]; then
-        cp -d ${S}/g2d/usr/lib/${SOC_INSTALL_DIR}/*.so* ${D}${libdir}
-    fi
-    cp -Pr ${S}/g2d/usr/include/* ${D}${includedir}
-}
-
-# The packaged binaries have been stripped of debug info, so disable
-# operations accordingly.
-INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
-INHIBIT_PACKAGE_STRIP = "1"
-INHIBIT_SYSROOT_STRIP = "1"
-
-PACKAGE_ARCH = "${MACHINE_SOCARCH}"
-COMPATIBLE_MACHINE = "(imxgpu2d)"
diff --git a/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb b/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb
index 4481188b1..88fc60aeb 100644
--- a/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb
+++ b/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb
@@ -1,19 +1,19 @@
 # Copyright (C) 2016 Freescale Semiconductor
-# Copyright 2017-2023 NXP
+# Copyright 2017-2024 NXP
 # Released under the MIT license (see COPYING.MIT for the terms)
 
 DESCRIPTION = "G2D library using i.MX PXP"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=10c0fda810c63b052409b15a5445671a"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=ca53281cc0caa7e320d4945a896fb837"
 
 PROVIDES += "virtual/libg2d"
 
-PV = "2.1.0+git${SRCPV}"
+PV = "2.2+git${SRCPV}"
 
 SRC_URI = "${IMX_PXP_G2D_SRC};branch=${SRCBRANCH}"
 IMX_PXP_G2D_SRC ?= "git://github.com/nxp-imx/imx-g2d-pxp.git;protocol=https"
-SRCBRANCH = "imx_2.1"
-SRCREV = "edd234c4e1c58cd2453963d19155d4d5d3800d07"
+SRCBRANCH = "imx_2.2"
+SRCREV = "5e633f895a84cec809ca98d77c879af3591b3b20"
 
 S = "${WORKDIR}/git"
 
-- 
cgit v1.2.3-54-g00ecf


From 01ce79a25c068652a07738d48a2895ead6147b3d Mon Sep 17 00:00:00 2001
From: Valentin Jec <valentin.jec@nxp.com>
Date: Fri, 25 Oct 2024 13:58:50 +0300
Subject: Upgrade NXP BSP to LF6.6.36_2.1.0

imx-gpu*: Upgrade 6.4.11.p2.6 -> 6.4.11.p2.8

Signed-off-by: Valentin Jec <valentin.jec@nxp.com>
---
 .../imx-g2d/imx-gpu-g2d_6.4.11.p2.8.bb             | 42 ++++++++++++++++++++++
 recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc     | 10 ++++++
 .../imx-gpu-viv/imx-gpu-viv_6.4.11.p2.6-aarch32.bb | 10 ------
 .../imx-gpu-viv/imx-gpu-viv_6.4.11.p2.6-aarch64.bb | 10 ------
 .../imx-gpu-viv/imx-gpu-viv_6.4.11.p2.8-aarch32.bb |  9 +++++
 .../imx-gpu-viv/imx-gpu-viv_6.4.11.p2.8-aarch64.bb |  9 +++++
 6 files changed, 70 insertions(+), 20 deletions(-)
 create mode 100644 recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.8.bb
 delete mode 100644 recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.6-aarch32.bb
 delete mode 100644 recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.6-aarch64.bb
 create mode 100644 recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.8-aarch32.bb
 create mode 100644 recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.8-aarch64.bb

diff --git a/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.8.bb b/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.8.bb
new file mode 100644
index 000000000..7ce542d0a
--- /dev/null
+++ b/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.8.bb
@@ -0,0 +1,42 @@
+# Copyright (C) 2016 Freescale Semiconductor
+# Copyright 2017-2024 NXP
+# Copyright 2018 (C) O.S. Systems Software LTDA.
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+DESCRIPTION = "G2D library using i.MX GPU"
+LICENSE = "Proprietary"
+LIC_FILES_CHKSUM = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837" 
+DEPENDS = "libgal-imx"
+PROVIDES = "virtual/libg2d"
+
+SRC_URI = "${FSL_MIRROR}/${IMX_BIN_NAME}.bin;name=${TARGET_ARCH};fsl-eula=true"
+IMX_BIN_NAME = "${BP}-${TARGET_ARCH}-${IMX_SRCREV_ABBREV}"
+IMX_SRCREV_ABBREV = "95408a4"
+SRC_URI[aarch64.sha256sum] = "48327fe6315aa739d5665004289412ff2e3a4e0084d1664f837276f09d35b032"
+SRC_URI[arm.sha256sum] = "f28b2cd7b29302cd654fc845a0695d6fe935e383b56556e36933488dfa014830"
+
+S = "${WORKDIR}/${IMX_BIN_NAME}"
+
+inherit fsl-eula-unpack
+
+SOC_INSTALL_DIR               = "SOC_INSTALL_DIR_NOT_SET"
+SOC_INSTALL_DIR:mx8mm-nxp-bsp = "mx8mm"
+
+do_install () {
+    install -d ${D}${libdir}
+    install -d ${D}${includedir}
+    cp -d ${S}/g2d/usr/lib/*.so* ${D}${libdir}
+    if [ -d ${S}/g2d/usr/lib/${SOC_INSTALL_DIR} ]; then
+        cp -d ${S}/g2d/usr/lib/${SOC_INSTALL_DIR}/*.so* ${D}${libdir}
+    fi
+    cp -Pr ${S}/g2d/usr/include/* ${D}${includedir}
+}
+
+# The packaged binaries have been stripped of debug info, so disable
+# operations accordingly.
+INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
+INHIBIT_PACKAGE_STRIP = "1"
+INHIBIT_SYSROOT_STRIP = "1"
+
+PACKAGE_ARCH = "${MACHINE_SOCARCH}"
+COMPATIBLE_MACHINE = "(imxgpu2d)"
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 2d02d7abb..52d878331 100644
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
@@ -22,6 +22,10 @@ DEPENDS:append:mx8-nxp-bsp = " patchelf-native"
 
 DEPENDS:append:libc-musl = " gcompat"
 
+DEPENDS:remove:imx-nxp-bsp = "mesa"
+PACKAGES:remove:imx-nxp-bsp = "libgl-imx libgl-imx-dev"
+PROVIDES:remove:imx-nxp-bsp = "virtual/libgl"
+
 PROVIDES += " \
     imx-gpu-viv \
     libgal-imx \
@@ -63,6 +67,12 @@ PROVIDES_OPENVX:mx8mm-nxp-bsp    = ""
 
 RPROVIDES:${PN}:imxgpu3d += "imx-gpu-viv"
 
+RPROVIDES_OPENCL               = "opencl-icd-loader-dev"
+RPROVIDES_OPENCL:mx7-nxp-bsp   = ""
+RPROVIDES_OPENCL:mx8mm-nxp-bsp = ""
+
+RPROVIDES:${PN}:append:imx-nxp-bsp = " ${RPROVIDES_OPENCL}"
+
 PE = "1"
 
 inherit fsl-eula-unpack
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.6-aarch32.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.6-aarch32.bb
deleted file mode 100644
index db99b1c71..000000000
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.6-aarch32.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require imx-gpu-viv-6.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a"
-
-IMX_SRCREV_ABBREV = "bc7b6a2"
-
-SRC_URI[md5sum] = "d921b6daf89eba252b0b5b59abe0d690"
-SRC_URI[sha256sum] = "cf6e42c9c9a903cd933b767d411131390d237a4b92ecad579db57d54538707f3"
-
-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.6-aarch64.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.6-aarch64.bb
deleted file mode 100644
index fb73322ae..000000000
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.6-aarch64.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require imx-gpu-viv-6.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=10c0fda810c63b052409b15a5445671a"
-
-IMX_SRCREV_ABBREV = "bc7b6a2"
-
-SRC_URI[md5sum] = "e6ac75617944d9a9dbba90f863f07e0f"
-SRC_URI[sha256sum] = "5fe828113b9b2801b3fd60cd15eadfd0ac747e5897ef7db7fa22f80e7dd8a8e1"
-
-COMPATIBLE_MACHINE = "(mx8-nxp-bsp)"
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.8-aarch32.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.8-aarch32.bb
new file mode 100644
index 000000000..4cdc1d6af
--- /dev/null
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.8-aarch32.bb
@@ -0,0 +1,9 @@
+require imx-gpu-viv-6.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837"
+
+IMX_SRCREV_ABBREV = "95408a4"
+
+SRC_URI[sha256sum] = "c479c98e83866a7e95e5a6ae29b21ae41f9599326298d9a1debf009cac6e9406"
+
+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.8-aarch64.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.8-aarch64.bb
new file mode 100644
index 000000000..c5208b554
--- /dev/null
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.8-aarch64.bb
@@ -0,0 +1,9 @@
+require imx-gpu-viv-6.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837"
+
+IMX_SRCREV_ABBREV = "95408a4"
+
+SRC_URI[sha256sum] = "aadfcf558d07da253a57acfd5aa4ca41d4c8195f04324d0c2f6746f6f18c5a46"
+
+COMPATIBLE_MACHINE = "(mx8-nxp-bsp)"
-- 
cgit v1.2.3-54-g00ecf


From 556e5ac31d51fe5ebdb14231e244368429751bbc Mon Sep 17 00:00:00 2001
From: Valentin Jec <valentin.jec@nxp.com>
Date: Fri, 25 Oct 2024 14:01:08 +0300
Subject: Upgrade NXP BSP to LF6.6.36_2.1.0

weston_12.0.4.imx: Bump to revision c3c1f9f

Signed-off-by: Valentin Jec <valentin.jec@nxp.com>
---
 recipes-graphics/wayland/weston_12.0.4.imx.bb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/recipes-graphics/wayland/weston_12.0.4.imx.bb b/recipes-graphics/wayland/weston_12.0.4.imx.bb
index 87593e4bd..8003da07b 100644
--- a/recipes-graphics/wayland/weston_12.0.4.imx.bb
+++ b/recipes-graphics/wayland/weston_12.0.4.imx.bb
@@ -172,7 +172,7 @@ SRC_URI:prepend = "${WESTON_SRC};branch=${SRCBRANCH} "
 WESTON_SRC ?= "git://github.com/nxp-imx/weston-imx.git;protocol=https"
 SRC_URI += "file://0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch"
 SRCBRANCH = "weston-imx-12.0.4"
-SRCREV = "461c49d20677cfd36d01a95dafbd9eedf2a4b09c"
+SRCREV = "c3c1f9ff7824123dd4808ace3c9476345cb84177"
 S = "${WORKDIR}/git"
 
 PACKAGECONFIG_IMX_REMOVALS ?= "wayland x11"
@@ -186,6 +186,9 @@ PACKAGECONFIG_G2D:mx93-nxp-bsp ??= "imxg2d"
 # Weston with i.MX G2D renderer
 PACKAGECONFIG[imxg2d] = "-Drenderer-g2d=true,-Drenderer-g2d=false,virtual/libg2d"
 
+# Weston on RDP, fix for base recipe
+PACKAGECONFIG[rdp] = "-Dbackend-rdp=true,-Dbackend-rdp=false,freerdp,freerdp"
+
 # links with imx-gpu libs which are pre-built for glibc
 # gcompat will address it during runtime
 LDFLAGS:append:imxgpu:libc-musl = " -Wl,--allow-shlib-undefined"
-- 
cgit v1.2.3-54-g00ecf