Merge pull request #1635 from Freescale/topic/upgrade-graphics

Upgrade graphics packages

16 files changed, 95 insertions, 39 deletions

diff --git a/recipes-graphics/drm/libdrm_2.4.114.imx.bb b/recipes-graphics/drm/libdrm_2.4.114.imx.bb
index 42893cbf..969e738c 100644
--- a/recipes-graphics/drm/libdrm_2.4.114.imx.bb
+++ b/recipes-graphics/drm/libdrm_2.4.114.imx.bb
@@ -14,7 +14,7 @@ DEPENDS = "libpthread-stubs"
 SRC_URI = "${IMX_LIBDRM_SRC};branch=${SRCBRANCH}"
 IMX_LIBDRM_SRC ?= "git://github.com/nxp-imx/libdrm-imx.git;protocol=https;nobranch=1"
 SRCBRANCH ?= "libdrm-imx-2.4.114"
-SRCREV = "68531f3f411d65f71e4616f51e3ab841a7bac0aa"
+SRCREV = "3660ea0fee6f2f131eca73cd4c30d20021a84284"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.6.bb b/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.8.bb
index 8d26e7a5..848ca7d1 100644
--- a/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.6.bb
+++ b/recipes-graphics/imx-g2d/imx-dpu-g2d_2.1.8.bb
@@ -4,14 +4,14 @@
 
 DESCRIPTION = "G2D library using i.MX DPU"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=ea25d099982d035af85d193c88a1b479"
+LIC_FILES_CHKSUM = "file://COPYING;md5=63a38e9f392d8813d6f1f4d0d6fbe657"
 
 DEPENDS = "libgal-imx libdrm"
 PROVIDES += "virtual/libg2d"
 
 SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true"
-SRC_URI[md5sum] = "ab5972089fe8746dc5fa5388e432a154"
-SRC_URI[sha256sum] = "771d71b5766f148bfb349cbc069a1808ad43f881d17cb11ec2ca27a959a9ad34"
+SRC_URI[md5sum] = "0f7ceac3f8ce97d4f0f6ad5bb8a5bbd2"
+SRC_URI[sha256sum] = "dfcda2c286076bb6080261901241eac2a9e9db8ebbd00f301d8f49665af4c835"
 
 inherit fsl-eula-unpack
 
diff --git a/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb b/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb
index c5f2158e..649a16d2 100644
--- a/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb
+++ b/recipes-graphics/imx-g2d/imx-g2d-samples_git.bb
@@ -10,7 +10,7 @@ PV = "2.1+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"
-SRCREV = "a5f620fcf0e986a19e4acdfa48c95eaf79a5c570"
+SRCREV = "4391dcda499870418bb38fe395c3cba0664c5bab"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p1.0.bb b/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p1.2.bb
index 1d4e3cc5..fce3fe3d 100644
--- a/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p1.0.bb
+++ b/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p1.2.bb
@@ -5,16 +5,17 @@
 
 DESCRIPTION = "G2D library using i.MX GPU"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://COPYING;md5=ea25d099982d035af85d193c88a1b479"
+LIC_FILES_CHKSUM = "file://COPYING;md5=63a38e9f392d8813d6f1f4d0d6fbe657"
 DEPENDS = "libgal-imx"
 PROVIDES = "virtual/libg2d"
 
-SRC_URI = "${FSL_MIRROR}/${FSLBIN_NAME}.bin;name=${TARGET_ARCH};fsl-eula=true"
 FSLBIN_NAME = "${PN}-${PV}-${TARGET_ARCH}"
