From 12ed4dfce41e098643e10d29fe0780f99ba26dce Mon Sep 17 00:00:00 2001 From: Andrew Davis Date: Thu, 18 Sep 2025 08:28:39 -0500 Subject: [PATCH] ti-bsp: Do not remove gpu MACHINE_FEATURE conditionally on BSP version 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. As the "gpu" MACHINE_FEATURE now has no uses, remove it from all the machine config include files. Signed-off-by: Andrew Davis Signed-off-by: Ryan Eatmon --- meta-ti-bsp/conf/machine/beagleplay-ti.conf | 2 +- meta-ti-bsp/conf/machine/include/am62pxx.inc | 2 +- meta-ti-bsp/conf/machine/include/am62xx.inc | 2 +- meta-ti-bsp/conf/machine/include/am65xx.inc | 2 +- meta-ti-bsp/conf/machine/include/am68.inc | 2 +- meta-ti-bsp/conf/machine/include/am69.inc | 2 +- meta-ti-bsp/conf/machine/include/j721e.inc | 2 +- meta-ti-bsp/conf/machine/include/j721s2.inc | 2 +- meta-ti-bsp/conf/machine/include/j722s.inc | 2 +- meta-ti-bsp/conf/machine/include/j742s2.inc | 2 +- meta-ti-bsp/conf/machine/include/j784s4.inc | 2 +- meta-ti-bsp/conf/machine/include/omap-a15.inc | 2 +- meta-ti-bsp/conf/machine/include/ti-bsp.inc | 8 -------- meta-ti-bsp/conf/machine/include/ti33x.inc | 2 +- meta-ti-bsp/conf/machine/include/ti43x.inc | 2 +- 15 files changed, 14 insertions(+), 22 deletions(-) diff --git a/meta-ti-bsp/conf/machine/beagleplay-ti.conf b/meta-ti-bsp/conf/machine/beagleplay-ti.conf index 792c91b2..ca88fdfb 100644 --- a/meta-ti-bsp/conf/machine/beagleplay-ti.conf +++ b/meta-ti-bsp/conf/machine/beagleplay-ti.conf @@ -7,7 +7,7 @@ require conf/machine/include/mc_k3r5.inc SOC_FAMILY:append = ":am62xx" -MACHINE_FEATURES += "screen gpu" +MACHINE_FEATURES += "screen" SERIAL_CONSOLES = "115200;ttyS2" diff --git a/meta-ti-bsp/conf/machine/include/am62pxx.inc b/meta-ti-bsp/conf/machine/include/am62pxx.inc index d59f607d..560334c1 100644 --- a/meta-ti-bsp/conf/machine/include/am62pxx.inc +++ b/meta-ti-bsp/conf/machine/include/am62pxx.inc @@ -3,7 +3,7 @@ require conf/machine/include/mc_k3r5.inc SOC_FAMILY:append = ":am62pxx" -MACHINE_FEATURES += "screen gpu" +MACHINE_FEATURES += "screen" require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" diff --git a/meta-ti-bsp/conf/machine/include/am62xx.inc b/meta-ti-bsp/conf/machine/include/am62xx.inc index 74054a78..9e24898c 100644 --- a/meta-ti-bsp/conf/machine/include/am62xx.inc +++ b/meta-ti-bsp/conf/machine/include/am62xx.inc @@ -3,7 +3,7 @@ require conf/machine/include/mc_k3r5.inc SOC_FAMILY:append = ":am62xx" -MACHINE_FEATURES += "screen gpu" +MACHINE_FEATURES += "screen" require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" diff --git a/meta-ti-bsp/conf/machine/include/am65xx.inc b/meta-ti-bsp/conf/machine/include/am65xx.inc index d70bb22d..bfaa529b 100644 --- a/meta-ti-bsp/conf/machine/include/am65xx.inc +++ b/meta-ti-bsp/conf/machine/include/am65xx.inc @@ -3,7 +3,7 @@ require conf/machine/include/mc_k3r5.inc SOC_FAMILY:append = ":am65xx" -MACHINE_FEATURES += "screen touchscreen gpu" +MACHINE_FEATURES += "screen touchscreen" require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_SGX_DRIVER_PROVIDER}" diff --git a/meta-ti-bsp/conf/machine/include/am68.inc b/meta-ti-bsp/conf/machine/include/am68.inc index b6d18fe0..60ea679a 100644 --- a/meta-ti-bsp/conf/machine/include/am68.inc +++ b/meta-ti-bsp/conf/machine/include/am68.inc @@ -3,7 +3,7 @@ require conf/machine/include/mc_k3r5.inc SOC_FAMILY:append = ":j721s2" -MACHINE_FEATURES += "screen gpu" +MACHINE_FEATURES += "screen" require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" diff --git a/meta-ti-bsp/conf/machine/include/am69.inc b/meta-ti-bsp/conf/machine/include/am69.inc index 759984ea..7956e355 100644 --- a/meta-ti-bsp/conf/machine/include/am69.inc +++ b/meta-ti-bsp/conf/machine/include/am69.inc @@ -3,7 +3,7 @@ require conf/machine/include/mc_k3r5.inc SOC_FAMILY:append = ":j784s4" -MACHINE_FEATURES += "screen gpu" +MACHINE_FEATURES += "screen" require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" diff --git a/meta-ti-bsp/conf/machine/include/j721e.inc b/meta-ti-bsp/conf/machine/include/j721e.inc index f9fdac0c..a74fbfee 100644 --- a/meta-ti-bsp/conf/machine/include/j721e.inc +++ b/meta-ti-bsp/conf/machine/include/j721e.inc @@ -3,7 +3,7 @@ require conf/machine/include/mc_k3r5.inc SOC_FAMILY:append = ":j721e" -MACHINE_FEATURES += "screen gpu" +MACHINE_FEATURES += "screen" require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" diff --git a/meta-ti-bsp/conf/machine/include/j721s2.inc b/meta-ti-bsp/conf/machine/include/j721s2.inc index b6d18fe0..60ea679a 100644 --- a/meta-ti-bsp/conf/machine/include/j721s2.inc +++ b/meta-ti-bsp/conf/machine/include/j721s2.inc @@ -3,7 +3,7 @@ require conf/machine/include/mc_k3r5.inc SOC_FAMILY:append = ":j721s2" -MACHINE_FEATURES += "screen gpu" +MACHINE_FEATURES += "screen" require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" diff --git a/meta-ti-bsp/conf/machine/include/j722s.inc b/meta-ti-bsp/conf/machine/include/j722s.inc index 8a02441b..c2732b70 100644 --- a/meta-ti-bsp/conf/machine/include/j722s.inc +++ b/meta-ti-bsp/conf/machine/include/j722s.inc @@ -3,7 +3,7 @@ require conf/machine/include/mc_k3r5.inc SOC_FAMILY:append = ":j722s" -MACHINE_FEATURES += "screen gpu" +MACHINE_FEATURES += "screen" require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" diff --git a/meta-ti-bsp/conf/machine/include/j742s2.inc b/meta-ti-bsp/conf/machine/include/j742s2.inc index d2de1d0d..13037c09 100644 --- a/meta-ti-bsp/conf/machine/include/j742s2.inc +++ b/meta-ti-bsp/conf/machine/include/j742s2.inc @@ -3,7 +3,7 @@ require conf/machine/include/mc_k3r5.inc SOC_FAMILY:append = ":j742s2" -MACHINE_FEATURES += "screen gpu" +MACHINE_FEATURES += "screen" require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" diff --git a/meta-ti-bsp/conf/machine/include/j784s4.inc b/meta-ti-bsp/conf/machine/include/j784s4.inc index 759984ea..7956e355 100644 --- a/meta-ti-bsp/conf/machine/include/j784s4.inc +++ b/meta-ti-bsp/conf/machine/include/j784s4.inc @@ -3,7 +3,7 @@ require conf/machine/include/mc_k3r5.inc SOC_FAMILY:append = ":j784s4" -MACHINE_FEATURES += "screen gpu" +MACHINE_FEATURES += "screen" require conf/machine/include/mesa-pvr.inc PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" diff --git a/meta-ti-bsp/conf/machine/include/omap-a15.inc b/meta-ti-bsp/conf/machine/include/omap-a15.inc index 2179476f..aed2c727 100644 --- a/meta-ti-bsp/conf/machine/include/omap-a15.inc +++ b/meta-ti-bsp/conf/machine/include/omap-a15.inc @@ -42,7 +42,7 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "vpdma-fw goodix-fw" UBI_VOLNAME = "rootfs" # List common SoC features, may need to add touchscreen for specific machines -MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 screen alsa gpu mmip dsp gc320" +MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 screen alsa 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/ti-bsp.inc b/meta-ti-bsp/conf/machine/include/ti-bsp.inc index c690cb5a..b4fe0676 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 yet available in next MACHINE_FEATURES:remove:bsp-next = "gc320" diff --git a/meta-ti-bsp/conf/machine/include/ti33x.inc b/meta-ti-bsp/conf/machine/include/ti33x.inc index c47165e4..662fbd03 100644 --- a/meta-ti-bsp/conf/machine/include/ti33x.inc +++ b/meta-ti-bsp/conf/machine/include/ti33x.inc @@ -88,7 +88,7 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-image-zimage" MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "amx3-cm3 prueth-fw pruhsr-fw pruprp-fw" # List common SoC features, may need to add touchscreen for specific machines -MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 alsa gpu" +MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 alsa" 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 a23b6518..6150d106 100644 --- a/meta-ti-bsp/conf/machine/include/ti43x.inc +++ b/meta-ti-bsp/conf/machine/include/ti43x.inc @@ -60,7 +60,7 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-image-zimage" MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "amx3-cm3 prueth-fw pruhsr-fw pruprp-fw" # List common SoC features, may need to add touchscreen for specific machines -MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 screen alsa gpu" +MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 screen alsa" IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap" WKS_FILE ?= "sdimage-2part.wks"