From e2136407e370a2e3c737f4beb70ee859553f784b Mon Sep 17 00:00:00 2001
From: Arturo Buzarra <arturo.buzarra@digi.com>
Date: Mon, 6 Apr 2020 15:18:31 +0200
Subject: [PATCH] zeus migration: imx-gpu-viv: update recipe to v6.4.0.p2.2

https://jira.digi.com/browse/DEL-7013

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
---
 .../imx-gpu-viv/imx-gpu-viv-v6.inc            | 387 +-----------------
 .../imx-gpu-viv/Add-dummy-libgl.patch         |   6 +
 .../imx-gpu-viv_6.2.4.p4.6-aarch32.bb         |   8 -
 .../imx-gpu-viv_6.2.4.p4.6-aarch64.bb         |   8 -
 .../imx-gpu-viv_6.4.0.p2.2-aarch32.bb         |  19 +
 .../imx-gpu-viv_6.4.0.p2.2-aarch64.bb         |  17 +
 6 files changed, 60 insertions(+), 385 deletions(-)
 create mode 100644 meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv/Add-dummy-libgl.patch
 delete mode 100644 meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.2.4.p4.6-aarch32.bb
 delete mode 100644 meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.2.4.p4.6-aarch64.bb
 create mode 100644 meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.0.p2.2-aarch32.bb
 create mode 100644 meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.0.p2.2-aarch64.bb

diff --git a/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv-v6.inc b/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv-v6.inc
index 849648aa3..9ee17af82 100644
--- a/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv-v6.inc
+++ b/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv-v6.inc
@@ -1,379 +1,28 @@
-# Copyright (C) 2012-2016 Freescale Semiconductor
-# Copyright (C) 2012-2016 O.S. Systems Software LTDA.
-# Released under the MIT license (see COPYING.MIT for the terms)
+require recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
 
-DESCRIPTION = "GPU driver and apps for imx"
-SECTION = "libs"
-LICENSE = "Proprietary"
+EXTRA_PROVIDES_remove = "virtual/libopenvx"
+PROVIDES_OPENVX       = ""
+PROVIDES_OPENVX_mx8   = "virtual/libopenvx"
+PROVIDES_OPENVX_mx8mm = ""
+PROVIDES += "${PROVIDES_OPENVX}"
 
-DEPENDS += \
-    "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', \
-        bb.utils.contains('DISTRO_FEATURES',     'x11', 'virtual/libx11 libxdamage libxext libxfixes', \
-                                                        '', d), d)}"
-DEPENDS += \
-    "${@bb.utils.contains('DISTRO_FEATURES',     'x11', 'libxcb libxshmfence libxxf86vm', \
-                                                        '', d)}"
-DEPENDS_append_imxdrm = " libdrm wayland"
+PACKAGES =+ "libnn-imx"
 
-# imx-gpu-viv does not provide everything it needs to for virtual/libgl
-# on x11 backend or on Wayland backend with XWayland support.
-# We depend on mesa to fill in what is missing.
-DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'mesa', '', d)}"
+GLES3_HEADER_REMOVALS_mx8mn = "gl32.h"
+GLES3_HEADER_REMOVALS_mx8mp  = "gl32.h"
 
-EXTRA_PROVIDES = ""
-EXTRA_PROVIDES_append_imxgpu3d = " \
-    virtual/libgl \
-    virtual/libgles1 \
-    virtual/libgles2 \
-"
-EXTRA_PROVIDES_append_mx6q = " \
-    virtual/opencl-icd \
-    opencl-headers \
-"
-EXTRA_PROVIDES_append_mx8 = " \
-    virtual/libopenvx \
-    virtual/libgbm \
-    virtual/opencl-icd \
-    opencl-headers \
-"
-PROVIDES += " \
-    imx-gpu-viv \
-    libgal-imx \
-    virtual/egl \
-    virtual/libopenvg \
-    virtual/opencl-headers \
-    virtual/opencl-icd \
-    ${EXTRA_PROVIDES} \
-"
+FILES_libgbm-imx_mx8 = "${libdir}/libgbm*${SOLIBS}"
 