-SRC_URI[aarch64.md5sum] = "7aafa5910ef3e3be1c449b4bddd97b56"
-SRC_URI[aarch64.sha256sum] = "9bf8ebbfc85245d75ab7d133c3e135a4c5f23a0430c75883af9700e9cb82c151"
-SRC_URI[arm.md5sum] = "e0da61541b0b95083a3c95cc0bba4f63"
-SRC_URI[arm.sha256sum] = "65427c12b43c7bb3838ec2bc91a5853c310652b920a65b2b52bacad8e761a8e4"
+
+SRC_URI = "${FSL_MIRROR}/${FSLBIN_NAME}.bin;name=${TARGET_ARCH};fsl-eula=true"
+SRC_URI[aarch64.md5sum] = "f345087b5046fd63c418771f0929350d"
+SRC_URI[aarch64.sha256sum] = "cdf096c9b15c773ad600b24ec8888c1c4a33711c195c655e9411d4b66a992c25"
+SRC_URI[arm.md5sum] = "f02c7df5f52b97a7b453179dedd44189"
+SRC_URI[arm.sha256sum] = "1ed29a4818161198b658ffc428dff7c154c38f5ba48d7358ed9b0be261d72b99"
 
 S = "${WORKDIR}/${FSLBIN_NAME}"
 
diff --git a/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb b/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb
index 0f444cfa..0735d89c 100644
--- a/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb
+++ b/recipes-graphics/imx-g2d/imx-pxp-g2d_git.bb
@@ -4,7 +4,7 @@
 
 DESCRIPTION = "G2D library using i.MX PXP"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=ea25d099982d035af85d193c88a1b479"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=63a38e9f392d8813d6f1f4d0d6fbe657"
 
 PROVIDES += "virtual/libg2d"
 
@@ -13,7 +13,7 @@ PV = "2.1.0+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 = "8887f6bbf533affef7e22a65179a08a25f1547f1"
+SRCREV = "667c4ccbba208f47ac6d78f11a2c30737c66600f"
 
 S = "${WORKDIR}/git"
 
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 affdf1c6..59d1716f 100644
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc
@@ -74,9 +74,11 @@ PE = "1"
 
 inherit fsl-eula-unpack
 
-SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true \
-           file://imx_icd.json"
 FILESEXTRAPATHS:append := "${THISDIR}/imx-gpu-viv:"
+SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true \
+           file://imx_icd.json"
+
+S = "${WORKDIR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}"
 
 PACKAGECONFIG ?= ""
 
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p1.0-aarch32.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p1.0-aarch32.bb
deleted file mode 100644
index 846fa31d..00000000
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p1.0-aarch32.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright (C) 2013-2016 Freescale Semiconductor
-# Copyright 2017-2020 NXP
-# Released under the MIT license (see COPYING.MIT for the terms)
-
-require imx-gpu-viv-6.inc
-
-SRC_URI[md5sum] = "9a1796264d9a07205e3ec7bc184599c8"
-SRC_URI[sha256sum] = "6e2f3fb43d16c30fd0b23027f5205818e9d4c74d4903f1c63f265ccf8269f01d"
-
-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.0-aarch64.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p1.0-aarch64.bb
deleted file mode 100644
index c1cde9f3..00000000
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p1.0-aarch64.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require imx-gpu-viv-6.inc
-
-SRC_URI[md5sum] = "f7b41c4f8bfa25959796d240ca0bb285"
-SRC_URI[sha256sum] = "4a5f2235500dc4bdfaaeaffa0e4c13cdd28436cc0d859e5be222bce990fda461"
-
-INSANE_SKIP:append:libc-musl = " file-rdeps"
-RDEPENDS:${PN}:append:libc-musl = " gcompat"
-
-COMPATIBLE_MACHINE = "(mx8-nxp-bsp)"
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
new file mode 100644
index 00000000..07834a3b
--- /dev/null
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p1.2-aarch32.bb
@@ -0,0 +1,10 @@
+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
new file mode 100644
index 00000000..6201ee38
--- /dev/null
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p1.2-aarch64.bb
@@ -0,0 +1,10 @@
+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/wayland/wayland-protocols_1.31.imx.bb b/recipes-graphics/wayland/wayland-protocols_1.31.imx.bb
index 294ff920..534f46c8 100644
--- a/recipes-graphics/wayland/wayland-protocols_1.31.imx.bb
+++ b/recipes-graphics/wayland/wayland-protocols_1.31.imx.bb
@@ -11,6 +11,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c7b12b6702da38ca028ace54aae3d484 \
 
 SRC_URI = "git://github.com/nxp-imx/wayland-protocols-imx.git;protocol=https;branch=wayland-protocols-imx-1.31"
 SRCREV = "99a2a439fc6b5d25d41bfec9c9b459408a45bf92"
