From patchwork Thu Jan 26 03:08:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randolph Sapp X-Patchwork-Id: 18658 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 D0E03C27C76 for ; Thu, 26 Jan 2023 03:08:40 +0000 (UTC) Received: from fllv0015.ext.ti.com (fllv0015.ext.ti.com [198.47.19.141]) by mx.groups.io with SMTP id smtpd.web11.65951.1674702520260868396 for ; Wed, 25 Jan 2023 19:08:40 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=xxoeZ+rc; spf=pass (domain: ti.com, ip: 198.47.19.141, mailfrom: rs@ti.com) Received: from lelv0266.itg.ti.com ([10.180.67.225]) by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id 30Q38dA8067585 for ; Wed, 25 Jan 2023 21:08:39 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1674702519; bh=zkhpCwZ979PN1ttpu51MPidkNOx6j3R0x9BFKXkg4HM=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=xxoeZ+rcAm4G44cvN6msTqp5IQvDwPnJlk47jvwVuZLvB3TTygcg2guNkXJLjujMc Yj5doSyL9/qf/SIVZBsH+AH7tJ/YLg08s+Y3U2cX2ETyy8EgtelnwUYMPAs8S4Flu6 DQKYuNpcFrn+v/HQqVD1EqN6D3KfIBxmzGLcubwY= Received: from DFLE109.ent.ti.com (dfle109.ent.ti.com [10.64.6.30]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 30Q38dXp127063 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Wed, 25 Jan 2023 21:08:39 -0600 Received: from DFLE103.ent.ti.com (10.64.6.24) by DFLE109.ent.ti.com (10.64.6.30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16; Wed, 25 Jan 2023 21:08:38 -0600 Received: from fllv0039.itg.ti.com (10.64.41.19) 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.16 via Frontend Transport; Wed, 25 Jan 2023 21:08:38 -0600 Received: from res.ti.com (ileaxei01-snat.itg.ti.com [10.180.69.5]) by fllv0039.itg.ti.com (8.15.2/8.15.2) with ESMTP id 30Q38clZ120484; Wed, 25 Jan 2023 21:08:38 -0600 From: Randolph Sapp To: , , , CC: , , Randolph Sapp Subject: [kirkstone PATCH 3/4] meta-ti-bsp: machine: Remove all gpu features Date: Wed, 25 Jan 2023 21:08:33 -0600 Message-ID: <20230126030834.3889448-4-rs@ti.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230126030834.3889448-1-rs@ti.com> References: <20230126030834.3889448-1-rs@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 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, 26 Jan 2023 03:08:40 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/15665 Remove all gpu machine features and instead rely on the new dependency chain for resolving gpu dependencies. Set preferred providers for virtual/gpudriver where needed. Signed-off-by: Randolph Sapp Acked-by: Andrew Davis --- meta-ti-bsp/conf/machine/am62xx-lp-evm.conf | 2 -- meta-ti-bsp/conf/machine/include/am62xx.inc | 6 +----- meta-ti-bsp/conf/machine/include/am65xx.inc | 6 +----- meta-ti-bsp/conf/machine/include/j721e.inc | 6 ------ meta-ti-bsp/conf/machine/include/j721s2.inc | 6 ------ meta-ti-bsp/conf/machine/include/j784s4.inc | 6 ------ meta-ti-bsp/conf/machine/include/omap-a15.inc | 6 +----- meta-ti-bsp/conf/machine/include/ti33x.inc | 6 +----- meta-ti-bsp/conf/machine/include/ti43x.inc | 6 +----- meta-ti-bsp/conf/machine/j784s4-evm.conf | 2 ++ 10 files changed, 7 insertions(+), 45 deletions(-) diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf index ef8e8692..ec9ce596 100644 --- a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf +++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf @@ -4,8 +4,6 @@ require conf/machine/include/am62xx.inc -MACHINE_FEATURES += "gpu" - KERNEL_DEVICETREE = " \ ti/k3-am62x-lp-sk.dtb \ ti/k3-am625-skeleton.dtb \ diff --git a/meta-ti-bsp/conf/machine/include/am62xx.inc b/meta-ti-bsp/conf/machine/include/am62xx.inc index 411e5265..35f3f071 100644 --- a/meta-ti-bsp/conf/machine/include/am62xx.inc +++ b/meta-ti-bsp/conf/machine/include/am62xx.inc @@ -1,15 +1,11 @@ require conf/machine/include/k3.inc SOC_FAMILY:append = ":am62xx" -MACHINE_FEATURES += "screen touchscreen gpu" +MACHINE_FEATURES += "screen touchscreen" SERIAL_CONSOLES = "115200;ttyS2" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" -PREFERRED_PROVIDER_virtual/egl ?= "ti-img-rogue-umlibs" -PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-img-rogue-umlibs" -PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs" -PREFERRED_PROVIDER_virtual/libgbm ?= "ti-img-rogue-umlibs" PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" TFA_BOARD = "lite" diff --git a/meta-ti-bsp/conf/machine/include/am65xx.inc b/meta-ti-bsp/conf/machine/include/am65xx.inc index 424864d3..385bb164 100644 --- a/meta-ti-bsp/conf/machine/include/am65xx.inc +++ b/meta-ti-bsp/conf/machine/include/am65xx.inc @@ -1,15 +1,11 @@ require conf/machine/include/k3.inc SOC_FAMILY:append = ":am65xx" -MACHINE_FEATURES += "screen touchscreen gpu" +MACHINE_FEATURES += "screen touchscreen" SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" -PREFERRED_PROVIDER_virtual/egl ?= "ti-sgx-ddk-um" -PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-sgx-ddk-um" -PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-sgx-ddk-um" -PREFERRED_PROVIDER_virtual/libgbm ?= "ti-sgx-ddk-um" PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km" KERNEL_DEVICETREE = " \ diff --git a/meta-ti-bsp/conf/machine/include/j721e.inc b/meta-ti-bsp/conf/machine/include/j721e.inc index eba10d8d..67f5fe0f 100644 --- a/meta-ti-bsp/conf/machine/include/j721e.inc +++ b/meta-ti-bsp/conf/machine/include/j721e.inc @@ -1,12 +1,6 @@ require conf/machine/include/k3.inc SOC_FAMILY:append = ":j721e" -MACHINE_FEATURES += "gpu" - -PREFERRED_PROVIDER_virtual/egl ?= "ti-img-rogue-umlibs" -PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-img-rogue-umlibs" -PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs" -PREFERRED_PROVIDER_virtual/libgbm ?= "ti-img-rogue-umlibs" PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" # On J721e the file tiboot3.bin comes from the bootloader not ti-sci-fw diff --git a/meta-ti-bsp/conf/machine/include/j721s2.inc b/meta-ti-bsp/conf/machine/include/j721s2.inc index fc6493b8..f33a3aba 100644 --- a/meta-ti-bsp/conf/machine/include/j721s2.inc +++ b/meta-ti-bsp/conf/machine/include/j721s2.inc @@ -1,12 +1,6 @@ require conf/machine/include/k3.inc SOC_FAMILY:append = ":j721s2" -MACHINE_FEATURES += "gpu" - -PREFERRED_PROVIDER_virtual/egl ?= "ti-img-rogue-umlibs" -PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-img-rogue-umlibs" -PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs" -PREFERRED_PROVIDER_virtual/libgbm ?= "ti-img-rogue-umlibs" PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" TFA_BOARD = "generic" diff --git a/meta-ti-bsp/conf/machine/include/j784s4.inc b/meta-ti-bsp/conf/machine/include/j784s4.inc index d268b810..df0faede 100644 --- a/meta-ti-bsp/conf/machine/include/j784s4.inc +++ b/meta-ti-bsp/conf/machine/include/j784s4.inc @@ -1,12 +1,6 @@ require conf/machine/include/k3.inc SOC_FAMILY:append = ":j784s4" -MACHINE_FEATURES += "gpu" - -PREFERRED_PROVIDER_virtual/egl ?= "ti-img-rogue-umlibs" -PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-img-rogue-umlibs" -PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs" -PREFERRED_PROVIDER_virtual/libgbm ?= "ti-img-rogue-umlibs" PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" TFA_BOARD = "j784s4" diff --git a/meta-ti-bsp/conf/machine/include/omap-a15.inc b/meta-ti-bsp/conf/machine/include/omap-a15.inc index 0843fb28..efa33a10 100644 --- a/meta-ti-bsp/conf/machine/include/omap-a15.inc +++ b/meta-ti-bsp/conf/machine/include/omap-a15.inc @@ -10,10 +10,6 @@ MACHINE_KERNEL_PR = "r7" PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging" PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging" PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging" -PREFERRED_PROVIDER_virtual/egl ?= "ti-sgx-ddk-um" -PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-sgx-ddk-um" -PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-sgx-ddk-um" -PREFERRED_PROVIDER_virtual/libgbm ?= "ti-sgx-ddk-um" PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km" KERNEL_IMAGETYPE = "zImage" @@ -45,7 +41,7 @@ EXTRA_IMAGEDEPENDS += "virtual/bootloader" UBI_VOLNAME = "rootfs" # List common SoC features, may need to add touchscreen for specific machines -MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet gpu mmip dsp gc320" +MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet mmip dsp gc320" IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap" WKS_FILE ?= "sdimage-2part.wks" diff --git a/meta-ti-bsp/conf/machine/include/ti33x.inc b/meta-ti-bsp/conf/machine/include/ti33x.inc index cfacc30d..e2f75359 100644 --- a/meta-ti-bsp/conf/machine/include/ti33x.inc +++ b/meta-ti-bsp/conf/machine/include/ti33x.inc @@ -11,10 +11,6 @@ MACHINE_KERNEL_PR = "r22" PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging" PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging" PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging" -PREFERRED_PROVIDER_virtual/egl ?= "ti-sgx-ddk-um" -PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-sgx-ddk-um" -PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-sgx-ddk-um" -PREFERRED_PROVIDER_virtual/libgbm ?= "ti-sgx-ddk-um" PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km" KERNEL_IMAGETYPE = "zImage" @@ -55,7 +51,7 @@ UBI_VOLNAME = "rootfs" EXTRA_IMAGEDEPENDS += "virtual/bootloader" # List common SoC features, may need to add touchscreen for specific machines -MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 alsa ethernet gpu" +MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 alsa ethernet" IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap" WKS_FILE ?= "sdimage-2part.wks" diff --git a/meta-ti-bsp/conf/machine/include/ti43x.inc b/meta-ti-bsp/conf/machine/include/ti43x.inc index 74a964db..e9999910 100644 --- a/meta-ti-bsp/conf/machine/include/ti43x.inc +++ b/meta-ti-bsp/conf/machine/include/ti43x.inc @@ -11,10 +11,6 @@ MACHINE_KERNEL_PR = "r3" PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging" PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging" PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging" -PREFERRED_PROVIDER_virtual/egl ?= "ti-sgx-ddk-um" -PREFERRED_PROVIDER_virtual/libgles1 ?= "ti-sgx-ddk-um" -PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-sgx-ddk-um" -PREFERRED_PROVIDER_virtual/libgbm ?= "ti-sgx-ddk-um" PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km" KERNEL_IMAGETYPE = "zImage" @@ -54,7 +50,7 @@ UBI_VOLNAME = "rootfs" EXTRA_IMAGEDEPENDS += "u-boot" # List common SoC features, may need to add touchscreen for specific machines -MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet gpu" +MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet" IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap" WKS_FILE ?= "sdimage-2part.wks" diff --git a/meta-ti-bsp/conf/machine/j784s4-evm.conf b/meta-ti-bsp/conf/machine/j784s4-evm.conf index 73f3eb8c..796ca116 100644 --- a/meta-ti-bsp/conf/machine/j784s4-evm.conf +++ b/meta-ti-bsp/conf/machine/j784s4-evm.conf @@ -9,6 +9,8 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" TFA_K3_USART = "0x8" OPTEE_K3_USART = "0x8" +PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" + KERNEL_DEVICETREE = " \ ti/k3-j784s4-evm.dtb \ "