From 814fbeab2d4881e2e2fed9f0876d586286bddcf6 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Tue, 14 Jan 2025 09:57:55 -0800 Subject: imx-base.inc: Drop redundant mesa setting The default graphics provider is already set to mesa in poky/meta/conf/distro/include/default-providers.inc, which is included by bitbake.conf. Signed-off-by: Tom Hochstein (cherry picked from commit c459a9974bce18aeaa159d9b4f65bcb7757a6e84) --- conf/machine/include/imx-base.inc | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 32da2ea5..9f1b6641 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc @@ -554,12 +554,7 @@ SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT:imxgpu = "1" # 1 - machine has Vivante GPU driver support MACHINE_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT ?= "${SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT}" -# Graphics libraries -PREFERRED_PROVIDER_virtual/egl ?= "mesa" -PREFERRED_PROVIDER_virtual/libgl ?= "mesa" -PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa" -PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa" - +# Override graphics for i.MX GPU PREFERRED_PROVIDER_virtual/egl:imxgpu ?= "imx-gpu-viv" PREFERRED_PROVIDER_virtual/libgl:imxgpu ?= "mesa-gl" PREFERRED_PROVIDER_virtual/mesa:imxgpu ?= "mesa-gl" -- cgit v1.2.3-54-g00ecf From 9a6e6469f984ef9729b6a584c3a626b3ab1a3616 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Tue, 14 Jan 2025 09:57:55 -0800 Subject: imx-base.inc: Add imxviv and imxmali overrides The recipe overrides for Mali are set currently by mx95 override. Add imxmali and imxviv overrides for a simpler, scalable model. Use the new model to set the preferred providers for the graphics libraries. Signed-off-by: Tom Hochstein (cherry picked from commit 7afa05781cb210bcf56b2228f2609c103badb822) --- conf/machine/include/imx-base.inc | 68 ++++++++++++++++++--------------------- 1 file changed, 32 insertions(+), 36 deletions(-) diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 9f1b6641..1c40909d 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc @@ -190,12 +190,12 @@ IMX_SOC_REV_UPPER = "${@d.getVar('IMX_SOC_REV').upper()}" ### NXP BSP specific overrides ####### -MACHINEOVERRIDES_EXTENDER:mx6q:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxipu:imxvpu:imxgpu:imxgpu2d:imxgpu3d:mx6-generic-bsp:mx6-nxp-bsp:mx6q-generic-bsp:mx6q-nxp-bsp" -MACHINEOVERRIDES_EXTENDER:mx6dl:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxpxp:imxipu:imxvpu:imxgpu:imxgpu2d:imxgpu3d:imxepdc:mx6-generic-bsp:mx6-nxp-bsp:mx6dl-generic-bsp:mx6dl-nxp-bsp" +MACHINEOVERRIDES_EXTENDER:mx6q:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxipu:imxvpu:imxgpu:imxviv:imxgpu2d:imxgpu3d:mx6-generic-bsp:mx6-nxp-bsp:mx6q-generic-bsp:mx6q-nxp-bsp" +MACHINEOVERRIDES_EXTENDER:mx6dl:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxpxp:imxipu:imxvpu:imxgpu:imxviv:imxgpu2d:imxgpu3d:imxepdc:mx6-generic-bsp:mx6-nxp-bsp:mx6dl-generic-bsp:mx6dl-nxp-bsp" -MACHINEOVERRIDES_EXTENDER:mx6sx:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxpxp:imxgpu:imxgpu2d:imxgpu3d:mx6-generic-bsp:mx6-nxp-bsp:mx6sx-generic-bsp:mx6sx-nxp-bsp" +MACHINEOVERRIDES_EXTENDER:mx6sx:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxpxp:imxgpu:imxviv:imxgpu2d:imxgpu3d:mx6-generic-bsp:mx6-nxp-bsp:mx6sx-generic-bsp:mx6sx-nxp-bsp" -MACHINEOVERRIDES_EXTENDER:mx6sl:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxpxp:imxgpu:imxgpu2d:imxepdc:mx6-generic-bsp:mx6-nxp-bsp:mx6sl-generic-bsp:mx6sl-nxp-bsp" +MACHINEOVERRIDES_EXTENDER:mx6sl:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxpxp:imxgpu:imxviv:imxgpu2d:imxepdc:mx6-generic-bsp:mx6-nxp-bsp:mx6sl-generic-bsp:mx6sl-nxp-bsp" MACHINEOVERRIDES_EXTENDER:mx6sll:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxpxp:imxepdc:mx6-generic-bsp:mx6-nxp-bsp:mx6sl-generic-bsp:mx6sl-nxp-bsp:mx6sll-generic-bsp:mx6sll-nxp-bsp" MACHINEOVERRIDES_EXTENDER:mx6ul:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxpxp:mx6-generic-bsp:mx6-nxp-bsp:mx6ul-generic-bsp:mx6ul-nxp-bsp" @@ -203,26 +203,26 @@ MACHINEOVERRIDES_EXTENDER:mx6ull:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxf MACHINEOVERRIDES_EXTENDER:mx6ulz:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxpxp:imxepdc:mx6-generic-bsp:mx6-nxp-bsp:mx6ul-generic-bsp:mx6ul-nxp-bsp:mx6ull-generic-bsp:mx6ull-nxp-bsp:mx6ulz-generic-bsp:mx6ulz-nxp-bsp" MACHINEOVERRIDES_EXTENDER:mx7d:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxpxp:imxepdc:mx7-generic-bsp:mx7-nxp-bsp:mx7d-generic-bsp:mx7d-nxp-bsp" -MACHINEOVERRIDES_EXTENDER:mx7ulp:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxpxp:imxgpu:imxgpu2d:imxgpu3d:mx7-generic-bsp:mx7-nxp-bsp:mx7ulp-generic-bsp:mx7ulp-nxp-bsp" +MACHINEOVERRIDES_EXTENDER:mx7ulp:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:imxpxp:imxgpu:imxviv:imxgpu2d:imxgpu3d:mx7-generic-bsp:mx7-nxp-bsp:mx7ulp-generic-bsp:mx7ulp-nxp-bsp" MACHINEOVERRIDES_EXTENDER:vf:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:vf-generic-bsp:vf-nxp-bsp" -MACHINEOVERRIDES_EXTENDER:mx8qm:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxdpu:imxgpu:imxgpu2d:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8qm-generic-bsp:mx8qm-nxp-bsp" +MACHINEOVERRIDES_EXTENDER:mx8qm:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxdpu:imxgpu:imxviv:imxgpu2d:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8qm-generic-bsp:mx8qm-nxp-bsp" -MACHINEOVERRIDES_EXTENDER:mx8mm:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxvpu:imxgpu:imxgpu2d:imxgpu3d:mx8-generic-bsp:mx8-nxp-bsp:mx8m-generic-bsp:mx8m-nxp-bsp:mx8mm-generic-bsp:mx8mm-nxp-bsp" -MACHINEOVERRIDES_EXTENDER:mx8mn:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxgpu:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8m-generic-bsp:mx8m-nxp-bsp:mx8mn-generic-bsp:mx8mn-nxp-bsp" +MACHINEOVERRIDES_EXTENDER:mx8mm:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxvpu:imxgpu:imxviv:imxgpu2d:imxgpu3d:mx8-generic-bsp:mx8-nxp-bsp:mx8m-generic-bsp:mx8m-nxp-bsp:mx8mm-generic-bsp:mx8mm-nxp-bsp" +MACHINEOVERRIDES_EXTENDER:mx8mn:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxgpu:imxviv:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8m-generic-bsp:mx8m-nxp-bsp:mx8mn-generic-bsp:mx8mn-nxp-bsp" MACHINEOVERRIDES_EXTENDER:mx8mnul:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:mx8-generic-bsp:mx8-nxp-bsp:mx8m-generic-bsp:mx8m-nxp-bsp:mx8mnul-generic-bsp:mx8mnul-nxp-bsp" -MACHINEOVERRIDES_EXTENDER:mx8mp:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxvpu:imxgpu:imxgpu2d:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8m-generic-bsp:mx8m-nxp-bsp:mx8mp-generic-bsp:mx8mp-nxp-bsp" -MACHINEOVERRIDES_EXTENDER:mx8mq:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxvpu:imxgpu:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8m-generic-bsp:mx8m-nxp-bsp:mx8mq-generic-bsp:mx8mq-nxp-bsp" +MACHINEOVERRIDES_EXTENDER:mx8mp:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxvpu:imxgpu:imxviv:imxgpu2d:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8m-generic-bsp:mx8m-nxp-bsp:mx8mp-generic-bsp:mx8mp-nxp-bsp" +MACHINEOVERRIDES_EXTENDER:mx8mq:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxvpu:imxgpu:imxviv:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8m-generic-bsp:mx8m-nxp-bsp:mx8mq-generic-bsp:mx8mq-nxp-bsp" -MACHINEOVERRIDES_EXTENDER:mx8qxp:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxdpu:imxgpu:imxgpu2d:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8x-generic-bsp:mx8x-nxp-bsp:mx8qxp-generic-bsp:mx8qxp-nxp-bsp" -MACHINEOVERRIDES_EXTENDER:mx8dx:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxdpu:imxgpu:imxgpu2d:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8x-generic-bsp:mx8x-nxp-bsp:mx8dx-generic-bsp:mx8dx-nxp-bsp" +MACHINEOVERRIDES_EXTENDER:mx8qxp:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxdpu:imxgpu:imxviv:imxgpu2d:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8x-generic-bsp:mx8x-nxp-bsp:mx8qxp-generic-bsp:mx8qxp-nxp-bsp" +MACHINEOVERRIDES_EXTENDER:mx8dx:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxdpu:imxgpu:imxviv:imxgpu2d:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8x-generic-bsp:mx8x-nxp-bsp:mx8dx-generic-bsp:mx8dx-nxp-bsp" MACHINEOVERRIDES_EXTENDER:mx8dxl:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxfbdev:mx8-generic-bsp:mx8-nxp-bsp:mx8x-generic-bsp:mx8x-nxp-bsp:mx8dxl-generic-bsp:mx8dxl-nxp-bsp" -MACHINEOVERRIDES_EXTENDER:mx8ulp:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxgpu:imxgpu2d:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8ulp-generic-bsp:mx8ulp-nxp-bsp" +MACHINEOVERRIDES_EXTENDER:mx8ulp:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxgpu:imxviv:imxgpu2d:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8ulp-generic-bsp:mx8ulp-nxp-bsp" MACHINEOVERRIDES_EXTENDER:mx93:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxpxp:mx9-generic-bsp:mx9-nxp-bsp:mx93-generic-bsp:mx93-nxp-bsp" -MACHINEOVERRIDES_EXTENDER:mx95:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxdpu:imxgpu:imxgpu2d:imxgpu3d:mx9-generic-bsp:mx9-nxp-bsp:mx95-generic-bsp:mx95-nxp-bsp" +MACHINEOVERRIDES_EXTENDER:mx95:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxdpu:imxgpu:imxmali:imxgpu2d:imxgpu3d:mx9-generic-bsp:mx9-nxp-bsp:mx95-generic-bsp:mx95-nxp-bsp" ####### ### Mainline BSP specific overrides @@ -555,29 +555,25 @@ SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT:imxgpu = "1" MACHINE_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT ?= "${SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT}" # Override graphics for i.MX GPU -PREFERRED_PROVIDER_virtual/egl:imxgpu ?= "imx-gpu-viv" -PREFERRED_PROVIDER_virtual/libgl:imxgpu ?= "mesa-gl" -PREFERRED_PROVIDER_virtual/mesa:imxgpu ?= "mesa-gl" -PREFERRED_PROVIDER_virtual/libgles1:imxgpu3d ?= "imx-gpu-viv" -PREFERRED_PROVIDER_virtual/libgles2:imxgpu3d ?= "imx-gpu-viv" -PREFERRED_PROVIDER_virtual/libgles3:imxgpu3d ?= "imx-gpu-viv" -PREFERRED_PROVIDER_virtual/libg2d ?= "imx-gpu-g2d" -PREFERRED_PROVIDER_virtual/libg2d:imxdpu ?= "imx-dpu-g2d" +IMXGPU_GRAPHICS_PROVIDER:imxviv ?= "imx-gpu-viv" +IMXGPU_GRAPHICS_PROVIDER:imxmali ?= "mali-imx" + +PREFERRED_PROVIDER_virtual/egl:imxgpu ?= "${IMXGPU_GRAPHICS_PROVIDER}" +PREFERRED_PROVIDER_virtual/libgl:imxgpu ?= "mesa-gl" +PREFERRED_PROVIDER_virtual/mesa:imxgpu ?= "mesa-gl" +PREFERRED_PROVIDER_virtual/libgles1:imxgpu3d ?= "${IMXGPU_GRAPHICS_PROVIDER}" +PREFERRED_PROVIDER_virtual/libgles2:imxgpu3d ?= "${IMXGPU_GRAPHICS_PROVIDER}" +PREFERRED_PROVIDER_virtual/libgles3:imxgpu3d ?= "${IMXGPU_GRAPHICS_PROVIDER}" + +# The Vivante OpenCL implementation doesn't work with the standard headers and loader +PREFERRED_PROVIDER_opencl-clhpp:imxviv ?= "imx-gpu-viv" +PREFERRED_PROVIDER_opencl-headers:imxviv ?= "imx-gpu-viv" +PREFERRED_PROVIDER_opencl-icd-loader:imxviv ?= "imx-gpu-viv" +PREFERRED_PROVIDER_virtual/opencl-icd:imxviv ?= "imx-gpu-viv" + +PREFERRED_PROVIDER_virtual/libg2d ?= "imx-gpu-g2d" +PREFERRED_PROVIDER_virtual/libg2d:imxdpu ?= "imx-dpu-g2d" PREFERRED_PROVIDER_virtual/libg2d:mx93-nxp-bsp ?= "imx-pxp-g2d" -PREFERRED_PROVIDER_opencl-clhpp:imxgpu ?= "imx-gpu-viv" -PREFERRED_PROVIDER_opencl-headers:imxgpu ?= "imx-gpu-viv" -PREFERRED_PROVIDER_opencl-icd-loader:imxgpu ?= "imx-gpu-viv" -PREFERRED_PROVIDER_virtual/opencl-icd:imxgpu ?= "imx-gpu-viv" - -PREFERRED_PROVIDER_virtual/egl:mx95-nxp-bsp ?= "mali-imx" -PREFERRED_PROVIDER_virtual/libgles1:mx95-nxp-bsp ?= "mali-imx" -PREFERRED_PROVIDER_virtual/libgles2:mx95-nxp-bsp ?= "mali-imx" -PREFERRED_PROVIDER_virtual/libgles3:mx95-nxp-bsp ?= "mali-imx" -PREFERRED_PROVIDER_opencl-clhpp:mx95-nxp-bsp ?= "opencl-clhpp" -PREFERRED_PROVIDER_opencl-headers:mx95-nxp-bsp ?= "opencl-headers" -# install libmali-opencl-icd package as the loaders backend -PREFERRED_PROVIDER_opencl-icd-loader:mx95-nxp-bsp ?= "opencl-icd-loader" -PREFERRED_PROVIDER_virtual/opencl-icd:mx95-nxp-bsp ?= "opencl-icd-loader" PREFERRED_VERSION_weston:imx-nxp-bsp ??= "12.0.4.imx" # i.MX 6 & 7 stay on weston 10.0 for fbdev -- cgit v1.2.3-54-g00ecf From bdab4120eed6b14c513ec7250fa5abf70c753382 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Tue, 14 Jan 2025 09:57:55 -0800 Subject: imx-dpu-g2d: Use imxviv and imxmali overrides Signed-off-by: Tom Hochstein (cherry picked from commit b92810f60fe54e188a2653d3091bc7c81a979ae2) --- recipes-graphics/imx-g2d/imx-dpu-g2d_2.2.0.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 index 5e8f5402..63ed3626 100644 --- a/recipes-graphics/imx-g2d/imx-dpu-g2d_2.2.0.bb +++ b/recipes-graphics/imx-g2d/imx-dpu-g2d_2.2.0.bb @@ -7,8 +7,8 @@ LICENSE = "Proprietary" LIC_FILES_CHKSUM = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837" DEPENDS = "libdrm ${LIBGAL_IMX}" -LIBGAL_IMX = "libgal-imx" -LIBGAL_IMX:mx95-nxp-bsp = "" +LIBGAL_IMX = "" +LIBGAL_IMX:imxviv = "libgal-imx" PROVIDES += "virtual/libg2d" @@ -19,8 +19,8 @@ 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" +IMX_SRCREV_ABBREV:imxmali = "7943590" +IMX_SRC_URI_NAME:imxmali = "v2" SRC_URI[v2.sha256sum] = "c0a87908cd04c208659423746a57eaee6a30b4d680ec871f3495ad4a2acb5076" S = "${WORKDIR}/${IMX_BIN_NAME}" -- cgit v1.2.3-54-g00ecf From f6ab99568ac277e1d5af545bfce29ea82573a6b6 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Tue, 14 Jan 2025 09:57:55 -0800 Subject: imx-gpu-apitrace: Simplify package config logic There's no need for the SOC-specific overrides. Signed-off-by: Tom Hochstein (cherry picked from commit fcf874bb22eb4a815b3c75fbff46ae30b6de45b3) --- .../imx-gpu-apitrace/imx-gpu-apitrace_10.0.0.bb | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_10.0.0.bb b/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_10.0.0.bb index 7d97f475..053fbf3e 100644 --- a/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_10.0.0.bb +++ b/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_10.0.0.bb @@ -13,24 +13,20 @@ S = "${WORKDIR}/git" inherit cmake pkgconfig perlnative python3native -PACKAGECONFIG_BACKEND:mx6-nxp-bsp = " \ +PACKAGECONFIG ??= " \ + egl \ + ${PACKAGECONFIG_BACKEND} \ + ${PACKAGECONFIG_GPU2D} \ +" +PACKAGECONFIG_BACKEND = " \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'waffle', \ bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', \ '', d), d)} \ " -PACKAGECONFIG_BACKEND:mx7-nxp-bsp = "${PACKAGECONFIG_BACKEND:mx6-nxp-bsp}" -PACKAGECONFIG_BACKEND:mx8-nxp-bsp = "waffle" -PACKAGECONFIG_BACKEND:mx95-nxp-bsp = "waffle" - PACKAGECONFIG_GPU2D = "" PACKAGECONFIG_GPU2D:imxgpu2d = "vivante" PACKAGECONFIG_GPU2D:mx95-nxp-bsp = "" -PACKAGECONFIG ??= " \ - egl \ - ${PACKAGECONFIG_BACKEND} \ - ${PACKAGECONFIG_GPU2D} \ -" PACKAGECONFIG[egl] = "-DENABLE_EGL=ON,-DENABLE_EGL=OFF,virtual/egl" PACKAGECONFIG[gui] = "-DENABLE_GUI=ON,-DENABLE_GUI=OFF" -- cgit v1.2.3-54-g00ecf From afbaaf89a730eeab761f4e9f617e9c0b6fb316a6 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Tue, 14 Jan 2025 09:57:55 -0800 Subject: imx-gpu-apitrace: Use imxviv override Signed-off-by: Tom Hochstein (cherry picked from commit a20bb97155edc41401f09d6b25955f727eb751ef) --- recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_10.0.0.bb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_10.0.0.bb b/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_10.0.0.bb index 053fbf3e..18fad56e 100644 --- a/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_10.0.0.bb +++ b/recipes-graphics/imx-gpu-apitrace/imx-gpu-apitrace_10.0.0.bb @@ -23,10 +23,8 @@ PACKAGECONFIG_BACKEND = " \ bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', \ '', d), d)} \ " -PACKAGECONFIG_GPU2D = "" -PACKAGECONFIG_GPU2D:imxgpu2d = "vivante" -PACKAGECONFIG_GPU2D:mx95-nxp-bsp = "" - +PACKAGECONFIG_GPU2D = "" +PACKAGECONFIG_GPU2D:imxviv:imxgpu2d = "vivante" PACKAGECONFIG[egl] = "-DENABLE_EGL=ON,-DENABLE_EGL=OFF,virtual/egl" PACKAGECONFIG[gui] = "-DENABLE_GUI=ON,-DENABLE_GUI=OFF" -- cgit v1.2.3-54-g00ecf From f5e481173839cca959791400ace28d806a25469a Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Tue, 14 Jan 2025 09:57:55 -0800 Subject: vulkan-loader: Use imxviv and imxmali overrides Signed-off-by: Tom Hochstein (cherry picked from commit e29f4d51150e8f0906eecc177dd66d62b3c70d59) --- recipes-graphics/vulkan/vulkan-loader_1.3.275.0.imx.bbappend | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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 index 9b0ce3b9..f4624921 100644 --- a/recipes-graphics/vulkan/vulkan-loader_1.3.275.0.imx.bbappend +++ b/recipes-graphics/vulkan/vulkan-loader_1.3.275.0.imx.bbappend @@ -10,6 +10,5 @@ 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" +RRECOMMENDS:${PN}:imxviv = "libvulkan-imx" +RRECOMMENDS:${PN}:imxmali = "mali-imx-libvulkan" -- cgit v1.2.3-54-g00ecf From f6c96621948f0ed2213d84fbee75c62e55efe88d Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Tue, 14 Jan 2025 09:57:55 -0800 Subject: imx-gst1.0-plugin: Simplify imx-opencl-converter dependency Since imx-opencl-converter is supported going forward, the logic is simpler if that is the default and only the exceptions must be noted. Signed-off-by: Tom Hochstein (cherry picked from commit bb7ca61eb399fc9ecc5189ddef162970297ece35) --- recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb index e139c73c..53c5106c 100644 --- a/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb +++ b/recipes-multimedia/gstreamer/imx-gst1.0-plugin_git.bb @@ -24,10 +24,10 @@ DEPENDS:append:imxvpu = " imx-vpuwrap" DEPENDS:append:imxfbdev:imxgpu = " libdrm" DEPENDS_IMXGPU = "" DEPENDS_IMXGPU:imxgpu = "${DEPENDS_IMX_OPENCL_CONVERTER}" -DEPENDS_IMX_OPENCL_CONVERTER = "" -DEPENDS_IMX_OPENCL_CONVERTER:mx8-nxp-bsp = "imx-opencl-converter" +DEPENDS_IMX_OPENCL_CONVERTER = "imx-opencl-converter" +DEPENDS_IMX_OPENCL_CONVERTER:mx6-nxp-bsp = "" +DEPENDS_IMX_OPENCL_CONVERTER:mx7-nxp-bsp = "" DEPENDS_IMX_OPENCL_CONVERTER:mx8mm-nxp-bsp = "" -DEPENDS_IMX_OPENCL_CONVERTER:mx95-nxp-bsp = "imx-opencl-converter" # For backwards compatibility RREPLACES:${PN} = "gst1.0-fsl-plugin" -- cgit v1.2.3-54-g00ecf From ed84b00c34d241381034e2064ee191aaafdc2e80 Mon Sep 17 00:00:00 2001 From: Valentin Jec Date: Wed, 15 Jan 2025 19:28:06 +0200 Subject: imx-g2d*: Upgrade Graphics BSP to LF6.6.52_2.2.0 Bump imx-dpu-g2d version 2.2.0 -> 2.2.2 Bump imx-gpu-g2d version 6.4.11.p2.8 -> 6.4.11.p2.10 Signed-off-by: Valentin Jec (cherry picked from commit 0b15cdb139c08825de7a2559292b653f55828e62) --- recipes-graphics/imx-g2d/imx-dpu-g2d_2.2.0.bb | 47 ---------------------- recipes-graphics/imx-g2d/imx-dpu-g2d_2.2.2.bb | 47 ++++++++++++++++++++++ .../imx-g2d/imx-gpu-g2d_6.4.11.p2.10.bb | 42 +++++++++++++++++++ .../imx-g2d/imx-gpu-g2d_6.4.11.p2.8.bb | 42 ------------------- 4 files changed, 89 insertions(+), 89 deletions(-) delete mode 100644 recipes-graphics/imx-g2d/imx-dpu-g2d_2.2.0.bb create mode 100644 recipes-graphics/imx-g2d/imx-dpu-g2d_2.2.2.bb create mode 100644 recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.10.bb delete mode 100644 recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.8.bb 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 deleted file mode 100644 index 63ed3626..00000000 --- a/recipes-graphics/imx-g2d/imx-dpu-g2d_2.2.0.bb +++ /dev/null @@ -1,47 +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=ca53281cc0caa7e320d4945a896fb837" - -DEPENDS = "libdrm ${LIBGAL_IMX}" -LIBGAL_IMX = "" -LIBGAL_IMX:imxviv = "libgal-imx" - -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:imxmali = "7943590" -IMX_SRC_URI_NAME:imxmali = "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-dpu-g2d_2.2.2.bb b/recipes-graphics/imx-g2d/imx-dpu-g2d_2.2.2.bb new file mode 100644 index 00000000..2ebff0c2 --- /dev/null +++ b/recipes-graphics/imx-g2d/imx-dpu-g2d_2.2.2.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:imxviv = "libgal-imx" + +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 = "e2dce80" +IMX_SRC_URI_NAME = "v1" +SRC_URI[v1.sha256sum] = "d43b5d4b8e6015a029c6e8854982aa5d57de25bc0e3ff8209d4aab7679c2d240" + +IMX_SRCREV_ABBREV:imxmali = "e2dce80" +IMX_SRC_URI_NAME:imxmali = "v2" +SRC_URI[v2.sha256sum] = "d9845356e0c9c959b1d57ebb3ee668ba6aa2b864999263a8c33cb053b83584e6" + +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-gpu-g2d_6.4.11.p2.10.bb b/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.10.bb new file mode 100644 index 00000000..342c29f0 --- /dev/null +++ b/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.10.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 = "accdd64" +SRC_URI[aarch64.sha256sum] = "780479f19142126ed58e12222b80f8f3b882ad3d223ff61b7ea02001f517ff03" +SRC_URI[arm.sha256sum] = "cd4fd05dd6f6880edc3255c85fe08094a07ea4cd3eee947df004dcb8f37bc8fa" + +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-gpu-g2d_6.4.11.p2.8.bb b/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.8.bb deleted file mode 100644 index 7ce542d0..00000000 --- a/recipes-graphics/imx-g2d/imx-gpu-g2d_6.4.11.p2.8.bb +++ /dev/null @@ -1,42 +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=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)" -- cgit v1.2.3-54-g00ecf From 605a081e551b326d5259c318a2387d888440e7fb Mon Sep 17 00:00:00 2001 From: Valentin Jec Date: Wed, 15 Jan 2025 19:31:44 +0200 Subject: imx-gpu-viv*: Upgrade Graphics BSP to LF6.6.52_2.2.0 Bump imx-gpu-viv version 6.4.11.p2.8 -> 6.4.11.p2.10 Bump LIBVULKAN_API_VERSION 1.3.239 -> 1.3.204 Signed-off-by: Valentin Jec (cherry picked from commit 619fecdd461d05de71330d0bcd8571ef441b426b) --- recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc | 2 +- recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.10-aarch32.bb | 9 +++++++++ recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.10-aarch64.bb | 9 +++++++++ recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.8-aarch32.bb | 9 --------- recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.8-aarch64.bb | 9 --------- 5 files changed, 19 insertions(+), 19 deletions(-) create mode 100644 recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.10-aarch32.bb create mode 100644 recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.10-aarch64.bb delete mode 100644 recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.8-aarch32.bb delete mode 100644 recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.8-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 6fee393f..c0eeb3a9 100644 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc @@ -187,7 +187,7 @@ IMX_SOC:mx8mq-nxp-bsp = "mx8mq" IMX_SOC:mx8mn-nxp-bsp = "mx8mn" IMX_SOC:mx8ulp-nxp-bsp = "mx8ulp" -LIBVULKAN_API_VERSION = "1.3.239" +LIBVULKAN_API_VERSION = "1.3.204" do_install () { install -d ${D}${libdir} diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.10-aarch32.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.10-aarch32.bb new file mode 100644 index 00000000..753ab5ad --- /dev/null +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.10-aarch32.bb @@ -0,0 +1,9 @@ +require imx-gpu-viv-6.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837" + +IMX_SRCREV_ABBREV = "accdd64" + +SRC_URI[sha256sum] = "2242c7cbf1a2b07d40eefe5d1507747e477c54912f179ee0585a5d7965074ce0" + +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.10-aarch64.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.10-aarch64.bb new file mode 100644 index 00000000..6a6c6a7c --- /dev/null +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.10-aarch64.bb @@ -0,0 +1,9 @@ +require imx-gpu-viv-6.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837" + +IMX_SRCREV_ABBREV = "accdd64" + +SRC_URI[sha256sum] = "8108fd146de6986486f34860227511a5101b31072b99cd78ae38afba8939fd4e" + +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 deleted file mode 100644 index 4cdc1d6a..00000000 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.8-aarch32.bb +++ /dev/null @@ -1,9 +0,0 @@ -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 deleted file mode 100644 index c5208b55..00000000 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.8-aarch64.bb +++ /dev/null @@ -1,9 +0,0 @@ -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 4654cf3d3298fe301a0ed5d9bfe47f7f43078cad Mon Sep 17 00:00:00 2001 From: Valentin Jec Date: Wed, 15 Jan 2025 19:34:53 +0200 Subject: xwayland*: Upgrade Graphics BSP to LF6.6.52_2.2.0 Bump xwayland version 23.1.1.imx -> 23.2.5.imx Signed-off-by: Valentin Jec (cherry picked from commit 49ab2beac7813e6e853da19cd386524ade05f440) --- conf/machine/include/imx-base.inc | 2 +- recipes-graphics/xwayland/xwayland_23.1.1.imx.bb | 53 ---------------------- .../xwayland/xwayland_23.1.1.imx.bbappend | 20 -------- recipes-graphics/xwayland/xwayland_23.2.5.imx.bb | 53 ++++++++++++++++++++++ .../xwayland/xwayland_23.2.5.imx.bbappend | 18 ++++++++ 5 files changed, 72 insertions(+), 74 deletions(-) delete mode 100644 recipes-graphics/xwayland/xwayland_23.1.1.imx.bb delete mode 100644 recipes-graphics/xwayland/xwayland_23.1.1.imx.bbappend create mode 100644 recipes-graphics/xwayland/xwayland_23.2.5.imx.bb create mode 100644 recipes-graphics/xwayland/xwayland_23.2.5.imx.bbappend diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 1c40909d..cd158945 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc @@ -583,7 +583,7 @@ PREFERRED_VERSION_weston:imx-mainline-bsp = "" PREFERRED_VERSION_wayland-protocols:imx-nxp-bsp ??= "1.32.imx" -PREFERRED_VERSION_xwayland:imx-nxp-bsp ??= "23.1.1.imx" +PREFERRED_VERSION_xwayland:imx-nxp-bsp ??= "23.2.5.imx" # Use i.MX libdrm Version PREFERRED_VERSION_libdrm:imx-nxp-bsp ??= "2.4.116.imx" diff --git a/recipes-graphics/xwayland/xwayland_23.1.1.imx.bb b/recipes-graphics/xwayland/xwayland_23.1.1.imx.bb deleted file mode 100644 index a9705a23..00000000 --- a/recipes-graphics/xwayland/xwayland_23.1.1.imx.bb +++ /dev/null @@ -1,53 +0,0 @@ -# This recipe copy helps keep meta-freescale master branch compatible -# with Yocto langdale. -# (From OE-Core rev: 35fdbd0ea81650a0421d50fb53989d96c5956331) - -SUMMARY = "XWayland is an X Server that runs under Wayland." -DESCRIPTION = "XWayland is an X Server running as a Wayland client, \ -and thus is capable of displaying native X11 client applications in a \ -Wayland compositor environment. The goal of XWayland is to facilitate \ -the transition from X Window System to Wayland environments, providing \ -a way to run unported applications in the meantime." -HOMEPAGE = "https://fedoraproject.org/wiki/Changes/XwaylandStandalone" - -DEFAULT_PREFERENCE = "-1" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=5df87950af51ac2c5822094553ea1880" - -SRC_URI = "https://www.x.org/archive/individual/xserver/${BP_ORIGINAL}.tar.xz" -BP_ORIGINAL = "${BPN}-23.1.1" -SRC_URI[sha256sum] = "fb9461f5cb9fea5e07e91882311b0c88b43e8843b017ebac05eb5af69aa34c15" -S = "${WORKDIR}/${BP_ORIGINAL}" - -UPSTREAM_CHECK_REGEX = "xwayland-(?P\d+(\.(?!90\d)\d+)+)\.tar" - -inherit meson features_check pkgconfig -REQUIRED_DISTRO_FEATURES = "x11 opengl" - -DEPENDS += "xorgproto xtrans pixman libxkbfile libxfont2 wayland wayland-native wayland-protocols libdrm libepoxy libxcvt" - -OPENGL_PKGCONFIGS = "glx glamor dri3" -PACKAGECONFIG ??= "${XORG_CRYPTO} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '${OPENGL_PKGCONFIGS}', '', d)} \ -" -PACKAGECONFIG[dri3] = "-Ddri3=true,-Ddri3=false,libxshmfence" -PACKAGECONFIG[glx] = "-Dglx=true,-Dglx=false,virtual/libgl virtual/libx11" -PACKAGECONFIG[glamor] = "-Dglamor=true,-Dglamor=false,libepoxy virtual/libgbm,libegl" -PACKAGECONFIG[unwind] = "-Dlibunwind=true,-Dlibunwind=false,libunwind" -PACKAGECONFIG[xinerama] = "-Dxinerama=true,-Dxinerama=false" - -# Xorg requires a SHA1 implementation, pick one -XORG_CRYPTO ??= "openssl" -PACKAGECONFIG[openssl] = "-Dsha1=libcrypto,,openssl" -PACKAGECONFIG[nettle] = "-Dsha1=libnettle,,nettle" -PACKAGECONFIG[gcrypt] = "-Dsha1=libgcrypt,,libgcrypt" - -do_install:append() { - # remove files not needed and clashing with xserver-xorg - rm -rf ${D}/${libdir}/xorg/ -} - -FILES:${PN} += "${libdir}/xorg/protocol.txt" - -RDEPENDS:${PN} += "xkbcomp" diff --git a/recipes-graphics/xwayland/xwayland_23.1.1.imx.bbappend b/recipes-graphics/xwayland/xwayland_23.1.1.imx.bbappend deleted file mode 100644 index f71ba16c..00000000 --- a/recipes-graphics/xwayland/xwayland_23.1.1.imx.bbappend +++ /dev/null @@ -1,20 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" - -SRC_URI:append:imxgpu = " \ - file://0001-Prefer-to-create-GLES2-context-for-glamor-EGL.patch \ -" - -OPENGL_PKGCONFIGS:remove:imxgpu = "${OPENGL_PKGCONFIGS_REMOVE_IMXGPU}" -OPENGL_PKGCONFIGS_REMOVE_IMXGPU = "" -OPENGL_PKGCONFIGS_REMOVE_IMXGPU:mx6-nxp-bsp = "glamor glx" -OPENGL_PKGCONFIGS_REMOVE_IMXGPU:mx7-nxp-bsp = "glamor glx" -OPENGL_PKGCONFIGS_REMOVE_IMXGPU:mx8-nxp-bsp = "glx" -OPENGL_PKGCONFIGS_REMOVE_IMXGPU:mx9-nxp-bsp = "glamor glx" - -# 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" - -RDEPENDS:${PN}:append:imxgpu:libc-musl = " gcompat" - -PACKAGE_ARCH = "${MACHINE_SOCARCH}" diff --git a/recipes-graphics/xwayland/xwayland_23.2.5.imx.bb b/recipes-graphics/xwayland/xwayland_23.2.5.imx.bb new file mode 100644 index 00000000..0535587b --- /dev/null +++ b/recipes-graphics/xwayland/xwayland_23.2.5.imx.bb @@ -0,0 +1,53 @@ +# This recipe copy helps keep meta-freescale master branch compatible +# with Yocto langdale. +# (From OE-Core rev: 35fdbd0ea81650a0421d50fb53989d96c5956331) + +SUMMARY = "XWayland is an X Server that runs under Wayland." +DESCRIPTION = "XWayland is an X Server running as a Wayland client, \ +and thus is capable of displaying native X11 client applications in a \ +Wayland compositor environment. The goal of XWayland is to facilitate \ +the transition from X Window System to Wayland environments, providing \ +a way to run unported applications in the meantime." +HOMEPAGE = "https://fedoraproject.org/wiki/Changes/XwaylandStandalone" + +DEFAULT_PREFERENCE = "-1" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=5df87950af51ac2c5822094553ea1880" + +SRC_URI = "https://www.x.org/archive/individual/xserver/${BP_ORIGINAL}.tar.xz" +BP_ORIGINAL = "${BPN}-23.2.5" +SRC_URI[sha256sum] = "33ec7ff2687a59faaa52b9b09aa8caf118e7ecb6aed8953f526a625ff9f4bd90" +S = "${WORKDIR}/${BP_ORIGINAL}" + +UPSTREAM_CHECK_REGEX = "xwayland-(?P\d+(\.(?!90\d)\d+)+)\.tar" + +inherit meson features_check pkgconfig +REQUIRED_DISTRO_FEATURES = "x11 opengl" + +DEPENDS += "xorgproto xtrans pixman libxkbfile libxfont2 wayland wayland-native wayland-protocols libdrm libepoxy libxcvt" + +OPENGL_PKGCONFIGS = "glx glamor dri3" +PACKAGECONFIG ??= "${XORG_CRYPTO} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '${OPENGL_PKGCONFIGS}', '', d)} \ +" +PACKAGECONFIG[dri3] = "-Ddri3=true,-Ddri3=false,libxshmfence" +PACKAGECONFIG[glx] = "-Dglx=true,-Dglx=false,virtual/libgl virtual/libx11" +PACKAGECONFIG[glamor] = "-Dglamor=true,-Dglamor=false,libepoxy virtual/libgbm,libegl" +PACKAGECONFIG[unwind] = "-Dlibunwind=true,-Dlibunwind=false,libunwind" +PACKAGECONFIG[xinerama] = "-Dxinerama=true,-Dxinerama=false" + +# Xorg requires a SHA1 implementation, pick one +XORG_CRYPTO ??= "openssl" +PACKAGECONFIG[openssl] = "-Dsha1=libcrypto,,openssl" +PACKAGECONFIG[nettle] = "-Dsha1=libnettle,,nettle" +PACKAGECONFIG[gcrypt] = "-Dsha1=libgcrypt,,libgcrypt" + +do_install:append() { + # remove files not needed and clashing with xserver-xorg + rm -rf ${D}/${libdir}/xorg/ +} + +FILES:${PN} += "${libdir}/xorg/protocol.txt" + +RDEPENDS:${PN} += "xkbcomp" diff --git a/recipes-graphics/xwayland/xwayland_23.2.5.imx.bbappend b/recipes-graphics/xwayland/xwayland_23.2.5.imx.bbappend new file mode 100644 index 00000000..d8f5bdde --- /dev/null +++ b/recipes-graphics/xwayland/xwayland_23.2.5.imx.bbappend @@ -0,0 +1,18 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" + +SRC_URI:append:imxgpu = " \ + file://0001-Prefer-to-create-GLES2-context-for-glamor-EGL.patch \ +" + +OPENGL_PKGCONFIGS:remove:imxgpu = "${OPENGL_PKGCONFIGS_REMOVE_IMXGPU}" +OPENGL_PKGCONFIGS_REMOVE_IMXGPU = "" +OPENGL_PKGCONFIGS_REMOVE_IMXGPU:imx-nxp-bsp = "glamor glx" +OPENGL_PKGCONFIGS_REMOVE_IMXGPU:mx8-nxp-bsp = "glx" + +# 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" + +RDEPENDS:${PN}:append:imxgpu:libc-musl = " gcompat" + +PACKAGE_ARCH:imxgpu = "${MACHINE_SOCARCH}" -- cgit v1.2.3-54-g00ecf From 6b007f25205638ec5a32eb03755f93035bf15e6c Mon Sep 17 00:00:00 2001 From: Valentin Jec Date: Wed, 15 Jan 2025 19:36:34 +0200 Subject: weston: Upgrade Graphics BSP to LF6.6.52_2.2.0 Update checksum to latest Signed-off-by: Valentin Jec (cherry picked from commit b1036242432afd652964e1f49565e52a24e9510e) --- recipes-graphics/wayland/weston_10.0.5.imx.bb | 2 +- recipes-graphics/wayland/weston_12.0.4.imx.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-graphics/wayland/weston_10.0.5.imx.bb b/recipes-graphics/wayland/weston_10.0.5.imx.bb index 99624887..ff21c718 100644 --- a/recipes-graphics/wayland/weston_10.0.5.imx.bb +++ b/recipes-graphics/wayland/weston_10.0.5.imx.bb @@ -165,7 +165,7 @@ SRC_URI:prepend = "git://github.com/nxp-imx/weston-imx.git;protocol=https;branch SRC_URI += "file://0001-Revert-protocol-no-found-wayland-scanner-with-Yocto-.patch \ file://0001-g2d-renderer.c-Include-sys-stat.h.patch" SRCBRANCH = "weston-imx-10.0.5" -SRCREV = "0cc822a1e5a8faea6835a4e9259887d8792b86b4" +SRCREV = "7129417ae04de57f9596ccf27f74ef967660a64f" S = "${WORKDIR}/git" # Disable OpenGL for parts with GPU support for 2D but not 3D diff --git a/recipes-graphics/wayland/weston_12.0.4.imx.bb b/recipes-graphics/wayland/weston_12.0.4.imx.bb index 89331dfe..b6e28791 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 = "c3c1f9ff7824123dd4808ace3c9476345cb84177" +SRCREV = "de7f8df4b4275e9bb345cacab6962d1a490d9eab" S = "${WORKDIR}/git" PACKAGECONFIG_IMX_REMOVALS ?= "wayland x11" -- cgit v1.2.3-54-g00ecf From 53285059774495007a481894f1e827bed99df479 Mon Sep 17 00:00:00 2001 From: Valentin Jec Date: Wed, 15 Jan 2025 19:38:27 +0200 Subject: mali-imx: Upgrade Graphics BSP to LF6.6.52_2.2.0 Bump version r50.0 -> r50.2 Signed-off-by: Valentin Jec (cherry picked from commit e28b8ed58d0c505ed2b5a7d4d901dfa1b4ab1e26) --- recipes-graphics/mali/mali-imx_r50.0.bb | 25 ------------------------- recipes-graphics/mali/mali-imx_r50.2.bb | 25 +++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 25 deletions(-) delete mode 100644 recipes-graphics/mali/mali-imx_r50.0.bb create mode 100644 recipes-graphics/mali/mali-imx_r50.2.bb diff --git a/recipes-graphics/mali/mali-imx_r50.0.bb b/recipes-graphics/mali/mali-imx_r50.0.bb deleted file mode 100644 index 3d30f468..00000000 --- a/recipes-graphics/mali/mali-imx_r50.0.bb +++ /dev/null @@ -1,25 +0,0 @@ -require mali-imx.inc - -LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837" - -SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true" -SRC_URI[sha256sum] = "a787a3285c3e288eedacf1a746de2bc9f5fdc15f35cf8b6147deb436183baf6f" -IMX_SRCREV_ABBREV = "39604c3" - -S = "${WORKDIR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}" - -inherit fsl-eula-unpack - -do_install () { - install -d ${D} - cp -r ${S}/etc ${S}/usr ${D} - - # Move firmware to nonarch_base_libdir - if [ "${base_libdir}" != "${nonarch_base_libdir}" ]; then - install -d ${D}${nonarch_base_libdir} - mv ${D}${base_libdir}/firmware ${D}${nonarch_base_libdir} - fi -} - -PACKAGE_ARCH = "${MACHINE_SOCARCH}" diff --git a/recipes-graphics/mali/mali-imx_r50.2.bb b/recipes-graphics/mali/mali-imx_r50.2.bb new file mode 100644 index 00000000..97f6db71 --- /dev/null +++ b/recipes-graphics/mali/mali-imx_r50.2.bb @@ -0,0 +1,25 @@ +require mali-imx.inc + +LICENSE = "Proprietary" +LIC_FILES_CHKSUM = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837" + +SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}.bin;fsl-eula=true" +SRC_URI[sha256sum] = "947881cdad085a29dcb52dc4431f803b73c06141b31e06520f9bfe17d324f774" +IMX_SRCREV_ABBREV = "710cfb6" + +S = "${WORKDIR}/${BPN}-${PV}-${IMX_SRCREV_ABBREV}" + +inherit fsl-eula-unpack + +do_install () { + install -d ${D} + cp -r ${S}/etc ${S}/usr ${D} + + # Move firmware to nonarch_base_libdir + if [ "${base_libdir}" != "${nonarch_base_libdir}" ]; then + install -d ${D}${nonarch_base_libdir} + mv ${D}${base_libdir}/firmware ${D}${nonarch_base_libdir} + fi +} + +PACKAGE_ARCH = "${MACHINE_SOCARCH}" -- cgit v1.2.3-54-g00ecf From 424aafe53daa91ede40287951754caa437bd9e08 Mon Sep 17 00:00:00 2001 From: Valentin Jec Date: Wed, 15 Jan 2025 19:40:01 +0200 Subject: libsdl2: Upgrade Graphics BSP to LF6.6.52_2.2.0 Add libdecor to PACKAGECONFIG for imx platforms Signed-off-by: Valentin Jec (cherry picked from commit edcb89a9955b4f7211b7e8d2fac1680a4d337bfe) --- recipes-graphics/libsdl2/libsdl2_%.bbappend | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipes-graphics/libsdl2/libsdl2_%.bbappend b/recipes-graphics/libsdl2/libsdl2_%.bbappend index 3b2655ce..e8c7ac16 100644 --- a/recipes-graphics/libsdl2/libsdl2_%.bbappend +++ b/recipes-graphics/libsdl2/libsdl2_%.bbappend @@ -1,3 +1,6 @@ +PACKAGECONFIG:append:imx-nxp-bsp = " ${PACKAGECONFIG_LIBDECOR}" +PACKAGECONFIG_LIBDECOR ??= "libdecor" + # what vivante driver does libsdl2 mean? Anyway it fails with missing functions as # VIVANTE_Create VIVANTE_GLES_GetProcAddress VIVANTE_GLES_UnloadLibrary ... EXTRA_OECMAKE:append:imxgpu = " -DSDL_VIVANTE=OFF" -- cgit v1.2.3-54-g00ecf