Rogue graphics 24.2 release
v3 cover Rogue graphics 24.2 release
From: Randolph Sapp <[email protected]>
Bump the rogue graphics packages for kernel 6.6 and 6.12. This has been tested against SGX as well and has not shown any regressions.
This does not enable SGX for kernel 6.12 just yet. Still waiting on some work from Darren before that occurs.
This also fixes a potential sstate issues when switching distro features.
Porting this for the meta-ti master branch first because the mesa version upgrade has a merge conflict between master and scarthgap. Will wait for this to be merged before backporting to scarthgap.
v2:
- Fix a build issue with the kernel module when enabling CONFIG_TRACING
- Extend the "filter binaries post install" patch to cover the 23.3 recipe
v3:
- Fix a compilaton issue with mesa-pvr when using llvm 19
Randolph Sapp (4):
ti-img-rogue-*: version 24.1.6554834 -> 24.2.6643903
mesa-pvr: version 23.2.1 -> 24.0.1
ti-bsp: select the graphics 24.2 packages
ti-img-rogue-umlibs: filter binaries post install
meta-ti-bsp/conf/machine/include/ti-bsp.inc | 7 ++-
...bb => ti-img-rogue-driver_24.2.6643903.bb} | 4 +-
...allium-Fix-build-with-llvm-18-and-19.patch | 53 -----------------
...e-cmake-dependency-detector-for-llvm.patch | 42 --------------
.../0001-drisw-fix-build-without-dri3.patch | 58 +++++++++++++++++++
.../0001-gallium-Fix-build-with-llvm-17.patch | 3 +-
...sdetects-64bit-atomics-on-mips-clang.patch | 4 +-
...k-for-all-linux-host_os-combinations.patch | 22 +++----
...on-t-try-zink-if-not-enabled-in-mesa.patch | 42 ++++++++++++++
...{mesa-pvr_23.2.1.bb => mesa-pvr_24.0.1.bb} | 14 ++---
.../ti-img-rogue-umlibs_23.3.6512818.bb | 10 ++--
...bb => ti-img-rogue-umlibs_24.2.6643903.bb} | 14 ++---
12 files changed, 139 insertions(+), 134 deletions(-)
rename meta-ti-bsp/recipes-bsp/powervr-drivers/{ti-img-rogue-driver_24.1.6554834.bb => ti-img-rogue-driver_24.2.6643903.bb} (93%)
delete mode 100644 meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-23.2.1/0001-gallium-Fix-build-with-llvm-18-and-19.patch
delete mode 100644 meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-23.2.1/0001-meson-Disable-cmake-dependency-detector-for-llvm.patch
create mode 100644 meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-24.0.1/0001-drisw-fix-build-without-dri3.patch
rename meta-ti-bsp/recipes-graphics/mesa/{mesa-pvr-23.2.1 => mesa-pvr-24.0.1}/0001-gallium-Fix-build-with-llvm-17.patch (99%)
rename meta-ti-bsp/recipes-graphics/mesa/{mesa-pvr-23.2.1 => mesa-pvr-24.0.1}/0001-meson-misdetects-64bit-atomics-on-mips-clang.patch (99%)
rename meta-ti-bsp/recipes-graphics/mesa/{mesa-pvr-23.2.1 => mesa-pvr-24.0.1}/0001-meson.build-check-for-all-linux-host_os-combinations.patch (70%)
create mode 100644 meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-24.0.1/0002-glxext-don-t-try-zink-if-not-enabled-in-mesa.patch
rename meta-ti-bsp/recipes-graphics/mesa/{mesa-pvr_23.2.1.bb => mesa-pvr_24.0.1.bb} (81%)
rename meta-ti-bsp/recipes-graphics/powervr-umlibs/{ti-img-rogue-umlibs_24.1.6554834.bb => ti-img-rogue-umlibs_24.2.6643903.bb} (94%)Signature · 1 line
2.47.1
PATCH v3 1/4 ti-img-rogue-*: version 24.1.6554834 -> 24.2.6643903
From: Randolph Sapp <[email protected]>
Bump the package version for DDK 24.2, this includes a few fixups from IMG and support for a newer version of mesa.
---
...er_24.1.6554834.bb => ti-img-rogue-driver_24.2.6643903.bb} | 4 ++--
...bs_24.1.6554834.bb => ti-img-rogue-umlibs_24.2.6643903.bb} | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
rename meta-ti-bsp/recipes-bsp/powervr-drivers/{ti-img-rogue-driver_24.1.6554834.bb => ti-img-rogue-driver_24.2.6643903.bb} (93%)
rename meta-ti-bsp/recipes-graphics/powervr-umlibs/{ti-img-rogue-umlibs_24.1.6554834.bb => ti-img-rogue-umlibs_24.2.6643903.bb} (98%)meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_24.2.6643903.bb renamed from meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_24.1.6554834.bb +2 -2
@@ -13,13 +13,13 @@ COMPATIBLE_MACHINE = "j721e|j721s2|j784s4|j742s2|am62xx|am62pxx|j722s" DEPENDS = "virtual/kernel" -BRANCH = "linuxws/scarthgap/k6.6/${PV}" +BRANCH = "linuxws/scarthgap/k6.12/${PV}" SRC_URI = "git://git.ti.com/git/graphics/ti-img-rogue-driver.git;protocol=https;branch=${BRANCH}" S = "${WORKDIR}/git" -SRCREV = "707bb373902babf9ced5fd2f99139209ca0f605a" +SRCREV = "023eb5afde7e069bff1e5e37620b84a66b447936" TARGET_PRODUCT:j721e = "j721e_linux" TARGET_PRODUCT:j721s2 = "j721s2_linux"
meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_24.2.6643903.bb renamed from meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_24.1.6554834.bb +2 -2
@@ -12,9 +12,9 @@ COMPATIBLE_MACHINE = "j721e|j721s2|j784s4|j742s2|am62xx|am62pxx|j722s" PR = "r3" -BRANCH = "linuxws/scarthgap/k6.6/${PV}" +BRANCH = "linuxws/scarthgap/k6.12/${PV}" SRC_URI = "git://git.ti.com/git/graphics/ti-img-rogue-umlibs.git;protocol=https;branch=${BRANCH}" -SRCREV = "ba93a3e38c683ccb03a7cf8f2e7dffe2f9cbcf1c" +SRCREV = "d578666fc6ecd09f7d6c3431747f1d93d128fe28" S = "${WORKDIR}/git/targetfs/${TARGET_PRODUCT}/${PVR_WS}/${PVR_BUILD}" TARGET_PRODUCT:j721e = "j721e_linux"
Signature · 1 line
2.47.1
PATCH v3 2/4 mesa-pvr: version 23.2.1 -> 24.0.1
In reply to [email protected]From: Randolph Sapp <[email protected]>
The gfx library provided by rogue can support this never version of mesa out of the box. Pull it in now that we have ported the SGX side of things.
---
...allium-Fix-build-with-llvm-18-and-19.patch | 53 -----------------
...e-cmake-dependency-detector-for-llvm.patch | 42 --------------
...e-lp_bld_misc.cpp-to-support-llvm-19.patch | 39 +++++++++++++
.../0001-drisw-fix-build-without-dri3.patch | 58 +++++++++++++++++++
.../0001-gallium-Fix-build-with-llvm-17.patch | 3 +-
...ll-StringMapIterator-from-llvm-scope.patch | 32 ++++++++++
...sdetects-64bit-atomics-on-mips-clang.patch | 4 +-
...k-for-all-linux-host_os-combinations.patch | 22 +++----
...on-t-try-zink-if-not-enabled-in-mesa.patch | 42 ++++++++++++++
...{mesa-pvr_23.2.1.bb => mesa-pvr_24.0.1.bb} | 16 ++---
10 files changed, 192 insertions(+), 119 deletions(-)
delete mode 100644 meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-23.2.1/0001-gallium-Fix-build-with-llvm-18-and-19.patch
delete mode 100644 meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-23.2.1/0001-meson-Disable-cmake-dependency-detector-for-llvm.patch
create mode 100644 meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-24.0.1/0001-Update-lp_bld_misc.cpp-to-support-llvm-19.patch
create mode 100644 meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-24.0.1/0001-drisw-fix-build-without-dri3.patch
rename meta-ti-bsp/recipes-graphics/mesa/{mesa-pvr-23.2.1 => mesa-pvr-24.0.1}/0001-gallium-Fix-build-with-llvm-17.patch (99%)
create mode 100644 meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-24.0.1/0001-gallivm-Call-StringMapIterator-from-llvm-scope.patch
rename meta-ti-bsp/recipes-graphics/mesa/{mesa-pvr-23.2.1 => mesa-pvr-24.0.1}/0001-meson-misdetects-64bit-atomics-on-mips-clang.patch (99%)
rename meta-ti-bsp/recipes-graphics/mesa/{mesa-pvr-23.2.1 => mesa-pvr-24.0.1}/0001-meson.build-check-for-all-linux-host_os-combinations.patch (70%)
create mode 100644 meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-24.0.1/0002-glxext-don-t-try-zink-if-not-enabled-in-mesa.patch
rename meta-ti-bsp/recipes-graphics/mesa/{mesa-pvr_23.2.1.bb => mesa-pvr_24.0.1.bb} (81%)meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-23.2.1/0001-gallium-Fix-build-with-llvm-18-and-19.patch deleted +0 -53
@@ -1,53 +0,0 @@ -From 6c5033bb01a3a1341d4db5007586a5f2e2727b0a Mon Sep 17 00:00:00 2001 -From: Ryan Eatmon <[email protected]> -Date: Mon, 4 Nov 2024 13:37:29 -0600 -Subject: [PATCH] gallium: Fix build with llvm 18 and 19 - -- CodeGenOpt::Level changed to CodeGenOoptLevel. [1] -- llvm::sys::getHostCPUFeatures() now returns the features instead of -modifying the passed in argument. [2] - -Upstream-Status: Backport [1][https://gitlab.freedesktop.org/mesa/mesa/-/commit/f79617fe804ea6524651ff1bc3a91098d3199179] -Upstream-Status: Backport [2][https://gitlab.freedesktop.org/mesa/mesa/-/commit/fa9cd89a85b904615ebc11da609445b5b751e68d] - -Signed-off-by: Ryan Eatmon <[email protected]> ---- - src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 14 ++++++++++++-- - 1 file changed, 12 insertions(+), 2 deletions(-) - -diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp -index 5e7a30a6cc2..dbc777e3096 100644 ---- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp -+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp -@@ -366,7 +366,11 @@ lp_build_create_jit_compiler_for_module(LLVMExecutionEngineRef *OutJIT, - builder.setEngineKind(EngineKind::JIT) - .setErrorStr(&Error) - .setTargetOptions(options) -+#if LLVM_VERSION_MAJOR >= 18 -+ .setOptLevel((CodeGenOptLevel)OptLevel); -+#else - .setOptLevel((CodeGenOpt::Level)OptLevel); -+#endif - - #if DETECT_OS_WINDOWS - /* -@@ -394,8 +398,14 @@ lp_build_create_jit_compiler_for_module(LLVMExecutionEngineRef *OutJIT, - * which allows us to enable/disable code generation based - * on the results of cpuid on these architectures. - */ -- llvm::StringMap<bool> features; -- llvm::sys::getHostCPUFeatures(features); -+ #if LLVM_VERSION_MAJOR >= 19 -+ /* llvm-19+ returns StringMap from getHostCPUFeatures. -+ */ -+ auto features = llvm::sys::getHostCPUFeatures(); -+ #else -+ llvm::StringMap<bool> features; -+ llvm::sys::getHostCPUFeatures(features); -+ #endif - - for (StringMapIterator<bool> f = features.begin(); - f != features.end(); --- -2.17.1 -
meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-23.2.1/0001-meson-Disable-cmake-dependency-detector-for-llvm.patch deleted +0 -42
42 lines not on this page · raw message
meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-24.0.1/0001-Update-lp_bld_misc.cpp-to-support-llvm-19.patch new file +39 -0
@@ -0,0 +1,39 @@ +From fa9cd89a85b904615ebc11da609445b5b751e68d Mon Sep 17 00:00:00 2001 +From: Satadru Pramanik <[email protected]> +Date: Sat, 5 Oct 2024 13:35:52 +0000 +Subject: [PATCH] Update lp_bld_misc.cpp to support llvm-19+. + +Fixes #11896. +cc: mesa-stable + +Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31533> +Upstream-Status: Backport [https://gitlab.freedesktop.org/mesa/mesa/-/commit/fa9cd89a85b904615ebc11da609445b5b751e68d] +Signed-off-by: Randolph Sapp <[email protected]> +--- + src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp +index 7975fcf1ac9..5b615d627ff 100644 +--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp ++++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp +@@ -329,8 +329,14 @@ lp_build_fill_mattrs(std::vector<std::string> &MAttrs) + * which allows us to enable/disable code generation based + * on the results of cpuid on these architectures. + */ +- llvm::StringMap<bool> features; +- llvm::sys::getHostCPUFeatures(features); ++ #if LLVM_VERSION_MAJOR >= 19 ++ /* llvm-19+ returns StringMap from getHostCPUFeatures. ++ */ ++ auto features = llvm::sys::getHostCPUFeatures(); ++ #else ++ llvm::StringMap<bool> features; ++ llvm::sys::getHostCPUFeatures(features); ++ #endif + + for (llvm::StringMapIterator<bool> f = features.begin(); + f != features.end(); +-- +2.47.1 +
meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-24.0.1/0001-drisw-fix-build-without-dri3.patch new file +58 -0
58 lines not on this page · raw message
meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-24.0.1/0001-gallium-Fix-build-with-llvm-17.patch renamed from meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-23.2.1/0001-gallium-Fix-build-with-llvm-17.patch +2 -1
@@ -36,5 +36,6 @@ index cd2108f..b1a4d03 100644 #include <llvm-c/Transforms/Coroutines.h> #endif +#endif - + unsigned gallivm_perf = 0; +
meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-24.0.1/0001-gallivm-Call-StringMapIterator-from-llvm-scope.patch new file +32 -0
@@ -0,0 +1,32 @@ +From d17338d403980e1932a42f5d11c2a1fb7b25127b Mon Sep 17 00:00:00 2001 +From: MastaG <[email protected]> +Date: Wed, 3 Jul 2024 21:00:42 +0200 +Subject: [PATCH] gallivm: Call StringMapIterator from llvm:: scope + +Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/11392 +Fixes: b035d9cab5a4 ("gallivm: use getHostCPUFeatures on x86/llvm-4.0+.") +Reviewed-by: David Heidelberg <[email protected]> +Signed-off-by: David Heidelberg <[email protected]> +Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30009> +Upstream-Status: Backport [https://gitlab.freedesktop.org/mesa/mesa/-/commit/d17338d403980e1932a42f5d11c2a1fb7b25127b] +Signed-off-by: Randolph Sapp <[email protected]> +--- + src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp +index 95a8a6c6a08..f3c10652ed6 100644 +--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp ++++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp +@@ -332,7 +332,7 @@ lp_build_fill_mattrs(std::vector<std::string> &MAttrs) + llvm::StringMap<bool> features; + llvm::sys::getHostCPUFeatures(features); + +- for (StringMapIterator<bool> f = features.begin(); ++ for (llvm::StringMapIterator<bool> f = features.begin(); + f != features.end(); + ++f) { + MAttrs.push_back(((*f).second ? "+" : "-") + (*f).first().str()); +-- +2.47.1 +
meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-24.0.1/0001-meson-misdetects-64bit-atomics-on-mips-clang.patch renamed from meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-23.2.1/0001-meson-misdetects-64bit-atomics-on-mips-clang.patch +2 -2
@@ -17,9 +17,9 @@ index 5a5eab4..e499516 100644 @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ - + -#if defined(MISSING_64BIT_ATOMICS) && defined(HAVE_PTHREAD) +#if !defined(__clang__) && defined(MISSING_64BIT_ATOMICS) && defined(HAVE_PTHREAD) - + #include <stdint.h> #include <pthread.h>
meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-24.0.1/0001-meson.build-check-for-all-linux-host_os-combinations.patch renamed from meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-23.2.1/0001-meson.build-check-for-all-linux-host_os-combinations.patch +11 -11
@@ -1,4 +1,4 @@ -From b251af67df5a6840d2e9cc06edae2c387f8778f1 Mon Sep 17 00:00:00 2001 +From f2fe76d506f356de055b8eca83a7c9d0744a40af Mon Sep 17 00:00:00 2001 From: Alistair Francis <[email protected]> Date: Thu, 14 Nov 2019 13:04:49 -0800 Subject: [PATCH] meson.build: check for all linux host_os combinations
@@ -20,24 +20,24 @@ Signed-off-by: Alistair Francis <[email protected]> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build -index 22385d8..15f48a6 100644 +index 35cc5f1..9a49c0d 100644 --- a/meson.build +++ b/meson.build -@@ -121,7 +121,7 @@ with_any_opengl = with_opengl or with_gles1 or with_gles2 +@@ -128,7 +128,7 @@ # Only build shared_glapi if at least one OpenGL API is enabled with_shared_glapi = with_shared_glapi and with_any_opengl - --system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux', 'sunos', 'android'].contains(host_machine.system()) -+system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux', 'sunos', 'android'].contains(host_machine.system()) or host_machine.system().startswith('linux') - + +-system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux', 'sunos', 'android', 'managarm'].contains(host_machine.system()) ++system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux', 'sunos', 'android', 'managarm'].contains(host_machine.system()) or host_machine.system().startswith('linux') + gallium_drivers = get_option('gallium-drivers') if gallium_drivers.contains('auto') -@@ -909,7 +909,7 @@ if cc.has_function('fmemopen') +@@ -998,7 +998,7 @@ endif - + # TODO: this is very incomplete --if ['linux', 'cygwin', 'gnu', 'freebsd', 'gnu/kfreebsd', 'haiku', 'android'].contains(host_machine.system()) -+if ['linux', 'cygwin', 'gnu', 'freebsd', 'gnu/kfreebsd', 'haiku'].contains(host_machine.system()) or host_machine.system().startswith('linux') +-if ['linux', 'cygwin', 'gnu', 'freebsd', 'gnu/kfreebsd', 'haiku', 'android', 'managarm'].contains(host_machine.system()) ++if ['linux', 'cygwin', 'gnu', 'freebsd', 'gnu/kfreebsd', 'haiku', 'android', 'managarm'].contains(host_machine.system()) or host_machine.system().startswith('linux') pre_args += '-D_GNU_SOURCE' elif host_machine.system() == 'sunos' pre_args += '-D__EXTENSIONS__'
meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-24.0.1/0002-glxext-don-t-try-zink-if-not-enabled-in-mesa.patch new file +42 -0
42 lines not on this page · raw message
meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_24.0.1.bb renamed from meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_23.2.1.bb +6 -10
@@ -15,8 +15,10 @@ SRC_URI = " \ file://0001-meson.build-check-for-all-linux-host_os-combinations.patch \ file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ file://0001-gallium-Fix-build-with-llvm-17.patch \ - file://0001-meson-Disable-cmake-dependency-detector-for-llvm.patch \ - file://0001-gallium-Fix-build-with-llvm-18-and-19.patch \ + file://0001-drisw-fix-build-without-dri3.patch \ + file://0002-glxext-don-t-try-zink-if-not-enabled-in-mesa.patch \ + file://0001-gallivm-Call-StringMapIterator-from-llvm-scope.patch \ + file://0001-Update-lp_bld_misc.cpp-to-support-llvm-19.patch \ " S = "${WORKDIR}/git"
@@ -26,19 +28,13 @@ PACKAGECONFIG:append = " \ ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-sgx-ddk-km', 'sgx', '', d)} \ " -SRCREV = "0e75e7ded360ea6aee4140393b30960e152f3994" -PV = "23.2.1" +SRCREV = "82e6a9293c476267417c5b6b906b01fb73a34e38" +PV = "24.0.1" PVR_DISPLAY_CONTROLLER_ALIAS ??= "tidss" PACKAGECONFIG[pvr] = "-Dgallium-pvr-alias=${PVR_DISPLAY_CONTROLLER_ALIAS}," PACKAGECONFIG[sgx] = "-Dgallium-sgx-alias=${PVR_DISPLAY_CONTROLLER_ALIAS}," -PACKAGECONFIG:remove = "video-codecs" -PACKAGECONFIG[video-codecs] = "" -PACKAGECONFIG:remove = "elf-tls" -PACKAGECONFIG[elf-tls] = "" -PACKAGECONFIG:remove = "xvmc" -PACKAGECONFIG[xvmc] = "" PACKAGE_ARCH = "${MACHINE_ARCH}"
Signature · 1 line
2.47.1
PATCH v3 3/4 ti-bsp: select the graphics 24.2 packages
In reply to [email protected]From: Randolph Sapp <[email protected]>
Since this is new logic is in place, switch the k6.6 and k6.12 configs to use these new libraries. Do not enable GFX on 6.12 just yet. Still need some kernel patches on the SGX side.
--- meta-ti-bsp/conf/machine/include/ti-bsp.inc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
meta-ti-bsp/conf/machine/include/ti-bsp.inc +6 -1
@@ -50,6 +50,11 @@ BSP_KERNEL_VERSION:bsp-ti-6_12 = "6.12%" BSP_BOOTLOADER_PROVIDER:bsp-ti-6_12 = "u-boot-ti-staging" BSP_BOOTLOADER_VERSION:bsp-ti-6_12 = "2025.01%" +BSP_ROGUE_DRIVER_PROVIDER:bsp-ti-6_12 = "ti-img-rogue-driver" +BSP_ROGUE_DRIVER_VERSION:bsp-ti-6_12 = "24%" +BSP_ROGUE_UMLIBS_VERSION:bsp-ti-6_12 = "24%" +BSP_MESA_PVR_VERSION:bsp-ti-6_12 = "24%" + # GPU support requires out-of-tree SGX and Rogue drivers not available # in 6.12 yet MACHINE_FEATURES:remove:bsp-ti-6_12 = "gpu"
@@ -72,7 +77,7 @@ BSP_SGX_UMLIBS_VERSION:bsp-ti-6_6 = "1.17%" BSP_ROGUE_DRIVER_PROVIDER:bsp-ti-6_6 = "ti-img-rogue-driver" BSP_ROGUE_DRIVER_VERSION:bsp-ti-6_6 = "24%" BSP_ROGUE_UMLIBS_VERSION:bsp-ti-6_6 = "24%" -BSP_MESA_PVR_VERSION:bsp-ti-6_6 = "23%" +BSP_MESA_PVR_VERSION:bsp-ti-6_6 = "24%" # GC320 support requires out-of-tree drivers not yet available in 6.6 MACHINE_FEATURES:remove:bsp-ti-6_6 = "gc320"
Signature · 1 line
2.47.1
PATCH v3 4/4 ti-img-rogue-umlibs: filter binaries post install
In reply to [email protected]From: Randolph Sapp <[email protected]>
No reason to do this pre install now that my python function can evaluate file paths. Also, this may have been causing issues with state when attempting to switch between opencl enabled/disabled builds.
--- .../powervr-umlibs/ti-img-rogue-umlibs_23.3.6512818.bb | 10 +++++----- .../powervr-umlibs/ti-img-rogue-umlibs_24.2.6643903.bb | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-)
meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_23.3.6512818.bb +5 -5
@@ -44,7 +44,7 @@ PACKAGECONFIG[opencl] = ",,,,${OPENCL_PACKAGES}" def get_file_list(package_list_var, d): file_list = [] package_list = d.getVar(package_list_var) - prefix = f"{d.getVar('S')}/" + prefix = f"{d.getVar('D')}/" if package_list: for package in package_list.split(): package_file_string = d.getVar(f"FILES:{package}")
@@ -53,7 +53,7 @@ def get_file_list(package_list_var, d): file_list.append(f"{prefix}{package_file}") return " ".join(file_list) -do_install:prepend() { +do_install:append() { if ${@bb.utils.contains('PACKAGECONFIG', 'opengl', 'false', 'true', d)}; then for file in ${@get_file_list('GLES_PACKAGES', d)}; do rm -rf ${file}
@@ -70,13 +70,13 @@ do_install:prepend() { done fi if ${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'true', 'false', d)}; then - if [ -e ${S}/lib/firmware ]; then - mv ${S}/lib/firmware ${S}${nonarch_base_libdir} + if [ -e ${D}/lib/firmware ]; then + mv ${D}/lib/firmware ${D}${nonarch_base_libdir} fi fi # clean up any empty directories - find "${S}" -empty -type d -delete + find "${D}" -empty -type d -delete } GLES_PACKAGES = "libgles1-rogue libgles2-rogue libgles3-rogue"
meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_24.2.6643903.bb +5 -5
@@ -45,7 +45,7 @@ PACKAGECONFIG[opencl] = ",,,,${OPENCL_PACKAGES}" def get_file_list(package_list_var, d): file_list = [] package_list = d.getVar(package_list_var) - prefix = f"{d.getVar('S')}/" + prefix = f"{d.getVar('D')}/" if package_list: for package in package_list.split(): package_file_string = d.getVar(f"FILES:{package}")
@@ -54,7 +54,7 @@ def get_file_list(package_list_var, d): file_list.append(f"{prefix}{package_file}") return " ".join(file_list) -do_install:prepend() { +do_install:append() { if ${@bb.utils.contains('PACKAGECONFIG', 'opengl', 'false', 'true', d)}; then for file in ${@get_file_list('GLES_PACKAGES', d)}; do rm -rf ${file}
@@ -71,13 +71,13 @@ do_install:prepend() { done fi if ${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'true', 'false', d)}; then - if [ -e ${S}/lib/firmware ]; then - mv ${S}/lib/firmware ${S}${nonarch_base_libdir} + if [ -e ${D}/lib/firmware ]; then + mv ${D}/lib/firmware ${D}${nonarch_base_libdir} fi fi # clean up any empty directories - find "${S}" -empty -type d -delete + find "${D}" -empty -type d -delete } GLES_PACKAGES = "libgles1-rogue libgles2-rogue libgles3-rogue"
Signature · 1 line
2.47.1