diff --git a/meta-digi-arm/conf/machine/include/imx-digi-base.inc b/meta-digi-arm/conf/machine/include/imx-digi-base.inc index cb9e7e5aa..665e6ebd9 100644 --- a/meta-digi-arm/conf/machine/include/imx-digi-base.inc +++ b/meta-digi-arm/conf/machine/include/imx-digi-base.inc @@ -274,25 +274,25 @@ 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 +IMXGPU_GRAPHICS_PROVIDER:imxviv ?= "imx-gpu-viv" -PREFERRED_PROVIDER_virtual/egl:imxgpu ?= "imx-gpu-viv" +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 ?= "imx-gpu-viv" -PREFERRED_PROVIDER_virtual/libgles2:imxgpu3d ?= "imx-gpu-viv" -PREFERRED_PROVIDER_virtual/libgles3:imxgpu3d ?= "imx-gpu-viv" +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_VERSION_weston:imx-nxp-bsp ??= "12.0.4.imx" # i.MX 6 & 7 stay on weston 10.0 for fbdev diff --git a/meta-digi-dey/conf/distro/dey.conf b/meta-digi-dey/conf/distro/dey.conf index ab58aae9f..8c9f141ae 100644 --- a/meta-digi-dey/conf/distro/dey.conf +++ b/meta-digi-dey/conf/distro/dey.conf @@ -70,11 +70,6 @@ PREFERRED_VERSION_libgpiod ?= "1.6.4" # so use that version while we look for a fix in the newer version. PREFERRED_VERSION_wpewebkit ?= "2.44.4" -# There's a generic opencl-headers recipe in the thud branch of -# meta-openembedded, but we should use the package provided by the imx-gpu-viv -# recipe in case there are NXP-specific changes in it -PREFERRED_PROVIDER_opencl-headers ?= "imx-gpu-viv" - # Use the FDO backend for WPE WebKit PREFERRED_PROVIDER_virtual/wpebackend = "wpebackend-fdo" diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6-overrides.inc b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6-overrides.inc deleted file mode 100644 index 07f05eb77..000000000 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6-overrides.inc +++ /dev/null @@ -1,27 +0,0 @@ -require recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc - -### Section 1: Changes to be upstreamed ### - -LIBVULKAN_API_VERSION = "1.3.204" - -# FIXME: Update tensorflow-lite so it doesn't depend on this -RPROVIDES:${PN}:append = " ${RPROVIDES_OPENCL}" -RPROVIDES_OPENCL = "opencl-icd-loader-dev" -RPROVIDES_OPENCL:mx7-nxp-bsp = "" -RPROVIDES_OPENCL:mx8mm-nxp-bsp = "" - -### Section 2: Changes to be kept in meta-imx ### - -PACKAGECONFIG ?= "valgrind" - -RDEPENDS:libopenvg-imx += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd-gpuconfig', '', d)}" - -# FIXME: Don't add .so to main package -FILES:libvulkan-imx += "${libdir}/libvulkan_VSI${SOLIBS}" -INSANE_SKIP:libvulkan-imx += "dev-so" -FILES:libopenvx-imx += "${libdir}/libOpenVX${SOLIBS}" -INSANE_SKIP:libopenvx-imx += "dev-so dev-deps" -FILES:libopencl-imx += "${libdir}/libOpenCL${SOLIBS}" -INSANE_SKIP:libopencl-imx += "dev-so dev-deps" -FILES:libvdk-imx += "${libdir}/libVDK*${SOLIBS}" -INSANE_SKIP:libvdk-imx += "dev-so" diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.10-aarch32.bb b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.10-aarch32.bb deleted file mode 100644 index d10655049..000000000 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.10-aarch32.bb +++ /dev/null @@ -1,9 +0,0 @@ -require imx-gpu-viv-6-overrides.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/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.10-aarch64.bb b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.10-aarch64.bb deleted file mode 100644 index 2469362be..000000000 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.10-aarch64.bb +++ /dev/null @@ -1,9 +0,0 @@ -require imx-gpu-viv-6-overrides.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837" - -IMX_SRCREV_ABBREV = "accdd64" - -SRC_URI[sha256sum] = "8108fd146de6986486f34860227511a5101b31072b99cd78ae38afba8939fd4e" - -COMPATIBLE_MACHINE = "(mx8-nxp-bsp)" diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.10-aarch32.bbappend b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.12-aarch32.bbappend similarity index 100% rename from meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.10-aarch32.bbappend rename to meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.12-aarch32.bbappend diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.10-aarch64.bbappend b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.12-aarch64.bbappend similarity index 100% rename from meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.10-aarch64.bbappend rename to meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.11.p2.12-aarch64.bbappend diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/libgpuperfcnt/gputop_git.bb b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/libgpuperfcnt/gputop_git.bb index 8bdcf8078..17281b09c 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/libgpuperfcnt/gputop_git.bb +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/libgpuperfcnt/gputop_git.bb @@ -1,4 +1,4 @@ -# Copyright 2017-2024 NXP +# Copyright 2017-2025 NXP DESCRIPTION = "Sample program to monitor i.MX GPU performance data" LICENSE = "MIT" @@ -9,7 +9,7 @@ DEPENDS = "libgpuperfcnt" GPUTOP_SRC ?= "git://github.com/nxp-imx/imx-gputop.git;protocol=https" SRCBRANCH = "release" SRC_URI = "${GPUTOP_SRC};branch=${SRCBRANCH} " -SRCREV = "627e8823e1ba17c6d12b408835029a1c065bea84" +SRCREV = "10a5ca8f383ac1df9e4cd87c979d7e1db531acf2" S = "${WORKDIR}/git" diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/libgpuperfcnt/libgpuperfcnt_6.4.11.p2.12.bb b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/libgpuperfcnt/libgpuperfcnt_6.4.11.p2.12.bb new file mode 100644 index 000000000..b0ae0610d --- /dev/null +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/libgpuperfcnt/libgpuperfcnt_6.4.11.p2.12.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "A library to retrieve i.MX GPU performance data" +LICENSE = "Proprietary" +LIC_FILES_CHKSUM = "file://COPYING;md5=bc649096ad3928ec06a8713b8d787eac" +DEPENDS = "imx-gpu-viv" + +IMX_SRCREV_ABBREV = "e0a132a" + +SRC_URI[arm-fb.sha256sum] = "a4282e0380ec0edfec5ba58c22eac68efdbd8b4247ff5c0eef8ee92039872e91" +SRC_URI[arm-wayland.sha256sum] = "5ce4f8a288e2c38611c6e2b61ffba5305afb172a3b7e03f54d10aff81a6dfe92" +SRC_URI[aarch64-wayland.sha256sum] = "18f86b3cd487abd93c90d6b789fe0d3500b8e958962d21df6f4a329d726b8a4d" + +inherit fsl-eula-unpack2 fsl-eula-graphics fsl-eula-recent + +PACKAGE_ARCH = "${MACHINE_SOCARCH}" + +COMPATIBLE_MACHINE = "(imxgpu)" +COMPATIBLE_MACHINE:mx95-generic-bsp = "(^$)" diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/libgpuperfcnt/libgpuperfcnt_git.bb b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/libgpuperfcnt/libgpuperfcnt_git.bb deleted file mode 100644 index 98c8cf861..000000000 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/libgpuperfcnt/libgpuperfcnt_git.bb +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION = "A library to retrieve i.MX GPU performance data" -LICENSE = "Proprietary" -LIC_FILES_CHKSUM = "file://COPYING;md5=ca53281cc0caa7e320d4945a896fb837" - -IMX_SRCREV_ABBREV = "99ab423" - -SRC_URI[arm-fb.sha256sum] = "be907da4aa533e1c325002dee93364965553a1f971442b1c3661bc8a3c9b6212" -SRC_URI[arm-wayland.sha256sum] = "07334d80e692b6c228437d037ec97ca5d59af9f9b3ddf12a8503defc9bd7e1be" -SRC_URI[aarch64-wayland.sha256sum] = "1f24a74fae88814eae2d3ca35addddace7889438500105a137265c961d1bacdd" -SRC_URI[aarch64-wayland-mali.sha256sum] = "a0dff721ac7ff6a89862f85bf5a49f60df571dbab8676babbf702feb8e4d5da5" - -inherit fsl-eula-unpack2 fsl-eula-graphics fsl-eula-recent - -PACKAGECONFIG ??= "vivante" -PACKAGECONFIG:mx95-nxp-bsp = "mali" - -PACKAGECONFIG[mali] = ",,,mali-imx,,vivante" -PACKAGECONFIG[vivante] = ",,,imx-gpu-viv,,mali" - -PACKAGE_ARCH = "${MACHINE_SOCARCH}" - -# Compatible only with i.MX with GPU -COMPATIBLE_MACHINE = "(^$)" -COMPATIBLE_MACHINE:imxgpu = "${MACHINE}"