From patchwork Thu Jan 23 01:08:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randolph Sapp X-Patchwork-Id: 55977 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 08FF1C0218C for ; Thu, 23 Jan 2025 01:08:37 +0000 (UTC) Received: from lelvem-ot02.ext.ti.com (lelvem-ot02.ext.ti.com [198.47.23.235]) by mx.groups.io with SMTP id smtpd.web10.1257.1737594510578554755 for ; Wed, 22 Jan 2025 17:08:30 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=TWzUEy6k; spf=pass (domain: ti.com, ip: 198.47.23.235, mailfrom: rs@ti.com) Received: from lelv0266.itg.ti.com ([10.180.67.225]) by lelvem-ot02.ext.ti.com (8.15.2/8.15.2) with ESMTPS id 50N18TV5289159 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Wed, 22 Jan 2025 19:08:29 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1737594509; bh=S6XhnHM1Wc2RApNVwZnqDwRbiJvkqjgnDOmZQNd0qLI=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=TWzUEy6kIjacV8tWSUZe6rp8ljmddu2tzexC0QVFsIxqlDi/pz7ybQfPMU7RI66Ji LsypXUXdxlZ1mTbH9OJnj2usHa7SYdhke9hr95/dQOfhkbTh/Ib+DOvQ+n9FqsZ79P SLOcduo2932gE9QiIZyFymio/qfP8ij9oA5XaCAw= Received: from DFLE114.ent.ti.com (dfle114.ent.ti.com [10.64.6.35]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTP id 50N18Trg092652; Wed, 22 Jan 2025 19:08:29 -0600 Received: from DFLE102.ent.ti.com (10.64.6.23) by DFLE114.ent.ti.com (10.64.6.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Wed, 22 Jan 2025 19:08:29 -0600 Received: from lelvsmtp6.itg.ti.com (10.180.75.249) by DFLE102.ent.ti.com (10.64.6.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23 via Frontend Transport; Wed, 22 Jan 2025 19:08:29 -0600 Received: from rs-desk.dhcp.ti.com (rs-desk.dhcp.ti.com [128.247.81.144]) by lelvsmtp6.itg.ti.com (8.15.2/8.15.2) with ESMTP id 50N18RU9079409; Wed, 22 Jan 2025 19:08:29 -0600 From: To: , CC: , Subject: [meta-ti][master][PATCHv3 1/4] ti-img-rogue-*: version 24.1.6554834 -> 24.2.6643903 Date: Wed, 22 Jan 2025 19:08:16 -0600 Message-ID: <20250123010819.2798518-2-rs@ti.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250123010819.2798518-1-rs@ti.com> References: <20250123010819.2798518-1-rs@ti.com> MIME-Version: 1.0 X-C2ProcessedOrg: 333ef613-75bf-4e12-a4b1-8e3623f5dcea List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 23 Jan 2025 01:08:37 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/18229 From: Randolph Sapp Bump the package version for DDK 24.2, this includes a few fixups from IMG and support for a newer version of mesa. Signed-off-by: Randolph Sapp --- ...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%) diff --git a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_24.1.6554834.bb b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_24.2.6643903.bb similarity index 93% rename from meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_24.1.6554834.bb rename to meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_24.2.6643903.bb index 9007872f..d3860dd8 100644 --- a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_24.1.6554834.bb +++ b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_24.2.6643903.bb @@ -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" diff --git a/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_24.1.6554834.bb b/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_24.2.6643903.bb similarity index 98% rename from meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_24.1.6554834.bb rename to meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_24.2.6643903.bb index 720a3cff..0de66b72 100644 --- a/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_24.1.6554834.bb +++ b/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_24.2.6643903.bb @@ -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" From patchwork Thu Jan 23 01:08:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randolph Sapp X-Patchwork-Id: 55976 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id F2DCDC0218D for ; Thu, 23 Jan 2025 01:08:36 +0000 (UTC) Received: from lelvem-ot01.ext.ti.com (lelvem-ot01.ext.ti.com [198.47.23.234]) by mx.groups.io with SMTP id smtpd.web11.1335.1737594510787341737 for ; Wed, 22 Jan 2025 17:08:30 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=vo34HDdq; spf=pass (domain: ti.com, ip: 198.47.23.234, mailfrom: rs@ti.com) Received: from fllv0034.itg.ti.com ([10.64.40.246]) by lelvem-ot01.ext.ti.com (8.15.2/8.15.2) with ESMTPS id 50N18Tf51109043 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 22 Jan 2025 19:08:29 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1737594509; bh=PkSlOktfTjkjLiEJwe25EXtY5HVcigQ5lFsOMuBZ+8Y=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=vo34HDdq1HJgXrLgDJhHGF0YMyLBz4pnEPHe/OGZMDveDXXYdx4w77QSw6LMJPcRe iY0Fewfch0NbKPq60Y9DBNYOE1UiwGYGUsbU+2D8lgy99bJElhPFma3p6otdda5eZT jIJZsxwquG8BchjISkxYAaq42xr7eMzPv1OGm5K0= Received: from DLEE109.ent.ti.com (dlee109.ent.ti.com [157.170.170.41]) by fllv0034.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 50N18TN9064480 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 22 Jan 2025 19:08:29 -0600 Received: from DLEE100.ent.ti.com (157.170.170.30) by DLEE109.ent.ti.com (157.170.170.41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Wed, 22 Jan 2025 19:08:29 -0600 Received: from lelvsmtp6.itg.ti.com (10.180.75.249) by DLEE100.ent.ti.com (157.170.170.30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23 via Frontend Transport; Wed, 22 Jan 2025 19:08:29 -0600 Received: from rs-desk.dhcp.ti.com (rs-desk.dhcp.ti.com [128.247.81.144]) by lelvsmtp6.itg.ti.com (8.15.2/8.15.2) with ESMTP id 50N18RUA079409; Wed, 22 Jan 2025 19:08:29 -0600 From: To: , CC: , Subject: [meta-ti][master][PATCHv3 2/4] mesa-pvr: version 23.2.1 -> 24.0.1 Date: Wed, 22 Jan 2025 19:08:17 -0600 Message-ID: <20250123010819.2798518-3-rs@ti.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250123010819.2798518-1-rs@ti.com> References: <20250123010819.2798518-1-rs@ti.com> MIME-Version: 1.0 X-C2ProcessedOrg: 333ef613-75bf-4e12-a4b1-8e3623f5dcea List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 23 Jan 2025 01:08:36 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/18230 From: Randolph Sapp 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. Signed-off-by: Randolph Sapp --- ...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%) diff --git a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-23.2.1/0001-gallium-Fix-build-with-llvm-18-and-19.patch b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-23.2.1/0001-gallium-Fix-build-with-llvm-18-and-19.patch deleted file mode 100644 index ad5059f1..00000000 --- a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-23.2.1/0001-gallium-Fix-build-with-llvm-18-and-19.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 6c5033bb01a3a1341d4db5007586a5f2e2727b0a Mon Sep 17 00:00:00 2001 -From: Ryan Eatmon -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 ---- - 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 features; -- llvm::sys::getHostCPUFeatures(features); -+ #if LLVM_VERSION_MAJOR >= 19 -+ /* llvm-19+ returns StringMap from getHostCPUFeatures. -+ */ -+ auto features = llvm::sys::getHostCPUFeatures(); -+ #else -+ llvm::StringMap features; -+ llvm::sys::getHostCPUFeatures(features); -+ #endif - - for (StringMapIterator f = features.begin(); - f != features.end(); --- -2.17.1 - diff --git a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-23.2.1/0001-meson-Disable-cmake-dependency-detector-for-llvm.patch b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-23.2.1/0001-meson-Disable-cmake-dependency-detector-for-llvm.patch deleted file mode 100644 index 4cded054..00000000 --- a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-23.2.1/0001-meson-Disable-cmake-dependency-detector-for-llvm.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 00d41cd5aa3f4b494dc276c9b4ccdc096310c91f Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 28 Sep 2023 15:34:22 -0700 -Subject: [PATCH] meson: use llvm-config instead of cmake to fix linking errors with meson 1.2.1 - -meson dependency auto dependency detection uses cmake and then -config-tool to process dependencies, in mesa the logic to detect llvm is -using auto detection which means if it finds cmake then it will try to -use cmake method. Cmake method works ok except a case when llvm-dev -package is installed on the build host then it generates its own -native.meson file and ignores OE supplied meson.native file which has -correct llvm-config tool specified which is pointing to llvm-config from -native sysroot. The generated meson.native file points to one found in -/usr/bin and there onwards detector finds native install of llvm and -configures that into building native mesa package. - -Since cmake detector does not always work, disable it by default and use -config-tool which works in all cases. This is suggested in below issues -too - -A similar issue is open in meson upstream [1] and mesa [2] - -[1] https://github.com/mesonbuild/meson/issues/10483 -[2] https://gitlab.freedesktop.org/mesa/mesa/-/issues/6738 - -Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25438] - -Signed-off-by: Khem Raj ---- - meson.build | 1 + - 1 file changed, 1 insertion(+) - ---- a/meson.build -+++ b/meson.build -@@ -1659,6 +1659,7 @@ with_llvm = false - if _llvm.allowed() - dep_llvm = dependency( - 'llvm', -+ method : host_machine.system() == 'windows' ? 'auto' : 'config-tool', - version : _llvm_version, - modules : llvm_modules, - optional_modules : llvm_optional_modules, diff --git a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-24.0.1/0001-Update-lp_bld_misc.cpp-to-support-llvm-19.patch b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-24.0.1/0001-Update-lp_bld_misc.cpp-to-support-llvm-19.patch new file mode 100644 index 00000000..6547bce3 --- /dev/null +++ b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-24.0.1/0001-Update-lp_bld_misc.cpp-to-support-llvm-19.patch @@ -0,0 +1,39 @@ +From fa9cd89a85b904615ebc11da609445b5b751e68d Mon Sep 17 00:00:00 2001 +From: Satadru Pramanik +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: +Upstream-Status: Backport [https://gitlab.freedesktop.org/mesa/mesa/-/commit/fa9cd89a85b904615ebc11da609445b5b751e68d] +Signed-off-by: Randolph Sapp +--- + 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 &MAttrs) + * which allows us to enable/disable code generation based + * on the results of cpuid on these architectures. + */ +- llvm::StringMap features; +- llvm::sys::getHostCPUFeatures(features); ++ #if LLVM_VERSION_MAJOR >= 19 ++ /* llvm-19+ returns StringMap from getHostCPUFeatures. ++ */ ++ auto features = llvm::sys::getHostCPUFeatures(); ++ #else ++ llvm::StringMap features; ++ llvm::sys::getHostCPUFeatures(features); ++ #endif + + for (llvm::StringMapIterator f = features.begin(); + f != features.end(); +-- +2.47.1 + diff --git a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-24.0.1/0001-drisw-fix-build-without-dri3.patch b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-24.0.1/0001-drisw-fix-build-without-dri3.patch new file mode 100644 index 00000000..ab161520 --- /dev/null +++ b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-24.0.1/0001-drisw-fix-build-without-dri3.patch @@ -0,0 +1,58 @@ +From 4bd15a419e892da843489c374c58c5b29c40b5d6 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Tue, 6 Feb 2024 09:47:09 +0100 +Subject: [PATCH 1/2] drisw: fix build without dri3 + +commit 1887368df41 ("glx/sw: check for modifier support in the kopper path") +added dri3_priv.h header and dri3_check_multibuffer() function in drisw that +can be build without dri3. + + i686-buildroot-linux-gnu/bin/ld: src/glx/libglx.a.p/drisw_glx.c.o: in function `driswCreateScreenDriver': + drisw_glx.c:(.text.driswCreateScreenDriver+0x3a0): undefined reference to `dri3_check_multibuffer' + collect2: error: ld returned 1 exit status + +Add HAVE_DRI3 guard around dri3_priv.h header and the zink code using +dri3_check_multibuffer(). + +Fixes: 1887368df41 ("glx/sw: check for modifier support in the kopper path") + +Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27478] +Signed-off-by: Romain Naour +Signed-off-by: Khem Raj +--- + src/glx/drisw_glx.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/glx/drisw_glx.c b/src/glx/drisw_glx.c +index 3d3f752..4b19e2d 100644 +--- a/src/glx/drisw_glx.c ++++ b/src/glx/drisw_glx.c +@@ -32,7 +32,9 @@ + #include + #include "dri_common.h" + #include "drisw_priv.h" ++#ifdef HAVE_DRI3 + #include "dri3_priv.h" ++#endif + #include + #include + #include +@@ -995,6 +997,7 @@ driswCreateScreenDriver(int screen, struct glx_display *priv, + goto handle_error; + } + ++#ifdef HAVE_DRI3 + if (pdpyp->zink) { + bool err; + psc->has_multibuffer = dri3_check_multibuffer(priv->dpy, &err); +@@ -1005,6 +1008,7 @@ driswCreateScreenDriver(int screen, struct glx_display *priv, + goto handle_error; + } + } ++#endif + + glx_config_destroy_list(psc->base.configs); + psc->base.configs = configs; +-- +2.44.0 + diff --git a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-23.2.1/0001-gallium-Fix-build-with-llvm-17.patch b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-24.0.1/0001-gallium-Fix-build-with-llvm-17.patch similarity index 99% rename from meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-23.2.1/0001-gallium-Fix-build-with-llvm-17.patch rename to meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-24.0.1/0001-gallium-Fix-build-with-llvm-17.patch index 738ff267..237f940f 100644 --- a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-23.2.1/0001-gallium-Fix-build-with-llvm-17.patch +++ b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-24.0.1/0001-gallium-Fix-build-with-llvm-17.patch @@ -36,5 +36,6 @@ index cd2108f..b1a4d03 100644 #include #endif +#endif - + unsigned gallivm_perf = 0; + diff --git a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-24.0.1/0001-gallivm-Call-StringMapIterator-from-llvm-scope.patch b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-24.0.1/0001-gallivm-Call-StringMapIterator-from-llvm-scope.patch new file mode 100644 index 00000000..eb3e99cb --- /dev/null +++ b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-24.0.1/0001-gallivm-Call-StringMapIterator-from-llvm-scope.patch @@ -0,0 +1,32 @@ +From d17338d403980e1932a42f5d11c2a1fb7b25127b Mon Sep 17 00:00:00 2001 +From: MastaG +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 +Signed-off-by: David Heidelberg +Part-of: +Upstream-Status: Backport [https://gitlab.freedesktop.org/mesa/mesa/-/commit/d17338d403980e1932a42f5d11c2a1fb7b25127b] +Signed-off-by: Randolph Sapp +--- + 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 &MAttrs) + llvm::StringMap features; + llvm::sys::getHostCPUFeatures(features); + +- for (StringMapIterator f = features.begin(); ++ for (llvm::StringMapIterator f = features.begin(); + f != features.end(); + ++f) { + MAttrs.push_back(((*f).second ? "+" : "-") + (*f).first().str()); +-- +2.47.1 + diff --git a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-23.2.1/0001-meson-misdetects-64bit-atomics-on-mips-clang.patch b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-24.0.1/0001-meson-misdetects-64bit-atomics-on-mips-clang.patch similarity index 99% rename from meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-23.2.1/0001-meson-misdetects-64bit-atomics-on-mips-clang.patch rename to meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-24.0.1/0001-meson-misdetects-64bit-atomics-on-mips-clang.patch index 35bd0ea1..9cd9bee2 100644 --- a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-23.2.1/0001-meson-misdetects-64bit-atomics-on-mips-clang.patch +++ b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-24.0.1/0001-meson-misdetects-64bit-atomics-on-mips-clang.patch @@ -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 #include diff --git a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-23.2.1/0001-meson.build-check-for-all-linux-host_os-combinations.patch b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-24.0.1/0001-meson.build-check-for-all-linux-host_os-combinations.patch similarity index 70% rename from meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-23.2.1/0001-meson.build-check-for-all-linux-host_os-combinations.patch rename to meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-24.0.1/0001-meson.build-check-for-all-linux-host_os-combinations.patch index e9a6fd3f..b0be8d0f 100644 --- a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-23.2.1/0001-meson.build-check-for-all-linux-host_os-combinations.patch +++ b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-24.0.1/0001-meson.build-check-for-all-linux-host_os-combinations.patch @@ -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 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 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__' diff --git a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-24.0.1/0002-glxext-don-t-try-zink-if-not-enabled-in-mesa.patch b/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 mode 100644 index 00000000..036a0b49 --- /dev/null +++ b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-24.0.1/0002-glxext-don-t-try-zink-if-not-enabled-in-mesa.patch @@ -0,0 +1,42 @@ +From 62495ebb977866c52d5bed8499a547c49f0d9bc1 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Tue, 6 Feb 2024 09:47:10 +0100 +Subject: [PATCH 2/2] glxext: don't try zink if not enabled in mesa + +Commit 7d9ea77b459 ("glx: add automatic zink fallback loading between hw and sw drivers") +added an automatic zink fallback even when the zink gallium is not +enabled at build time. + +It leads to unexpected error log while loading drisw driver and +zink is not installed on the rootfs: + + MESA-LOADER: failed to open zink: /usr/lib/dri/zink_dri.so + +Fixes: 7d9ea77b459 ("glx: add automatic zink fallback loading between hw and sw drivers") + +Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27478] +Signed-off-by: Romain Naour +Signed-off-by: Khem Raj +--- + src/glx/glxext.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/glx/glxext.c b/src/glx/glxext.c +index 05c825a..7a06aa9 100644 +--- a/src/glx/glxext.c ++++ b/src/glx/glxext.c +@@ -908,9 +908,11 @@ __glXInitialize(Display * dpy) + #endif /* HAVE_DRI3 */ + if (!debug_get_bool_option("LIBGL_DRI2_DISABLE", false)) + dpyPriv->dri2Display = dri2CreateDisplay(dpy); ++#if defined(HAVE_ZINK) + if (!dpyPriv->dri3Display && !dpyPriv->dri2Display) + try_zink = !debug_get_bool_option("LIBGL_KOPPER_DISABLE", false) && + !getenv("GALLIUM_DRIVER"); ++#endif /* HAVE_ZINK */ + } + #endif /* GLX_USE_DRM */ + if (glx_direct) +-- +2.44.0 + diff --git a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_23.2.1.bb b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_24.0.1.bb similarity index 81% rename from meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_23.2.1.bb rename to meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_24.0.1.bb index cdff372a..1ac022d2 100644 --- a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_23.2.1.bb +++ b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_24.0.1.bb @@ -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}" From patchwork Thu Jan 23 01:08:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randolph Sapp X-Patchwork-Id: 55978 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0905FC0218F for ; Thu, 23 Jan 2025 01:08:37 +0000 (UTC) Received: from lelvem-ot02.ext.ti.com (lelvem-ot02.ext.ti.com [198.47.23.235]) by mx.groups.io with SMTP id smtpd.web10.1256.1737594510571793486 for ; Wed, 22 Jan 2025 17:08:30 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=MyhzVGew; spf=pass (domain: ti.com, ip: 198.47.23.235, mailfrom: rs@ti.com) Received: from lelv0265.itg.ti.com ([10.180.67.224]) by lelvem-ot02.ext.ti.com (8.15.2/8.15.2) with ESMTPS id 50N18TuL289161 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 22 Jan 2025 19:08:29 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1737594509; bh=cbAifbTKxx5oQs3yRAhaQNeY5OcxuqbjHgVGrOyH9gE=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=MyhzVGewFWcjvJXUnyYZV4JfCVxNAK7H43U49fr6XPUO3prlj2kFYZ7d6DEYAkQ24 cmIxMsr1JBLmN0Tsjg/uv7L9+bdb6HEtXPoshDlQcJMDx2saEBDAXsIKlniqijjOD1 W07DoTw1bPeom+BJE07QJ6Ek6UKT7Du+7JclAeh0= Received: from DLEE108.ent.ti.com (dlee108.ent.ti.com [157.170.170.38]) by lelv0265.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 50N18Tix012920 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 22 Jan 2025 19:08:29 -0600 Received: from DLEE114.ent.ti.com (157.170.170.25) by DLEE108.ent.ti.com (157.170.170.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Wed, 22 Jan 2025 19:08:29 -0600 Received: from lelvsmtp6.itg.ti.com (10.180.75.249) by DLEE114.ent.ti.com (157.170.170.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23 via Frontend Transport; Wed, 22 Jan 2025 19:08:29 -0600 Received: from rs-desk.dhcp.ti.com (rs-desk.dhcp.ti.com [128.247.81.144]) by lelvsmtp6.itg.ti.com (8.15.2/8.15.2) with ESMTP id 50N18RUB079409; Wed, 22 Jan 2025 19:08:29 -0600 From: To: , CC: , Subject: [meta-ti][master][PATCHv3 3/4] ti-bsp: select the graphics 24.2 packages Date: Wed, 22 Jan 2025 19:08:18 -0600 Message-ID: <20250123010819.2798518-4-rs@ti.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250123010819.2798518-1-rs@ti.com> References: <20250123010819.2798518-1-rs@ti.com> MIME-Version: 1.0 X-C2ProcessedOrg: 333ef613-75bf-4e12-a4b1-8e3623f5dcea List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 23 Jan 2025 01:08:37 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/18228 From: Randolph Sapp 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. Signed-off-by: Randolph Sapp --- meta-ti-bsp/conf/machine/include/ti-bsp.inc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meta-ti-bsp/conf/machine/include/ti-bsp.inc b/meta-ti-bsp/conf/machine/include/ti-bsp.inc index 0d519671..1e84d0fb 100644 --- a/meta-ti-bsp/conf/machine/include/ti-bsp.inc +++ b/meta-ti-bsp/conf/machine/include/ti-bsp.inc @@ -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" From patchwork Thu Jan 23 01:08:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randolph Sapp X-Patchwork-Id: 55975 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id EE246C02181 for ; Thu, 23 Jan 2025 01:08:36 +0000 (UTC) Received: from fllvem-ot03.ext.ti.com (fllvem-ot03.ext.ti.com [198.47.19.245]) by mx.groups.io with SMTP id smtpd.web10.1258.1737594511265516313 for ; Wed, 22 Jan 2025 17:08:31 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=NuhBCqeY; spf=pass (domain: ti.com, ip: 198.47.19.245, mailfrom: rs@ti.com) Received: from lelv0266.itg.ti.com ([10.180.67.225]) by fllvem-ot03.ext.ti.com (8.15.2/8.15.2) with ESMTPS id 50N18T4W1084949 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Wed, 22 Jan 2025 19:08:29 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1737594509; bh=/pKIScUT9KZKgK8ov8PqnamOtPIgpMLbC675g8aBUXM=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=NuhBCqeY4UKBnVmGbMOAg8OIg7LH3AYjIX/latDBrrKZGsW+LIrXpV1pEiHgN8rC5 t1aUXB2q6t40OG/mqz4XBEnzKijYrC8dBusfZ5Ydj0hdorTDWHWD47WXvxTMZSKQu7 V4m82W+VC4ZeMI7g3eOGbBscSt3oieN2+J3Cax6c= Received: from DFLE101.ent.ti.com (dfle101.ent.ti.com [10.64.6.22]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTP id 50N18THf092655; Wed, 22 Jan 2025 19:08:29 -0600 Received: from DFLE105.ent.ti.com (10.64.6.26) by DFLE101.ent.ti.com (10.64.6.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Wed, 22 Jan 2025 19:08:29 -0600 Received: from lelvsmtp6.itg.ti.com (10.180.75.249) by DFLE105.ent.ti.com (10.64.6.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23 via Frontend Transport; Wed, 22 Jan 2025 19:08:29 -0600 Received: from rs-desk.dhcp.ti.com (rs-desk.dhcp.ti.com [128.247.81.144]) by lelvsmtp6.itg.ti.com (8.15.2/8.15.2) with ESMTP id 50N18RUC079409; Wed, 22 Jan 2025 19:08:29 -0600 From: To: , CC: , Subject: [meta-ti][master][PATCHv3 4/4] ti-img-rogue-umlibs: filter binaries post install Date: Wed, 22 Jan 2025 19:08:19 -0600 Message-ID: <20250123010819.2798518-5-rs@ti.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250123010819.2798518-1-rs@ti.com> References: <20250123010819.2798518-1-rs@ti.com> MIME-Version: 1.0 X-C2ProcessedOrg: 333ef613-75bf-4e12-a4b1-8e3623f5dcea List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 23 Jan 2025 01:08:36 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/18231 From: Randolph Sapp 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. Signed-off-by: Randolph Sapp --- .../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(-) diff --git a/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_23.3.6512818.bb b/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_23.3.6512818.bb index 40835439..675edc14 100644 --- a/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_23.3.6512818.bb +++ b/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_23.3.6512818.bb @@ -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" diff --git a/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_24.2.6643903.bb b/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_24.2.6643903.bb index 0de66b72..b8153711 100644 --- a/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_24.2.6643903.bb +++ b/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_24.2.6643903.bb @@ -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"