-RPROVIDES_${PN}_imxgpu3d += "imx-gpu-viv"
+FILES_libopenvx-imx = "${libdir}/libOpenVX*${SOLIBS} ${libdir}/libOvx*${SOLIBS}"
+FILES_libopenvx-imx-dev = "${includedir}/VX"
+RDEPENDS_libopenvx-imx = "libnn-imx"
 
-PE = "1"
+FILES_libnn-imx = "${libdir}/libNN*${SOLIBS}"
 
-inherit fsl-eula-unpack
+RDEPENDS_libgal-imx += "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'valgrind', '', d)}"
 
-SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true"
-
-# Note : If you add a package here, to prevent a naming conflict see the python_anonymous() futher below
-PACKAGES_1 = "libclc-imx libclc-imx-dev \
-	libgl-imx libgl-imx-dev \
-	libgles-imx libgles-imx-dev \
-	libgles2-imx libgles2-imx-dev \
-	libgles3-imx-dev \
-	libglslc-imx libglslc-imx-dev \
-	libopencl-imx libopencl-imx-dev \
-	libopenvg-imx libopenvg-imx-dev \
-	libvdk-imx libvdk-imx-dev \
-	libegl-imx libegl-imx-dev \
-	libgal-imx libgal-imx-dev \
-	libvivante-dri-imx \
-	libvsc-imx \
-"
-PACKAGES_2     = ""
-PACKAGES_2_mx8 = "libgbm-imx libgbm-imx-dev"
-PACKAGES_3 = "libwayland-viv-imx libwayland-viv-imx-dev \
-	libgc-wayland-protocol-imx libgc-wayland-protocol-imx-dev \
-	imx-gpu-viv-tools \
-	imx-gpu-viv-demos \
-	libvulkan-imx libvulkan-imx-dev \
-	libopenvx-imx libopenvx-imx-dev \
-"
-PACKAGES =+ "${PACKAGES_1} ${PACKAGES_2} ${PACKAGES_3}"
-python __anonymous () {
-        has_vivante_kernel_driver_support = (d.getVar('MACHINE_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT', True) or '0')
-        if has_vivante_kernel_driver_support != '1':
-                raise bb.parse.SkipPackage('The kernel of machine needs to have Vivante kernel driver support for this recipe to be used.')
-}
-
-USE_X11 = "${@bb.utils.contains("DISTRO_FEATURES", "x11", "yes", "no", d)}"
-USE_WL = "${@bb.utils.contains("DISTRO_FEATURES", "wayland", "yes", "no", d)}"
-
-# Inhibit warnings about files being stripped.
-INHIBIT_PACKAGE_STRIP = "1"
-INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
-
-# FIXME: The provided binary doesn't provide soname. If in future BSP
-# release the libraries are fixed, we can drop this hack.
-REALSOLIBS := "${SOLIBS}"
-SOLIBS = "${SOLIBSDEV}"
-
-python __anonymous() {
-    # FIXME: All binaries lack GNU_HASH in elf binary but as we don't have
-    # the source we cannot fix it. Disable the insane check for now.
-    packages = d.getVar('PACKAGES', True).split()
-    for p in packages:
-        d.appendVar("INSANE_SKIP_%s" % p, " ldflags")
-
-    # For the packages that make up the OpenGL interfaces, inject variables so that
-    # they don't get Debian-renamed (which would remove the -imx suffix).
-    for p in (("libegl", "libegl1"), ("libgl", "libgl1"),
-              ("libgles1", "libglesv1-cm1"), ("libgles2", "libglesv2-2"),
-              ("libgles3",) , ("libvulkan",)):
-        fullp = p[0] + "-imx"
-        pkgs = " ".join(p)
-        d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1")
-        d.appendVar("RREPLACES_" + fullp, pkgs)
-        d.appendVar("RPROVIDES_" + fullp, pkgs)
-        d.appendVar("RCONFLICTS_" + fullp, pkgs)
-
-        # For -dev, the first element is both the Debian and original name
-        fullp += "-dev"
-        pkgs = p[0] + "-dev"
-        d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1")
-        d.appendVar("RREPLACES_" + fullp, pkgs)
-        d.appendVar("RPROVIDES_" + fullp, pkgs)
-        d.appendVar("RCONFLICTS_" + fullp, pkgs)
-}
-
-IS_MX6SL = "0"
-IS_MX6SL_mx6sl = "1"
-
-IS_MX8 = "0"
-IS_MX8_mx8 = "1"
-
-PACKAGE_FP_TYPE = "hardfp"
-
-HAS_GBM     = "false"
-HAS_GBM_mx8 = "true"
-
-# GLES 3.1 is supported for all i.MX 8
-# GLES 3.2 is supported for i.MX 8QM only
-GLES3_HEADER_REMOVALS = "gl31.h gl32.h"
-GLES3_HEADER_REMOVALS_remove_mx8   = "gl31.h"
-GLES3_HEADER_REMOVALS_remove_mx8qm = "gl32.h"
-GLES3_HEADER_REMOVALS_mx8qxp = ""
-
-do_install () {
-    install -d ${D}${libdir}
-    install -d ${D}${includedir}
-    install -d ${D}${bindir}
-
-    cp -P ${S}/gpu-core/usr/lib/*.so* ${D}${libdir}
-    cp -r ${S}/gpu-core/usr/include/* ${D}${includedir}
-    cp -r ${S}/gpu-demos/opt ${D}
-    cp -r ${S}/gpu-tools/gmem-info/usr/bin/* ${D}${bindir}
-
-    # Use vulkan headers from vulkan recipe
-    rm -rf ${D}${includedir}/vulkan
-
-    install -d ${D}${libdir}/pkgconfig
-    if ${HAS_GBM}; then
-        install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/gbm.pc ${D}${libdir}/pkgconfig/gbm.pc
-    fi
-
-    # The preference order, based in DISTRO_FEATURES, is Wayland (with or without X11), X11 and fb
-    if [ "${USE_WL}" = "yes" ]; then
-
-        backend=wl
-
-        install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/egl_wayland.pc ${D}${libdir}/pkgconfig/egl.pc
-        install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv1_cm.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc
-        install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv2.pc ${D}${libdir}/pkgconfig/glesv2.pc
-        install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/vg.pc ${D}${libdir}/pkgconfig/vg.pc
-        #install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/gc_wayland_protocol.pc ${D}${libdir}/pkgconfig/gc_wayland_protocol.pc
-        #install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/wayland-viv.pc ${D}${libdir}/pkgconfig/wayland-viv.pc
-
-       if [ "${USE_X11}" = "yes" ]; then
-
-        cp -r ${S}/gpu-core/usr/lib/dri ${D}${libdir}
-
-       fi
-
-    elif [ "${USE_X11}" = "yes" ]; then
-
-        cp -r ${S}/gpu-core/usr/lib/dri ${D}${libdir}
-
-        backend=x11
-
-        install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/gl_x11.pc ${D}${libdir}/pkgconfig/gl.pc
-        install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/egl_x11.pc ${D}${libdir}/pkgconfig/egl.pc
-        install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv1_cm_x11.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc
-        install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv2_x11.pc ${D}${libdir}/pkgconfig/glesv2.pc
-        install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/vg_x11.pc ${D}${libdir}/pkgconfig/vg.pc
-
-    else
-        install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv1_cm.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc
-        install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv2.pc ${D}${libdir}/pkgconfig/glesv2.pc
-        install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/vg.pc ${D}${libdir}/pkgconfig/vg.pc
-
-        # Regular framebuffer
-        install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/egl_linuxfb.pc ${D}${libdir}/pkgconfig/egl.pc
-
-        backend=fb
-
-    fi
-
-    # Install Vendor ICDs for OpenCL's installable client driver loader (ICDs Loader)
-    install -d ${D}${sysconfdir}/OpenCL/vendors/
-    install -m 0644 ${S}/gpu-core/etc/Vivante.icd ${D}${sysconfdir}/OpenCL/vendors/Vivante.icd
-
-    # We'll only have one backend here so we rename it to generic name
-    # and avoid rework in other packages, when possible
-    mv ${D}${libdir}/libGL.so.1.2 ${D}${libdir}/libGL.so.1.2.0
-    ln -sf libGL.so.1.2.0 ${D}${libdir}/libGL.so.1.2
-    ln -sf libGL.so.1.2.0 ${D}${libdir}/libGL.so.1
-    ln -sf libGL.so.1.2.0 ${D}${libdir}/libGL.so
-    mv ${D}${libdir}/libEGL-${backend}.so ${D}${libdir}/libEGL.so.1.0
-    ln -sf libEGL.so.1.0 ${D}${libdir}/libEGL.so.1
-    ln -sf libEGL.so.1.0 ${D}${libdir}/libEGL.so
-    mv ${D}${libdir}/libGAL-${backend}.so ${D}${libdir}/libGAL.so
-    if [ "${USE_WL}" = "yes" ]; then
-        # Special case for libVDK on Wayland backend, deliver fb library as well.
-        # Need to rename the libraries to avoid the code below that will remove
-        # *-fb.so and *-wl.so
-        mv ${D}${libdir}/libVDK-fb.so ${D}${libdir}/libVDK-framebuffer.so
-        mv ${D}${libdir}/libVDK-wl.so ${D}${libdir}/libVDK-wayland.so
-        ln -sf libVDK-wayland.so ${D}${libdir}/libVDK.so
-    else
-        mv ${D}${libdir}/libVDK-${backend}.so ${D}${libdir}/libVDK.so
-    fi
-
-    # update libglesv2 as backend dependent
-    rm -rf ${D}${libdir}/libGLESv2*
-    cp ${S}/gpu-core/usr/lib/libGLESv2-${backend}.so ${D}${libdir}/libGLESv2.so.2.0.0
-    ln -sf libGLESv2.so.2.0.0 ${D}${libdir}/libGLESv2.so.2
-    ln -sf libGLESv2.so.2.0.0 ${D}${libdir}/libGLESv2.so
-
-    if [ "${IS_MX8}" = "1" ]; then
-        # Install the vulkan driver in a sub-folder. When installed in the same
-        # folder as the vulkan loader layer library, an incorrect linkage is
-        # created from libvulkan.so.1 to our library instead of the loader
-        # layer library.
-        install -d ${D}${libdir}/vulkan
-        mv ${D}${libdir}/libvulkan-${backend}.so ${D}${libdir}/vulkan/libvulkan_VSI.so
-    fi
-    for header in ${GLES3_HEADER_REMOVALS}; do
-        rm -f ${D}${includedir}/GLES3/${header}
-    done
-
-    # skip packaging wayland libraries if no support is requested
-    if [ "${USE_WL}" = "no" ]; then
-        find ${D}${libdir} -name "libgc_wayland_protocol.*" -exec rm '{}' ';'
-        find ${D}${libdir} -name "libwayland-viv.*" -exec rm '{}' ';'
-    fi
-
-    for i in wl x11 fb dri; do
-        find ${D}${libdir} -name "*-$i.so" -exec rm '{}' ';'
-        find ${D}${libdir} -name "*.$i.so" -exec rm '{}' ';'
-    done
-
-    # FIXME: MX6SL does not have 3D support; hack it for now
-    if [ "${IS_MX6SL}" = "1" ]; then
-        rm -rf ${D}${libdir}/libCLC* ${D}${includedir}/CL \
-               \
-               ${D}${libdir}/libGL* ${D}${includedir}/GL* ${D}${libdir}/pkgconfig/gl.pc \
-               \
-               ${D}${libdir}/libGLES* ${D}${libdir}/pkgconfig/gles*.pc \
-               \
-               ${D}${libdir}/libOpenCL* ${D}${includedir}/CL \
-               \
-               ${D}${libdir}/libOpenVG.3d.so \
-               \
-               ${D}${libdir}/libVivanteOpenCL.so \
-               \
-               ${D}/opt/viv_samples/vdk \
-               ${D}/opt/viv_samples/es20 ${D}/opt/viv_samples/cl11
-
-        ln -sf libOpenVG.2d.so ${D}${libdir}/libOpenVG.so
-    fi
-
-    find ${D}${libdir} -type f -exec chmod 644 {} \;
-    find ${D}${includedir} -type f -exec chmod 644 {} \;
-
-    chown -R root:root "${D}"
-}
-
-ALLOW_EMPTY_${PN} = "1"
-
-# FIXME: Remove the following lines after adding libopenvx package
-INSANE_SKIP_imx-gpu-viv-dev += "dev-elf"
-INSANE_SKIP_libclc-imx += "dev-deps"
-
-FILES_libclc-imx = "${libdir}/libCLC${SOLIBS}"
-FILES_libclc-imx-dev = "${includedir}/CL ${libdir}/libCLC${SOLIBSDEV}"
-
-# libEGL.so is used by some demo apps from Freescale
-INSANE_SKIP_libegl-imx += "dev-so"
-FILES_libegl-imx = "${libdir}/libEGL${REALSOLIBS} ${libdir}/libEGL${SOLIBSDEV} "
-FILES_libegl-imx-dev = "${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/egl.pc"
-#RDEPENDS_libegl-imx += "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'libgc-wayland-protocol-imx libwayland-viv-imx libgc-wayland-protocol-imx', '', d)}"
-
-FILES_libgal-imx = "${libdir}/libGAL${SOLIBS} ${libdir}/libGAL_egl${SOLIBS}"
-FILES_libgal-imx-dev = "${libdir}/libGAL${SOLIBSDEV} ${includedir}/HAL"
-# Digi custom change: we include the imx-gpu-viv driver as built-in in the
-# kernel, so this dependency isn't necessary
-#RDEPENDS_libgal-imx += "kernel-module-imx-gpu-viv"
-RPROVIDES_libgal-imx += "libgal-imx"
-INSANE_SKIP_libgal-imx += "build-deps"
-
-FILES_libvsc-imx = "${libdir}/libVSC${SOLIBS}"
-
-FILES_libgbm-imx_mx8           = "${libdir}/libgbm${SOLIBS} ${libdir}/gbm_viv${SOLIBS}"
-FILES_libgbm-imx-dev_mx8       = "${libdir}/pkgconfig/gbm.pc ${includedir}/gbm.h ${libdir}/libgbm${SOLIBSDEV}"
-RDEPENDS_libgbm-imx_append_mx8 = " libdrm"
-
-FILES_libvulkan-imx = "${libdir}/vulkan/libvulkan_VSI${SOLIBS} ${libdir}/libSPIRV_viv${SOLIBS}"
-FILES_libvulkan-imx-dev = "${includedir}/vulkan ${libdir}/vulkan/libvulkan_VSI${SOLIBSDEV}"
-INSANE_SKIP_libvulkan-imx += "dev-deps dev-so"
-
-FILES_libopenvx-imx = "${libdir}/libOpenVX${SOLIBS} ${libdir}/libOpenVXC${SOLIBS} ${libdir}/libOpenVXU${SOLIBS}"
-FILES_libopenvx-imx-dev = "${includedir}/VX ${libdir}/libopenVX${SOLIBSDEV}"
-
-FILES_libgl-imx = "${libdir}/libGL${REALSOLIBS}"
-FILES_libgl-imx-dev = "${libdir}/libGL${SOLIBSDEV} ${includedir}/GL"
-# Includes GL headers from mesa
-RDEPENDS_libgl-imx-dev += "libgl-mesa-dev"
-
-# libEGL needs to open libGLESv1.so
-INSANE_SKIP_libgles-imx += "dev-so"
-FILES_libgles-imx = "${libdir}/libGLESv1*${REALSOLIBS} ${libdir}/libGLESv1*${SOLIBS} ${libdir}/libGLES_*${REALSOLIBS} ${libdir}/libGLES_*${SOLIBS}"
-FILES_libgles-imx-dev = "${includedir}/GLES ${libdir}/libGLESv1*${SOLIBS} ${libdir}/libGLES_*${SOLIBSDEV} ${libdir}/pkgconfig/glesv1_cm.pc"
-
-# libEGL needs to open libGLESv2.so
-INSANE_SKIP_libgles2-imx += "dev-so"
-FILES_libgles2-imx = "${libdir}/libGLESv2${REALSOLIBS} ${libdir}/libGLESv2${SOLIBS}"
-FILES_libgles2-imx-dev = "${includedir}/GLES2 ${libdir}/libGLESv2${SOLIBSDEV} ${libdir}/pkgconfig/glesv2.pc"
-RDEPENDS_libgles2-imx = "libglslc-imx"
-
-FILES_libgles3-imx-dev = "${includedir}/GLES3"
-# as long as there is no libgles3: ship libgles3-dev along with
-# libgles2-dev - otherwise GLES3 headers have to be added manually
-RDEPENDS_libgles2-imx-dev += "libgles3-imx-dev"
-
-FILES_libglslc-imx = "${libdir}/libGLSLC${SOLIBS}"
-FILES_libglslc-imx-dev = "${includedir}/CL ${libdir}/libGLSLC${SOLIBSDEV}"
-
-FILES_libopencl-imx = "${libdir}/libOpenCL${SOLIBS} \
-                       ${libdir}/libVivanteOpenCL${SOLIBS} \
-                       ${libdir}/libLLVM_viv${SOLIBS} \
-                       ${sysconfdir}/OpenCL/vendors/Vivante.icd"
-FILES_libopencl-imx-dev = "${includedir}/CL ${libdir}/libOpenCL${SOLIBSDEV}"
-RDEPENDS_libopencl-imx= "libclc-imx"
-
-INSANE_SKIP_libopenvg-imx += "dev-so"
-FILES_libopenvg-imx = "${libdir}/libOpenVG*${SOLIBS}"
-FILES_libopenvg-imx-dev = "${includedir}/VG ${libdir}/libOpenVG*${SOLIBSDEV} ${libdir}/pkgconfig/vg.pc"
 RDEPENDS_libopenvg-imx += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd-gpuconfig', '', d)}"
 
-FILES_libvdk-imx = "${libdir}/libVDK*${SOLIBS}"
-FILES_libvdk-imx-dev = "${includedir}/*vdk*.h ${libdir}/libVDK${SOLIBSDEV}"
-INSANE_SKIP_libvdk-imx += "dev-so"
-
-FILES_libvivante-dri-imx = "${libdir}/dri/vivante_dri.so"
-RDEPENDS_libvivante-dri-imx = "libdrm"
-
-INSANE_SKIP_libwayland-viv-imx += "dev-so"
-FILES_libwayland-viv-imx =  "${libdir}/libwayland-viv${REALSOLIBS}  ${libdir}/libwayland-viv${SOLIBS}"
-FILES_libwayland-viv-imx-dev = "${includedir}/wayland-viv ${libdir})/libwayland-viv${SOLIBSDEV} ${libdir}/pkgconfig/wayland-viv.pc"
-RPROVIDES_libwayland-viv-imx += "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'xf86-video-imx-vivante', '', d)}"
-
-INSANE_SKIP_libgc-wayland-protocol-imx += "dev-so"
-FILES_libgc-wayland-protocol-imx = "${libdir}/libgc_wayland_protocol${REALSOLIBS} ${libdir}/libgc_wayland_protocol${SOLIBS}"
-FILES_libgc-wayland-protocol-imx-dev = "${libdir}/libgc_wayland_protocol${SOLIBSDEV} ${libdir}/pkgconfig/gc_wayland_protocol.pc"
-
-FILES_imx-gpu-viv-tools = "${bindir}/gmem_info"
-
-FILES_imx-gpu-viv-demos = "/opt"
-INSANE_SKIP_imx-gpu-viv-demos += "rpaths dev-deps"
-
-# COMPATIBLE_MACHINE = "(mx6q|mx6dl|mx6sx|mx6sl|mx8)"
+# Digi custom change: we include the imx-gpu-viv driver as built-in in the
+# kernel, so this dependency isn't necessary
+RDEPENDS_libgal-imx_remove = "kernel-module-imx-gpu-viv"
diff --git a/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv/Add-dummy-libgl.patch b/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv/Add-dummy-libgl.patch
new file mode 100644
index 000000000..36d61ac5b
--- /dev/null
+++ b/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv/Add-dummy-libgl.patch
@@ -0,0 +1,6 @@
+Index: imx-gpu-viv-6.4.0.p0.2-aarch32/gpu-core/usr/lib/libGL.so.1.2
+===================================================================
+--- /dev/null
++++ imx-gpu-viv-6.4.0.p0.2-aarch32/gpu-core/usr/lib/libGL.so.1.2
+@@ -0,0 +1 @@
++dummy
diff --git a/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.2.4.p4.6-aarch32.bb b/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.2.4.p4.6-aarch32.bb
deleted file mode 100644
index c19e182c6..000000000
--- a/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.2.4.p4.6-aarch32.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require imx-gpu-viv-v6.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=fd4b227530cd88a82af6a5982cfb724d"
-
-SRC_URI[md5sum] = "24b5cd3a0bec8f91d82f404c61c6f7a7"
-SRC_URI[sha256sum] = "59ab4f99cb8455cdfabd9228e2066190bbc229f758425846c60e853c2f70c26f"
-
-COMPATIBLE_MACHINE = "(mx6q|mx6dl|mx6sx|mx6sl|mx7ulp)"
diff --git a/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.2.4.p4.6-aarch64.bb b/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.2.4.p4.6-aarch64.bb
deleted file mode 100644
index 40ecd825c..000000000
--- a/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.2.4.p4.6-aarch64.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require imx-gpu-viv-v6.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=fd4b227530cd88a82af6a5982cfb724d"
-
-SRC_URI[md5sum] = "c0e0431e8d67e57301b7fa91369cd6c5"
-SRC_URI[sha256sum] = "0b7eda7d702c06a2b5274b93d870e8370bc85961f6e98b8d41afcfc86e384d80"
-
-COMPATIBLE_MACHINE = "(mx8)"
diff --git a/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.0.p2.2-aarch32.bb b/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.0.p2.2-aarch32.bb
new file mode 100644
index 000000000..475dfd06e
--- /dev/null
+++ b/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.0.p2.2-aarch32.bb
@@ -0,0 +1,19 @@
+require imx-gpu-viv-v6.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=228c72f2a91452b8a03c4cab30f30ef9"
+
+# FIXME: Remove this patch when upstream handles backend-specific libGL
+SRC_URI += "file://Add-dummy-libgl.patch"
+
+SRC_URI[md5sum] = "4733a2638815fe2242a396a1e9385258"
+SRC_URI[sha256sum] = "cd3bc4d6be6d620aa8b15ed783b1d1e5a1b209130e12bc96163af0ab7d07e371"
+
+do_install_append() {
+    if [ "${IS_MX6SL}" != "1" ]; then
+        if [ "${USE_WL}" = "yes" -o "${USE_X11}" = "yes" ]; then
+            cp ${S}/gpu-core/usr/lib/libGL-${backend}.so ${D}${libdir}/libGL.so.1.2.0
+        fi
+    fi
+}
+
+COMPATIBLE_MACHINE = "(mx6q|mx6dl|mx6sx|mx6sl|mx7ulp)"
diff --git a/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.0.p2.2-aarch64.bb b/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.0.p2.2-aarch64.bb
new file mode 100644
index 000000000..fd9141cfa
--- /dev/null
+++ b/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.0.p2.2-aarch64.bb
@@ -0,0 +1,17 @@
+require imx-gpu-viv-v6.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=228c72f2a91452b8a03c4cab30f30ef9"
+
+# FIXME: Remove this patch when upstream handles backend-specific libGL
+SRC_URI += "file://Add-dummy-libgl.patch"
+
+SRC_URI[md5sum] = "66a99971a0fd6c49840194096720f639"
+SRC_URI[sha256sum] = "5609e0e22fc0bd88f2bd5e8c5e4e3f3c08701e144a22ffe741cdbe6877b4dd77"
+
+do_install_append() {
+    if [ "${USE_WL}" = "yes" -o "${USE_X11}" = "yes" ]; then
+        cp ${S}/gpu-core/usr/lib/libGL-${backend}.so ${D}${libdir}/libGL.so.1.2.0
+    fi
+}
+
+COMPATIBLE_MACHINE = "(mx8)"