diff mbox series

[master,2/5] conf/machine: add preferences for 3D graphics providers

Message ID 20220505174422.334666-2-denis@denix.org
State Accepted
Delegated to: Ryan Eatmon
Headers show
Series [master,1/5] am62xx, j721s2: move "gpu" machine feature from machine to soc config | expand

Commit Message

Denys Dmytriyenko May 5, 2022, 5:44 p.m. UTC 
From: Denys Dmytriyenko <denys@konsulko.com>

Specify default 3D GLES/EGL providers for platforms using SGX and Rogue GPUs,
both kernel and user-space components.

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 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/omap-a15.inc | 5 +++++
 meta-ti-bsp/conf/machine/include/ti33x.inc    | 5 +++++
 meta-ti-bsp/conf/machine/include/ti43x.inc    | 5 +++++
 7 files changed, 39 insertions(+)
diff mbox series

Patch

diff --git a/meta-ti-bsp/conf/machine/include/am62xx.inc b/meta-ti-bsp/conf/machine/include/am62xx.inc
index 56cd7c20..ce768895 100644
--- a/meta-ti-bsp/conf/machine/include/am62xx.inc
+++ b/meta-ti-bsp/conf/machine/include/am62xx.inc
@@ -6,6 +6,12 @@  MACHINE_FEATURES += "screen touchscreen gpu"
 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"
+
 # AM62 supports multi-certificate images, use the same
 IMAGE_BOOT_FILES = "${IMAGE_BOOT_FILES_MULTI_CERT}"
 
diff --git a/meta-ti-bsp/conf/machine/include/am65xx.inc b/meta-ti-bsp/conf/machine/include/am65xx.inc
index 111ef96f..b71b4686 100644
--- a/meta-ti-bsp/conf/machine/include/am65xx.inc
+++ b/meta-ti-bsp/conf/machine/include/am65xx.inc
@@ -6,6 +6,12 @@  MACHINE_FEATURES += "screen touchscreen gpu"
 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 = " \
     ti/k3-am654-base-board.dtb \
     ti/k3-am654-base-board-sr1.dtbo \
diff --git a/meta-ti-bsp/conf/machine/include/j721e.inc b/meta-ti-bsp/conf/machine/include/j721e.inc
index d965327c..85952d32 100644
--- a/meta-ti-bsp/conf/machine/include/j721e.inc
+++ b/meta-ti-bsp/conf/machine/include/j721e.inc
@@ -2,3 +2,9 @@  require conf/machine/include/j7.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"
diff --git a/meta-ti-bsp/conf/machine/include/j721s2.inc b/meta-ti-bsp/conf/machine/include/j721s2.inc
index 06654179..65b39118 100644
--- a/meta-ti-bsp/conf/machine/include/j721s2.inc
+++ b/meta-ti-bsp/conf/machine/include/j721s2.inc
@@ -2,3 +2,9 @@  require conf/machine/include/j7.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"
diff --git a/meta-ti-bsp/conf/machine/include/omap-a15.inc b/meta-ti-bsp/conf/machine/include/omap-a15.inc
index 94ecab34..7cff38dc 100644
--- a/meta-ti-bsp/conf/machine/include/omap-a15.inc
+++ b/meta-ti-bsp/conf/machine/include/omap-a15.inc
@@ -10,6 +10,11 @@  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"
 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 083a24b6..2f493404 100644
--- a/meta-ti-bsp/conf/machine/include/ti33x.inc
+++ b/meta-ti-bsp/conf/machine/include/ti33x.inc
@@ -20,6 +20,11 @@  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"
 
diff --git a/meta-ti-bsp/conf/machine/include/ti43x.inc b/meta-ti-bsp/conf/machine/include/ti43x.inc
index 8757b545..3d69e453 100644
--- a/meta-ti-bsp/conf/machine/include/ti43x.inc
+++ b/meta-ti-bsp/conf/machine/include/ti43x.inc
@@ -23,6 +23,11 @@  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"