+
 S = "${WORKDIR}/git"
 
 UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html"
@@ -24,5 +25,7 @@ EXTRA_OEMESON += "-Dtests=false"
 PACKAGES = "${PN}"
 FILES:${PN} += "${datadir}/pkgconfig/wayland-protocols.pc"
 
+BBCLASSEXTEND = "native nativesdk"
+
 PACKAGE_ARCH = "${MACHINE_SOCARCH}"
 COMPATIBLE_MACHINE = "(mx6-nxp-bsp|mx7-nxp-bsp|mx8-nxp-bsp|mx9-nxp-bsp)"
diff --git a/recipes-graphics/wayland/weston/xwayland.weston-start b/recipes-graphics/wayland/weston/xwayland.weston-start
index 342ac8d1..49204f21 100644
--- a/recipes-graphics/wayland/weston/xwayland.weston-start
+++ b/recipes-graphics/wayland/weston/xwayland.weston-start
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 if type Xwayland  >/dev/null 2>/dev/null; then
-        mkdir -m 775 -p /tmp/.X11-unix
-        chown root:video /tmp/.X11-unix
+       mkdir -m 775 -p /tmp/.X11-unix
+       chown root:video /tmp/.X11-unix
 fi
diff --git a/recipes-graphics/wayland/weston_10.0.3.imx.bb b/recipes-graphics/wayland/weston_10.0.3.imx.bb
index f3e913fc..d5e2cf56 100644
--- a/recipes-graphics/wayland/weston_10.0.3.imx.bb
+++ b/recipes-graphics/wayland/weston_10.0.3.imx.bb
@@ -9,7 +9,7 @@ SUMMARY = "Weston, a Wayland compositor"
 DESCRIPTION = "Weston is the reference implementation of a Wayland compositor"
 HOMEPAGE = "http://wayland.freedesktop.org"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=d79ee9e66bb0f95d3386a7acae780b70 \
+LIC_FILES_CHKSUM = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70 \
                     file://libweston/compositor.c;endline=27;md5=eb6d5297798cabe2ddc65e2af519bcf0 \
                     "
 
@@ -155,6 +155,9 @@ GROUPADD_PARAM:${PN} = "--system weston-launch"
 
 SUMMARY = "Weston, a Wayland compositor, i.MX fork"
 
+LIC_FILES_CHKSUM:remove = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70"
+LIC_FILES_CHKSUM:append = "file://LICENSE;md5=d79ee9e66bb0f95d3386a7acae780b70"
+
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI:remove = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${PV}/downloads/${BPN}-${PV}.tar.xz"
diff --git a/recipes-graphics/wayland/weston_11.0.1.imx.bb b/recipes-graphics/wayland/weston_11.0.1.imx.bb
index a14f8d99..4dcb6992 100644
--- a/recipes-graphics/wayland/weston_11.0.1.imx.bb
+++ b/recipes-graphics/wayland/weston_11.0.1.imx.bb
@@ -9,7 +9,7 @@ SUMMARY = "Weston, a Wayland compositor"
 DESCRIPTION = "Weston is the reference implementation of a Wayland compositor"
 HOMEPAGE = "http://wayland.freedesktop.org"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=d79ee9e66bb0f95d3386a7acae780b70 \
+LIC_FILES_CHKSUM = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70 \
                     file://libweston/compositor.c;endline=27;md5=eb6d5297798cabe2ddc65e2af519bcf0 \
                     "
 
@@ -150,6 +150,8 @@ GROUPADD_PARAM:${PN} = "--system weston-launch"
 ########### i.MX overrides ################
 
 SUMMARY = "Weston, a Wayland compositor, i.MX fork"
+LIC_FILES_CHKSUM:remove = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70"
+LIC_FILES_CHKSUM +=       "file://LICENSE;md5=d79ee9e66bb0f95d3386a7acae780b70"
 
 DEFAULT_PREFERENCE = "-1"
 
