From patchwork Tue Sep 9 15:10:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 69862 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 21618CAC583 for ; Tue, 9 Sep 2025 15:10:31 +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.web11.834.1757430630732153624 for ; Tue, 09 Sep 2025 08:10:30 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=CKFlpizl; spf=pass (domain: ti.com, ip: 198.47.19.245, mailfrom: afd@ti.com) Received: from lelvem-sh02.itg.ti.com ([10.180.78.226]) by fllvem-ot03.ext.ti.com (8.15.2/8.15.2) with ESMTP id 589FASpY4051795; Tue, 9 Sep 2025 10:10:28 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1757430628; bh=8xwzhm6nn+nN75y/hhOJWrrBDSMgGi5lcd1TyBynuMI=; h=From:To:CC:Subject:Date; b=CKFlpizl20Mt9sqwF2tiTPdNOO9mjHtOEY7lOz5kldxjI3sMJww7MWxyrBEf1UYLC kNCqzz1NUiZGlpLvqNxAQysVTeVB6fttrZ483H1qXwobc23vKQaMZsXrmZ+KseGfbf yfm+t7EfTnhc8PqoFtncrE9Z7W6d66pgg97ufLNU= Received: from DFLE106.ent.ti.com (dfle106.ent.ti.com [10.64.6.27]) by lelvem-sh02.itg.ti.com (8.18.1/8.18.1) with ESMTPS id 589FASdV3796167 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA256 bits=128 verify=FAIL); Tue, 9 Sep 2025 10:10:28 -0500 Received: from DFLE112.ent.ti.com (10.64.6.33) by DFLE106.ent.ti.com (10.64.6.27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.55; Tue, 9 Sep 2025 10:10:28 -0500 Received: from lelvem-mr05.itg.ti.com (10.180.75.9) by DFLE112.ent.ti.com (10.64.6.33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.55 via Frontend Transport; Tue, 9 Sep 2025 10:10:28 -0500 Received: from ula0226330.dhcp.ti.com (ula0226330.dhcp.ti.com [10.247.30.162]) by lelvem-mr05.itg.ti.com (8.18.1/8.18.1) with ESMTP id 589FASUg2825029; Tue, 9 Sep 2025 10:10:28 -0500 From: Andrew Davis To: Denys Dmytriyenko , Ryan Eatmon , Randolph Sapp , CC: Andrew Davis Subject: [meta-ti][scarthgap][RFC 1/6] ti-sgx-ddk-um: UM side driver depends on KM side driver Date: Tue, 9 Sep 2025 10:10:23 -0500 Message-ID: <20250909151028.272925-1-afd@ti.com> X-Mailer: git-send-email 2.39.2 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 ; Tue, 09 Sep 2025 15:10:31 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/18984 This also matches what is done for ti-img-rogue-umlibs. Signed-off-by: Andrew Davis --- .../powervr-umlibs/ti-sgx-ddk-um_1.17.4948957.bb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-sgx-ddk-um_1.17.4948957.bb b/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-sgx-ddk-um_1.17.4948957.bb index b260abdf..b6f5534e 100644 --- a/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-sgx-ddk-um_1.17.4948957.bb +++ b/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-sgx-ddk-um_1.17.4948957.bb @@ -40,9 +40,7 @@ TARGET_PRODUCT:ti43x = "ti437x_linux" TARGET_PRODUCT:omap-a15 = "ti572x_linux" TARGET_PRODUCT:am65xx = "ti654x_linux" -RDEPENDS:${PN} += "libdrm" - -RRECOMMENDS:${PN} += "ti-sgx-ddk-km" +RDEPENDS:${PN} += "libdrm ti-sgx-ddk-km" S = "${WORKDIR}/git" From patchwork Tue Sep 9 15:10:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 69861 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 22B82CA0FED for ; Tue, 9 Sep 2025 15:10:31 +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.web10.863.1757430629565224001 for ; Tue, 09 Sep 2025 08:10:29 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=qXawGAci; spf=pass (domain: ti.com, ip: 198.47.23.234, mailfrom: afd@ti.com) Received: from lelvem-sh01.itg.ti.com ([10.180.77.71]) by lelvem-ot01.ext.ti.com (8.15.2/8.15.2) with ESMTP id 589FASOL4129451; Tue, 9 Sep 2025 10:10:28 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1757430628; bh=icgNgNaNePv/Ri1rVeyR7zsErQSCKPJ5NfoPybCaPuk=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=qXawGAci9LZesncXQnY3YlzQxlNI7dMDptTSXclIVArucM7GWH1BKSLpauMVzttYs eFwJY61Xfh3Rk2KiMGmmZiZvDzQOZlOXKY0TO6aHPalB0bhuS1RwckA+IA91ZBaIQK yJnk42OlKSNbpZLDQmwjppibzOqv+r7OzYF95VeM= Received: from DFLE108.ent.ti.com (dfle108.ent.ti.com [10.64.6.29]) by lelvem-sh01.itg.ti.com (8.18.1/8.18.1) with ESMTPS id 589FASqd3237204 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA256 bits=128 verify=FAIL); Tue, 9 Sep 2025 10:10:28 -0500 Received: from DFLE106.ent.ti.com (10.64.6.27) by DFLE108.ent.ti.com (10.64.6.29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.55; Tue, 9 Sep 2025 10:10:28 -0500 Received: from lelvem-mr05.itg.ti.com (10.180.75.9) by DFLE106.ent.ti.com (10.64.6.27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.55 via Frontend Transport; Tue, 9 Sep 2025 10:10:28 -0500 Received: from ula0226330.dhcp.ti.com (ula0226330.dhcp.ti.com [10.247.30.162]) by lelvem-mr05.itg.ti.com (8.18.1/8.18.1) with ESMTP id 589FASUh2825029; Tue, 9 Sep 2025 10:10:28 -0500 From: Andrew Davis To: Denys Dmytriyenko , Ryan Eatmon , Randolph Sapp , CC: Andrew Davis Subject: [meta-ti][scarthgap][RFC 2/6] ti-bsp: Do not remove gpu MACHINE_FEATURE conditionally on BSP version Date: Tue, 9 Sep 2025 10:10:24 -0500 Message-ID: <20250909151028.272925-2-afd@ti.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20250909151028.272925-1-afd@ti.com> References: <20250909151028.272925-1-afd@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 ; Tue, 09 Sep 2025 15:10:31 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/18983 Setting or removing the gpu MACHINE_FEATURE does not actually change if the GPU driver is built or not. That is done based on the setting of the BSP_{SGX,ROGUE}_{DRIVER,UMLIBS}_{PROVIDER,VERSION} vars. These are default empty for BSP versions without supported GPU drivers, which will correctly cause a fallback to SW rendering when the GPU driver is not available. Signed-off-by: Andrew Davis --- meta-ti-bsp/conf/machine/include/ti-bsp.inc | 8 -------- 1 file changed, 8 deletions(-) diff --git a/meta-ti-bsp/conf/machine/include/ti-bsp.inc b/meta-ti-bsp/conf/machine/include/ti-bsp.inc index 262aa884..a5d9a51f 100644 --- a/meta-ti-bsp/conf/machine/include/ti-bsp.inc +++ b/meta-ti-bsp/conf/machine/include/ti-bsp.inc @@ -18,10 +18,6 @@ BSP_KERNEL_VERSION:bsp-mainline = "%" BSP_BOOTLOADER_PROVIDER:bsp-mainline = "u-boot-ti-mainline" BSP_BOOTLOADER_VERSION:bsp-mainline = "%" -# GPU support requires out-of-tree SGX and Rogue drivers not available -# in mainline, usually present in TI staging or derivative like BB.org -MACHINE_FEATURES:remove:bsp-mainline = "gpu" - # GC320 support requires out-of-tree drivers not available in mainline MACHINE_FEATURES:remove:bsp-mainline = "gc320" @@ -34,10 +30,6 @@ BSP_KERNEL_VERSION:bsp-next = "%" BSP_BOOTLOADER_PROVIDER:bsp-next = "u-boot-ti-next" BSP_BOOTLOADER_VERSION:bsp-next = "%" -# GPU support requires out-of-tree SGX and Rogue drivers not available -# in next, usually present in TI staging or derivative like BB.org -MACHINE_FEATURES:remove:bsp-next = "gpu" - # GC320 support requires out-of-tree drivers not available in next MACHINE_FEATURES:remove:bsp-next = "gc320" From patchwork Tue Sep 9 15:10:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 69863 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 08B80CA0FED for ; Tue, 9 Sep 2025 15:10:41 +0000 (UTC) Received: from fllvem-ot04.ext.ti.com (fllvem-ot04.ext.ti.com [198.47.19.246]) by mx.groups.io with SMTP id smtpd.web10.865.1757430630997818044 for ; Tue, 09 Sep 2025 08:10:31 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=CLNlKQC1; spf=pass (domain: ti.com, ip: 198.47.19.246, mailfrom: afd@ti.com) Received: from lelvem-sh02.itg.ti.com ([10.180.78.226]) by fllvem-ot04.ext.ti.com (8.15.2/8.15.2) with ESMTP id 589FASd3312741; Tue, 9 Sep 2025 10:10:28 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1757430628; bh=K4WDBA4MuCEpIIrbnT/jUvB8vpeRbz/gIMHdsTLVSAE=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=CLNlKQC1AUdKJDMNJ8OfwDkT3uEd7UI63N3JF9LZ7ReLmTGgnDNq6LTToSEtgLGY0 kLR/aBqOymiB6GXPpGQNc6KndgCPJ3hyXamjcVmgkyYg1W/ijrJ0vqlnW6tfpDbcEn JdN4liZ99EsdNULMo7ClqrdPwVFK6O23vKnm44nY= Received: from DFLE113.ent.ti.com (dfle113.ent.ti.com [10.64.6.34]) by lelvem-sh02.itg.ti.com (8.18.1/8.18.1) with ESMTPS id 589FAS0J3796170 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA256 bits=128 verify=FAIL); Tue, 9 Sep 2025 10:10:28 -0500 Received: from DFLE114.ent.ti.com (10.64.6.35) by DFLE113.ent.ti.com (10.64.6.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.55; Tue, 9 Sep 2025 10:10:28 -0500 Received: from lelvem-mr05.itg.ti.com (10.180.75.9) 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.55 via Frontend Transport; Tue, 9 Sep 2025 10:10:28 -0500 Received: from ula0226330.dhcp.ti.com (ula0226330.dhcp.ti.com [10.247.30.162]) by lelvem-mr05.itg.ti.com (8.18.1/8.18.1) with ESMTP id 589FASUi2825029; Tue, 9 Sep 2025 10:10:28 -0500 From: Andrew Davis To: Denys Dmytriyenko , Ryan Eatmon , Randolph Sapp , CC: Andrew Davis Subject: [meta-ti][scarthgap][RFC 3/6] ti-bsp: Use same version for both UM and KM driver Date: Tue, 9 Sep 2025 10:10:25 -0500 Message-ID: <20250909151028.272925-3-afd@ti.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20250909151028.272925-1-afd@ti.com> References: <20250909151028.272925-1-afd@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 ; Tue, 09 Sep 2025 15:10:41 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/18985 The DRIVER and matching UMLIBS must always match, no need to define a version number for both. Keep this simple and remove the extra defines. Signed-off-by: Andrew Davis --- meta-beagle/conf/machine/include/beagle-bsp.inc | 4 ---- meta-ti-bsp/conf/machine/include/ti-bsp.inc | 10 ++-------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/meta-beagle/conf/machine/include/beagle-bsp.inc b/meta-beagle/conf/machine/include/beagle-bsp.inc index d180c297..448e2086 100644 --- a/meta-beagle/conf/machine/include/beagle-bsp.inc +++ b/meta-beagle/conf/machine/include/beagle-bsp.inc @@ -18,10 +18,8 @@ KERNEL_DEVICETREE_PREFIX:bsp-bb_org-6_12 = "" BSP_SGX_DRIVER_PROVIDER:bsp-bb_org-6_12 = "ti-sgx-ddk-km" BSP_SGX_DRIVER_VERSION:bsp-bb_org-6_12 = "1.17%" -BSP_SGX_UMLIBS_VERSION:bsp-bb_org-6_12 = "1.17%" BSP_ROGUE_DRIVER_PROVIDER:bsp-bb_org-6_12 = "ti-img-rogue-driver" BSP_ROGUE_DRIVER_VERSION:bsp-bb_org-6_12 = "24%" -BSP_ROGUE_UMLIBS_VERSION:bsp-bb_org-6_12 = "24%" BSP_MESA_PVR_VERSION:bsp-bb_org-6_12 = "24%" # GC320 support requires out-of-tree drivers not yet available in bb.org 6.12 @@ -41,10 +39,8 @@ KERNEL_DEVICETREE_PREFIX:bsp-bb_org-6_6 = "" BSP_SGX_DRIVER_PROVIDER:bsp-bb_org-6_6 = "ti-sgx-ddk-km" BSP_SGX_DRIVER_VERSION:bsp-bb_org-6_6 = "1.17%" -BSP_SGX_UMLIBS_VERSION:bsp-bb_org-6_6 = "1.17%" BSP_ROGUE_DRIVER_PROVIDER:bsp-bb_org-6_6 = "ti-img-rogue-driver" BSP_ROGUE_DRIVER_VERSION:bsp-bb_org-6_6 = "24%" -BSP_ROGUE_UMLIBS_VERSION:bsp-bb_org-6_6 = "24%" BSP_MESA_PVR_VERSION:bsp-bb_org-6_6 = "24%" # GC320 support requires out-of-tree drivers not yet available in bb.org 6.6 diff --git a/meta-ti-bsp/conf/machine/include/ti-bsp.inc b/meta-ti-bsp/conf/machine/include/ti-bsp.inc index a5d9a51f..dc0473de 100644 --- a/meta-ti-bsp/conf/machine/include/ti-bsp.inc +++ b/meta-ti-bsp/conf/machine/include/ti-bsp.inc @@ -44,10 +44,8 @@ BSP_BOOTLOADER_VERSION:bsp-ti-6_12 = "2025.01%" BSP_SGX_DRIVER_PROVIDER:bsp-ti-6_12 = "ti-sgx-ddk-km" BSP_SGX_DRIVER_VERSION:bsp-ti-6_12 = "1.17%" -BSP_SGX_UMLIBS_VERSION:bsp-ti-6_12 = "1.17%" 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%" # ========== @@ -61,10 +59,8 @@ BSP_BOOTLOADER_VERSION:bsp-ti-6_6 = "2024.04%" BSP_SGX_DRIVER_PROVIDER:bsp-ti-6_6 = "ti-sgx-ddk-km" BSP_SGX_DRIVER_VERSION:bsp-ti-6_6 = "1.17%" -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 = "24%" # GC320 support requires out-of-tree drivers not yet available in 6.6 @@ -84,8 +80,6 @@ BSP_SGX_DRIVER_PROVIDER ?= "" BSP_SGX_DRIVER_VERSION ?= "" BSP_ROGUE_DRIVER_PROVIDER ?= "" BSP_ROGUE_DRIVER_VERSION ?= "" -BSP_SGX_UMLIBS_VERSION ?= "" -BSP_ROGUE_UMLIBS_VERSION ?= "" BSP_MESA_PVR_VERSION ?= "" # ========== @@ -101,7 +95,7 @@ PREFERRED_VERSION_${BSP_BOOTLOADER_PROVIDER} ?= "${BSP_BOOTLOADER_VERSION}" # GPU provider gets set in machine configs, as some machines are headless # Select default preferred versions here PREFERRED_VERSION_ti-sgx-ddk-km ?= "${BSP_SGX_DRIVER_VERSION}" -PREFERRED_VERSION_ti-sgx-ddk-um ?= "${BSP_SGX_UMLIBS_VERSION}" +PREFERRED_VERSION_ti-sgx-ddk-um ?= "${BSP_SGX_DRIVER_VERSION}" PREFERRED_VERSION_ti-img-rogue-driver ?= "${BSP_ROGUE_DRIVER_VERSION}" -PREFERRED_VERSION_ti-img-rogue-umlibs ?= "${BSP_ROGUE_UMLIBS_VERSION}" +PREFERRED_VERSION_ti-img-rogue-umlibs ?= "${BSP_ROGUE_DRIVER_VERSION}" PREFERRED_VERSION_mesa-pvr ?= "${BSP_MESA_PVR_VERSION}" From patchwork Tue Sep 9 15:10:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 69866 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 107D2CAC583 for ; Tue, 9 Sep 2025 15:10:41 +0000 (UTC) Received: from fllvem-ot04.ext.ti.com (fllvem-ot04.ext.ti.com [198.47.19.246]) by mx.groups.io with SMTP id smtpd.web11.836.1757430631052737821 for ; Tue, 09 Sep 2025 08:10:31 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=O/jrFg2h; spf=pass (domain: ti.com, ip: 198.47.19.246, mailfrom: afd@ti.com) Received: from fllvem-sh04.itg.ti.com ([10.64.41.54]) by fllvem-ot04.ext.ti.com (8.15.2/8.15.2) with ESMTP id 589FASp2312747; Tue, 9 Sep 2025 10:10:28 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1757430628; bh=p5FXTTwvnEBwLwS5LOIylIy92Jbif3cMq3BrSHY8G1M=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=O/jrFg2h2v0WD9FIvOvlSoXOZxOs0+PcLMa9DdpY6n/xjigc/tA2Bu7O0i7zHujH1 I7NHZlBrXpmBbj7U6R1LrG01jVeysT6RVv75EPlllV8pPinpgMTzCW+P1ml1oI+a2A BMQiC71zQ9ErJpyf3zqN1nKP0AGaffoLWqj5AMtQ= Received: from DFLE108.ent.ti.com (dfle108.ent.ti.com [10.64.6.29]) by fllvem-sh04.itg.ti.com (8.18.1/8.18.1) with ESMTPS id 589FASmi446031 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA256 bits=128 verify=FAIL); Tue, 9 Sep 2025 10:10:28 -0500 Received: from DFLE101.ent.ti.com (10.64.6.22) by DFLE108.ent.ti.com (10.64.6.29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.55; Tue, 9 Sep 2025 10:10:28 -0500 Received: from lelvem-mr05.itg.ti.com (10.180.75.9) 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.55 via Frontend Transport; Tue, 9 Sep 2025 10:10:28 -0500 Received: from ula0226330.dhcp.ti.com (ula0226330.dhcp.ti.com [10.247.30.162]) by lelvem-mr05.itg.ti.com (8.18.1/8.18.1) with ESMTP id 589FASUj2825029; Tue, 9 Sep 2025 10:10:28 -0500 From: Andrew Davis To: Denys Dmytriyenko , Ryan Eatmon , Randolph Sapp , CC: Andrew Davis Subject: [meta-ti][scarthgap][RFC 4/6] mesa-pvr: Remove need for PVR/SGX display aliases Date: Tue, 9 Sep 2025 10:10:26 -0500 Message-ID: <20250909151028.272925-4-afd@ti.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20250909151028.272925-1-afd@ti.com> References: <20250909151028.272925-1-afd@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 ; Tue, 09 Sep 2025 15:10:41 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/18986 Update mesa-pvr which includes a default set of display controller aliases for the supported display controllers. This means we do not have to manually set the alias for each device here in the integration layer. Remove that here. Signed-off-by: Andrew Davis --- meta-ti-bsp/conf/machine/include/omap-a15.inc | 1 - meta-ti-bsp/conf/machine/include/ti33x.inc | 1 - meta-ti-bsp/conf/machine/include/ti43x.inc | 1 - meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_24.0.1.bb | 7 +------ 4 files changed, 1 insertion(+), 9 deletions(-) diff --git a/meta-ti-bsp/conf/machine/include/omap-a15.inc b/meta-ti-bsp/conf/machine/include/omap-a15.inc index 2179476f..9058b461 100644 --- a/meta-ti-bsp/conf/machine/include/omap-a15.inc +++ b/meta-ti-bsp/conf/machine/include/omap-a15.inc @@ -9,7 +9,6 @@ require conf/machine/include/ti-bsp.inc # Graphics providers and variables require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_SGX_DRIVER_PROVIDER}" -PVR_DISPLAY_CONTROLLER_ALIAS ?= "omapdrm" KERNEL_IMAGETYPE = "zImage" KERNEL_IMAGETYPES = "zImage uImage" diff --git a/meta-ti-bsp/conf/machine/include/ti33x.inc b/meta-ti-bsp/conf/machine/include/ti33x.inc index c47165e4..5d7375e5 100644 --- a/meta-ti-bsp/conf/machine/include/ti33x.inc +++ b/meta-ti-bsp/conf/machine/include/ti33x.inc @@ -9,7 +9,6 @@ require conf/machine/include/ti-bsp.inc # Graphics providers and variables require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_SGX_DRIVER_PROVIDER}" -PVR_DISPLAY_CONTROLLER_ALIAS ?= "tilcdc" KERNEL_IMAGETYPE = "zImage" diff --git a/meta-ti-bsp/conf/machine/include/ti43x.inc b/meta-ti-bsp/conf/machine/include/ti43x.inc index a23b6518..7dd5b1f2 100644 --- a/meta-ti-bsp/conf/machine/include/ti43x.inc +++ b/meta-ti-bsp/conf/machine/include/ti43x.inc @@ -9,7 +9,6 @@ require conf/machine/include/ti-bsp.inc # Graphics providers and variables require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_SGX_DRIVER_PROVIDER}" -PVR_DISPLAY_CONTROLLER_ALIAS ?= "omapdrm" KERNEL_IMAGETYPE = "zImage" diff --git a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_24.0.1.bb b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_24.0.1.bb index e6bd5fde..6a4b296f 100644 --- a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_24.0.1.bb +++ b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_24.0.1.bb @@ -28,14 +28,9 @@ PACKAGECONFIG:append = " \ ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-sgx-ddk-km', 'sgx', '', d)} \ " -SRCREV = "82e6a9293c476267417c5b6b906b01fb73a34e38" +SRCREV = "68af6a102c2298569e77d1aa8bccc1ff61438b3e" 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}," - - PACKAGE_ARCH = "${MACHINE_ARCH}" GALLIUMDRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'pvr', ',pvr', '', d)}" From patchwork Tue Sep 9 15:10:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 69865 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 15B55CAC58C for ; Tue, 9 Sep 2025 15:10:41 +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.web11.837.1757430631090205380 for ; Tue, 09 Sep 2025 08:10:31 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=vqjwZowf; spf=pass (domain: ti.com, ip: 198.47.19.245, mailfrom: afd@ti.com) Received: from fllvem-sh03.itg.ti.com ([10.64.41.86]) by fllvem-ot03.ext.ti.com (8.15.2/8.15.2) with ESMTP id 589FASrf4051803; Tue, 9 Sep 2025 10:10:28 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1757430628; bh=RqiT/pICD++kWMjpO6UH8PRLZXHPmxqEwsbsAIVVG8o=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=vqjwZowfnof/pzmGtQbeKbf/mLW3NXXDiv7vFRkzePIP3lGnMzZ97n/yGX6At2gOw LZvj1ajub960Wv23Z8S5ZhUUmdqQpZWeGUnhTRUBbHa6GD8lnX8Ei0Nv1eS3pv+tBZ smxCUWrRxG3Mv5bpzunAMt31I/TFKFTTi7jjCWJ0= Received: from DFLE103.ent.ti.com (dfle103.ent.ti.com [10.64.6.24]) by fllvem-sh03.itg.ti.com (8.18.1/8.18.1) with ESMTPS id 589FASWA3864887 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA256 bits=128 verify=FAIL); Tue, 9 Sep 2025 10:10:28 -0500 Received: from DFLE108.ent.ti.com (10.64.6.29) by DFLE103.ent.ti.com (10.64.6.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.55; Tue, 9 Sep 2025 10:10:28 -0500 Received: from lelvem-mr05.itg.ti.com (10.180.75.9) by DFLE108.ent.ti.com (10.64.6.29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.55 via Frontend Transport; Tue, 9 Sep 2025 10:10:28 -0500 Received: from ula0226330.dhcp.ti.com (ula0226330.dhcp.ti.com [10.247.30.162]) by lelvem-mr05.itg.ti.com (8.18.1/8.18.1) with ESMTP id 589FASUk2825029; Tue, 9 Sep 2025 10:10:28 -0500 From: Andrew Davis To: Denys Dmytriyenko , Ryan Eatmon , Randolph Sapp , CC: Andrew Davis Subject: [meta-ti][scarthgap][RFC 5/6] mesa-pvr: Use PREFERRED_PROVIDER directly for GPU selection Date: Tue, 9 Sep 2025 10:10:27 -0500 Message-ID: <20250909151028.272925-5-afd@ti.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20250909151028.272925-1-afd@ti.com> References: <20250909151028.272925-1-afd@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 ; Tue, 09 Sep 2025 15:10:41 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/18987 Now that display controller aliases are not set using PACKAGECONFIG, instead of using PREFERRED_PROVIDER to add either "sgx" or "pvr" to PACKAGECONFIG, followed by reading it back out, simply use PREFERRED_PROVIDER directly. Signed-off-by: Andrew Davis --- meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_24.0.1.bb | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_24.0.1.bb b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_24.0.1.bb index 6a4b296f..40226f65 100644 --- a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_24.0.1.bb +++ b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_24.0.1.bb @@ -23,20 +23,15 @@ SRC_URI = " \ S = "${WORKDIR}/git" -PACKAGECONFIG:append = " \ - ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-img-rogue-driver', 'pvr', '', d)} \ - ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-sgx-ddk-km', 'sgx', '', d)} \ -" - SRCREV = "68af6a102c2298569e77d1aa8bccc1ff61438b3e" PV = "24.0.1" PACKAGE_ARCH = "${MACHINE_ARCH}" -GALLIUMDRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'pvr', ',pvr', '', d)}" -GALLIUMDRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'sgx', ',sgx', '', d)}" +GALLIUMDRIVERS:append = "${@bb.utils.contains('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-img-rogue-driver', ',pvr', '', d)}" +GALLIUMDRIVERS:append = "${@bb.utils.contains('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-sgx-ddk-km', ',sgx', '', d)}" -VULKAN_DRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'pvr', ',pvr', '', d)}" +VULKAN_DRIVERS:append = "${@bb.utils.contains('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-img-rogue-driver', ',pvr', '', d)}" do_install:append () { # remove pvr custom pkgconfig From patchwork Tue Sep 9 15:10:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 69864 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 08BC5CAC587 for ; Tue, 9 Sep 2025 15:10:41 +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.866.1757430631152038888 for ; Tue, 09 Sep 2025 08:10:31 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=OX0rQOO3; spf=pass (domain: ti.com, ip: 198.47.19.245, mailfrom: afd@ti.com) Received: from fllvem-sh03.itg.ti.com ([10.64.41.86]) by fllvem-ot03.ext.ti.com (8.15.2/8.15.2) with ESMTP id 589FASUs4051809; Tue, 9 Sep 2025 10:10:28 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1757430628; bh=gV18j5HCahh3uQiNiEZFg45eT9+i0I1EjkfjYjyTdDo=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=OX0rQOO3Mjio9IhiRicfGB/WrQTkbB2cFnBK9lkfh1PCj0a02O5JcxYIXYhu2VE9V 0rBr15V3su1Pe5Y3cvnsq8gAGwlIIEHD9RgBTLbZ0RjgUJE0HG9dbGsxYh0msSy03u /QMm7I79dogxlq0cZCoyJZ602Iqb11sD9SbFRguI= Received: from DLEE110.ent.ti.com (dlee110.ent.ti.com [157.170.170.21]) by fllvem-sh03.itg.ti.com (8.18.1/8.18.1) with ESMTPS id 589FASv73864890 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA256 bits=128 verify=FAIL); Tue, 9 Sep 2025 10:10:28 -0500 Received: from DLEE102.ent.ti.com (157.170.170.32) by DLEE110.ent.ti.com (157.170.170.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.55; Tue, 9 Sep 2025 10:10:28 -0500 Received: from lelvem-mr05.itg.ti.com (10.180.75.9) by DLEE102.ent.ti.com (157.170.170.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.55 via Frontend Transport; Tue, 9 Sep 2025 10:10:28 -0500 Received: from ula0226330.dhcp.ti.com (ula0226330.dhcp.ti.com [10.247.30.162]) by lelvem-mr05.itg.ti.com (8.18.1/8.18.1) with ESMTP id 589FASUl2825029; Tue, 9 Sep 2025 10:10:28 -0500 From: Andrew Davis To: Denys Dmytriyenko , Ryan Eatmon , Randolph Sapp , CC: Andrew Davis Subject: [meta-ti][scarthgap][RFC 6/6] mesa-pvr: Use mesa-pvr for all TI SoCs Date: Tue, 9 Sep 2025 10:10:28 -0500 Message-ID: <20250909151028.272925-6-afd@ti.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20250909151028.272925-1-afd@ti.com> References: <20250909151028.272925-1-afd@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 ; Tue, 09 Sep 2025 15:10:41 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/18988 TI SoCs without GPUs can still use mesa-pvr as it will simply fallback to SW rendering just like the normal mesa package. The benefit is using the same version across all supported devices is more consistent and only one version of Mesa is needed for all TI SoCs. Signed-off-by: Andrew Davis --- meta-ti-bsp/conf/machine/beagleplay-ti.conf | 1 - meta-ti-bsp/conf/machine/include/am62pxx.inc | 1 - meta-ti-bsp/conf/machine/include/am62xx.inc | 1 - meta-ti-bsp/conf/machine/include/am65xx.inc | 1 - meta-ti-bsp/conf/machine/include/am68.inc | 1 - meta-ti-bsp/conf/machine/include/am69.inc | 1 - meta-ti-bsp/conf/machine/include/j721e.inc | 1 - meta-ti-bsp/conf/machine/include/j721s2.inc | 1 - meta-ti-bsp/conf/machine/include/j722s.inc | 1 - meta-ti-bsp/conf/machine/include/j742s2.inc | 1 - meta-ti-bsp/conf/machine/include/j784s4.inc | 1 - meta-ti-bsp/conf/machine/include/mesa-pvr.inc | 8 -------- meta-ti-bsp/conf/machine/include/omap-a15.inc | 1 - meta-ti-bsp/conf/machine/include/ti-bsp.inc | 8 ++++++++ meta-ti-bsp/conf/machine/include/ti33x.inc | 1 - meta-ti-bsp/conf/machine/include/ti43x.inc | 1 - meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_24.0.1.bb | 1 + 17 files changed, 9 insertions(+), 22 deletions(-) delete mode 100644 meta-ti-bsp/conf/machine/include/mesa-pvr.inc diff --git a/meta-ti-bsp/conf/machine/beagleplay-ti.conf b/meta-ti-bsp/conf/machine/beagleplay-ti.conf index 792c91b2..8a11a188 100644 --- a/meta-ti-bsp/conf/machine/beagleplay-ti.conf +++ b/meta-ti-bsp/conf/machine/beagleplay-ti.conf @@ -11,7 +11,6 @@ MACHINE_FEATURES += "screen gpu" SERIAL_CONSOLES = "115200;ttyS2" -require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" TFA_BOARD = "lite" diff --git a/meta-ti-bsp/conf/machine/include/am62pxx.inc b/meta-ti-bsp/conf/machine/include/am62pxx.inc index d59f607d..05fc6433 100644 --- a/meta-ti-bsp/conf/machine/include/am62pxx.inc +++ b/meta-ti-bsp/conf/machine/include/am62pxx.inc @@ -5,7 +5,6 @@ SOC_FAMILY:append = ":am62pxx" MACHINE_FEATURES += "screen gpu" -require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" TFA_BOARD = "lite" diff --git a/meta-ti-bsp/conf/machine/include/am62xx.inc b/meta-ti-bsp/conf/machine/include/am62xx.inc index 74054a78..16bfa3d3 100644 --- a/meta-ti-bsp/conf/machine/include/am62xx.inc +++ b/meta-ti-bsp/conf/machine/include/am62xx.inc @@ -5,7 +5,6 @@ SOC_FAMILY:append = ":am62xx" MACHINE_FEATURES += "screen gpu" -require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" # Bitmap image tarball for early splashscreen diff --git a/meta-ti-bsp/conf/machine/include/am65xx.inc b/meta-ti-bsp/conf/machine/include/am65xx.inc index d70bb22d..6b482227 100644 --- a/meta-ti-bsp/conf/machine/include/am65xx.inc +++ b/meta-ti-bsp/conf/machine/include/am65xx.inc @@ -5,7 +5,6 @@ SOC_FAMILY:append = ":am65xx" MACHINE_FEATURES += "screen touchscreen gpu" -require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_SGX_DRIVER_PROVIDER}" KERNEL_DEVICETREE_PREFIX = "ti/k3-am654" diff --git a/meta-ti-bsp/conf/machine/include/am68.inc b/meta-ti-bsp/conf/machine/include/am68.inc index b6d18fe0..a4ac12f3 100644 --- a/meta-ti-bsp/conf/machine/include/am68.inc +++ b/meta-ti-bsp/conf/machine/include/am68.inc @@ -5,7 +5,6 @@ SOC_FAMILY:append = ":j721s2" MACHINE_FEATURES += "screen gpu" -require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" TFA_BOARD = "generic" diff --git a/meta-ti-bsp/conf/machine/include/am69.inc b/meta-ti-bsp/conf/machine/include/am69.inc index 759984ea..c98dad7b 100644 --- a/meta-ti-bsp/conf/machine/include/am69.inc +++ b/meta-ti-bsp/conf/machine/include/am69.inc @@ -5,7 +5,6 @@ SOC_FAMILY:append = ":j784s4" MACHINE_FEATURES += "screen gpu" -require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" TFA_BOARD = "j784s4" diff --git a/meta-ti-bsp/conf/machine/include/j721e.inc b/meta-ti-bsp/conf/machine/include/j721e.inc index f9fdac0c..a892736a 100644 --- a/meta-ti-bsp/conf/machine/include/j721e.inc +++ b/meta-ti-bsp/conf/machine/include/j721e.inc @@ -5,7 +5,6 @@ SOC_FAMILY:append = ":j721e" MACHINE_FEATURES += "screen gpu" -require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" # Deploy SYSFW and any variants diff --git a/meta-ti-bsp/conf/machine/include/j721s2.inc b/meta-ti-bsp/conf/machine/include/j721s2.inc index b6d18fe0..a4ac12f3 100644 --- a/meta-ti-bsp/conf/machine/include/j721s2.inc +++ b/meta-ti-bsp/conf/machine/include/j721s2.inc @@ -5,7 +5,6 @@ SOC_FAMILY:append = ":j721s2" MACHINE_FEATURES += "screen gpu" -require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" TFA_BOARD = "generic" diff --git a/meta-ti-bsp/conf/machine/include/j722s.inc b/meta-ti-bsp/conf/machine/include/j722s.inc index 8a02441b..fa860f79 100644 --- a/meta-ti-bsp/conf/machine/include/j722s.inc +++ b/meta-ti-bsp/conf/machine/include/j722s.inc @@ -5,7 +5,6 @@ SOC_FAMILY:append = ":j722s" MACHINE_FEATURES += "screen gpu" -require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" TFA_BOARD = "lite" diff --git a/meta-ti-bsp/conf/machine/include/j742s2.inc b/meta-ti-bsp/conf/machine/include/j742s2.inc index d2de1d0d..7ede2de5 100644 --- a/meta-ti-bsp/conf/machine/include/j742s2.inc +++ b/meta-ti-bsp/conf/machine/include/j742s2.inc @@ -5,7 +5,6 @@ SOC_FAMILY:append = ":j742s2" MACHINE_FEATURES += "screen gpu" -require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" TFA_BOARD = "j784s4" diff --git a/meta-ti-bsp/conf/machine/include/j784s4.inc b/meta-ti-bsp/conf/machine/include/j784s4.inc index 759984ea..c98dad7b 100644 --- a/meta-ti-bsp/conf/machine/include/j784s4.inc +++ b/meta-ti-bsp/conf/machine/include/j784s4.inc @@ -5,7 +5,6 @@ SOC_FAMILY:append = ":j784s4" MACHINE_FEATURES += "screen gpu" -require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" TFA_BOARD = "j784s4" diff --git a/meta-ti-bsp/conf/machine/include/mesa-pvr.inc b/meta-ti-bsp/conf/machine/include/mesa-pvr.inc deleted file mode 100644 index d5581315..00000000 --- a/meta-ti-bsp/conf/machine/include/mesa-pvr.inc +++ /dev/null @@ -1,8 +0,0 @@ -PREFERRED_PROVIDER_virtual/mesa ?= "mesa-pvr" -PREFERRED_PROVIDER_virtual/egl ?= "mesa-pvr" -PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa-pvr" -PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa-pvr" -PREFERRED_PROVIDER_virtual/libgles3 ?= "mesa-pvr" -PREFERRED_PROVIDER_virtual/libgbm ?= "mesa-pvr" -PREFERRED_PROVIDER_virtual/libglx ?= "mesa-pvr" -PREFERRED_PROVIDER_virtual/libgl ?= "mesa-pvr" diff --git a/meta-ti-bsp/conf/machine/include/omap-a15.inc b/meta-ti-bsp/conf/machine/include/omap-a15.inc index 9058b461..c48f89ae 100644 --- a/meta-ti-bsp/conf/machine/include/omap-a15.inc +++ b/meta-ti-bsp/conf/machine/include/omap-a15.inc @@ -7,7 +7,6 @@ require conf/machine/include/arm/armv7a/tune-cortexa15.inc require conf/machine/include/ti-bsp.inc # Graphics providers and variables -require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_SGX_DRIVER_PROVIDER}" KERNEL_IMAGETYPE = "zImage" diff --git a/meta-ti-bsp/conf/machine/include/ti-bsp.inc b/meta-ti-bsp/conf/machine/include/ti-bsp.inc index dc0473de..37a59135 100644 --- a/meta-ti-bsp/conf/machine/include/ti-bsp.inc +++ b/meta-ti-bsp/conf/machine/include/ti-bsp.inc @@ -99,3 +99,11 @@ PREFERRED_VERSION_ti-sgx-ddk-um ?= "${BSP_SGX_DRIVER_VERSION}" PREFERRED_VERSION_ti-img-rogue-driver ?= "${BSP_ROGUE_DRIVER_VERSION}" PREFERRED_VERSION_ti-img-rogue-umlibs ?= "${BSP_ROGUE_DRIVER_VERSION}" PREFERRED_VERSION_mesa-pvr ?= "${BSP_MESA_PVR_VERSION}" +PREFERRED_PROVIDER_virtual/mesa ?= "mesa-pvr" +PREFERRED_PROVIDER_virtual/egl ?= "mesa-pvr" +PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa-pvr" +PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa-pvr" +PREFERRED_PROVIDER_virtual/libgles3 ?= "mesa-pvr" +PREFERRED_PROVIDER_virtual/libgbm ?= "mesa-pvr" +PREFERRED_PROVIDER_virtual/libglx ?= "mesa-pvr" +PREFERRED_PROVIDER_virtual/libgl ?= "mesa-pvr" diff --git a/meta-ti-bsp/conf/machine/include/ti33x.inc b/meta-ti-bsp/conf/machine/include/ti33x.inc index 5d7375e5..1301e2e7 100644 --- a/meta-ti-bsp/conf/machine/include/ti33x.inc +++ b/meta-ti-bsp/conf/machine/include/ti33x.inc @@ -7,7 +7,6 @@ require conf/machine/include/arm/armv7a/tune-cortexa8.inc require conf/machine/include/ti-bsp.inc # Graphics providers and variables -require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_SGX_DRIVER_PROVIDER}" KERNEL_IMAGETYPE = "zImage" diff --git a/meta-ti-bsp/conf/machine/include/ti43x.inc b/meta-ti-bsp/conf/machine/include/ti43x.inc index 7dd5b1f2..2b061d53 100644 --- a/meta-ti-bsp/conf/machine/include/ti43x.inc +++ b/meta-ti-bsp/conf/machine/include/ti43x.inc @@ -7,7 +7,6 @@ require conf/machine/include/arm/armv7a/tune-cortexa9.inc require conf/machine/include/ti-bsp.inc # Graphics providers and variables -require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_SGX_DRIVER_PROVIDER}" KERNEL_IMAGETYPE = "zImage" diff --git a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_24.0.1.bb b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_24.0.1.bb index 40226f65..a432dcdd 100644 --- a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_24.0.1.bb +++ b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_24.0.1.bb @@ -41,4 +41,5 @@ do_install:append () { FILES:${PN}-dev += "${datadir}/mesa/wayland-drm.xml" FILES:mesa-vulkan-drivers += "${libdir}/libpvr_mesa_wsi.so" +PREFERRED_PROVIDER_virtual/gpudriver ?= "" RRECOMMENDS:mesa-megadriver:append:class-target = " ${@d.getVar('PREFERRED_PROVIDER_virtual/gpudriver')}"