@@ -157,7 +159,7 @@ SRC_URI:remove = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${PV}
 SRC_URI:prepend = "git://github.com/nxp-imx/weston-imx.git;protocol=https;branch=${SRCBRANCH} "
 SRC_URI += "file://0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch"
 SRCBRANCH = "weston-imx-11.0.1"
-SRCREV = "36ab06f0ad8e8981a482df6a08f39e1ae2a6a2dd"
+SRCREV = "12875cd94a42fc96d4236de46762ef358e3ec913"
 S = "${WORKDIR}/git"
 
 PACKAGECONFIG_IMX_REMOVALS ?= "wayland x11"
diff --git a/recipes-graphics/xorg-xserver/xserver-xorg/0001-glamor-Fix-fbo-pixmap-format-with-GL_BGRA_EXT.patch b/recipes-graphics/xorg-xserver/xserver-xorg/0001-glamor-Fix-fbo-pixmap-format-with-GL_BGRA_EXT.patch
new file mode 100644
index 00000000..d7166522
--- /dev/null
+++ b/recipes-graphics/xorg-xserver/xserver-xorg/0001-glamor-Fix-fbo-pixmap-format-with-GL_BGRA_EXT.patch
@@ -0,0 +1,42 @@
+From c76f5d2c0a0dda534888025d7236465202884665 Mon Sep 17 00:00:00 2001
+From: Xianzhong <xianzhong.li@nxp.com>
+Date: Thu, 5 Aug 2021 16:57:43 +0800
+Subject: [PATCH] glamor: Fix fbo pixmap format with GL_BGRA_EXT
+
+Red and Blue channels are swizzled in GLES path,
+Fix color inverse problem with ximagesink command:
+gst-launch-1.0 videotestsrc pattern=6 num-buffers=1 ! video/x-raw,format=BGRx ! videoconvert ! ximagesink display=:0 -v
+
+This fix requires GL_EXT_texture_format_BGRA8888 extention, not applicable for upstream.
+
+Upstream-Status: Inappropriate
+
+Signed-off-by: Xianzhong <xianzhong.li@nxp.com>
+---
+ glamor/glamor.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/glamor/glamor.c b/glamor/glamor.c
+index 3450113e0..e327b9db8 100644
+--- a/glamor/glamor.c
++++ b/glamor/glamor.c
+@@ -574,10 +574,17 @@ glamor_setup_formats(ScreenPtr screen)
+ 
+     if (glamor_priv->is_gles) {
+         assert(X_BYTE_ORDER == X_LITTLE_ENDIAN);
++#if GL_EXT_texture_format_BGRA8888
++        glamor_add_format(screen, 24, PICT_x8r8g8b8,
++                          GL_BGRA_EXT, GL_BGRA_EXT, GL_UNSIGNED_BYTE);
++        glamor_add_format(screen, 32, PICT_a8r8g8b8,
++                          GL_BGRA_EXT, GL_BGRA_EXT, GL_UNSIGNED_BYTE);
++#else
+         glamor_add_format(screen, 24, PICT_x8b8g8r8,
+                           GL_RGBA8, GL_RGBA, GL_UNSIGNED_BYTE);
+         glamor_add_format(screen, 32, PICT_a8b8g8r8,
+                           GL_RGBA8, GL_RGBA, GL_UNSIGNED_BYTE);
++#endif
+     } else {
+         glamor_add_format(screen, 24, PICT_x8r8g8b8,
+                           GL_RGBA, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV);
+-- 
+2.17.1
diff --git a/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend b/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend
index 161df049..cf1c3a50 100644
--- a/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend
+++ b/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend
@@ -2,6 +2,8 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
 
 SRC_URI:append:use-mainline-bsp = " file://0001-Allow-to-enable-atomic-in-modesetting-DDX.patch"
 
+SRC_URI:append:imxgpu = " file://0001-glamor-Fix-fbo-pixmap-format-with-GL_BGRA_EXT.patch"
+
 IMX_OPENGL_PKGCONFIGS_REMOVE        = ""
 IMX_OPENGL_PKGCONFIGS_REMOVE:imxgpu = "glamor"
 OPENGL_PKGCONFIGS:remove:mx6-nxp-bsp        = "${IMX_OPENGL_PKGCONFIGS_REMOVE}"