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


Denys Dmytriyenko
 

From: Denys Dmytriyenko <denys@...>

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

Signed-off-by: Denys Dmytriyenko <denys@...>
---
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 --git a/meta-ti-bsp/conf/machine/include/am62xx.inc b/meta-ti-bsp/co=
nf/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 +=3D "screen touchscreen gpu"
SERIAL_CONSOLES =3D "115200;ttyS2"
SERIAL_CONSOLES_CHECK =3D "${SERIAL_CONSOLES}"
=20
+PREFERRED_PROVIDER_virtual/egl =3D "ti-img-rogue-umlibs"
+PREFERRED_PROVIDER_virtual/libgles1 =3D "ti-img-rogue-umlibs"
+PREFERRED_PROVIDER_virtual/libgles2 =3D "ti-img-rogue-umlibs"
+PREFERRED_PROVIDER_virtual/libgbm =3D "ti-img-rogue-umlibs"
+PREFERRED_PROVIDER_virtual/gpudriver =3D "ti-img-rogue-driver"
+
# AM62 supports multi-certificate images, use the same
IMAGE_BOOT_FILES =3D "${IMAGE_BOOT_FILES_MULTI_CERT}"
=20
diff --git a/meta-ti-bsp/conf/machine/include/am65xx.inc b/meta-ti-bsp/co=
nf/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 +=3D "screen touchscreen gpu"
SERIAL_CONSOLES =3D "115200;ttyS2 115200;ttyS1"
SERIAL_CONSOLES_CHECK =3D "${SERIAL_CONSOLES}"
=20
+PREFERRED_PROVIDER_virtual/egl =3D "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/libgles1 =3D "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/libgles2 =3D "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/libgbm =3D "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/gpudriver =3D "ti-sgx-ddk-km"
+
KERNEL_DEVICETREE =3D " \
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/con=
f/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 =3D ":j721e"
=20
MACHINE_FEATURES +=3D "gpu"
+
+PREFERRED_PROVIDER_virtual/egl =3D "ti-img-rogue-umlibs"
+PREFERRED_PROVIDER_virtual/libgles1 =3D "ti-img-rogue-umlibs"
+PREFERRED_PROVIDER_virtual/libgles2 =3D "ti-img-rogue-umlibs"
+PREFERRED_PROVIDER_virtual/libgbm =3D "ti-img-rogue-umlibs"
+PREFERRED_PROVIDER_virtual/gpudriver =3D "ti-img-rogue-driver"
diff --git a/meta-ti-bsp/conf/machine/include/j721s2.inc b/meta-ti-bsp/co=
nf/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 =3D ":j721s2"
=20
MACHINE_FEATURES +=3D "gpu"
+
+PREFERRED_PROVIDER_virtual/egl =3D "ti-img-rogue-umlibs"
+PREFERRED_PROVIDER_virtual/libgles1 =3D "ti-img-rogue-umlibs"
+PREFERRED_PROVIDER_virtual/libgles2 =3D "ti-img-rogue-umlibs"
+PREFERRED_PROVIDER_virtual/libgbm =3D "ti-img-rogue-umlibs"
+PREFERRED_PROVIDER_virtual/gpudriver =3D "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 =3D "r7"
PREFERRED_PROVIDER_virtual/kernel ?=3D "linux-ti-staging"
PREFERRED_PROVIDER_virtual/bootloader =3D "u-boot-ti-staging"
PREFERRED_PROVIDER_u-boot =3D "u-boot-ti-staging"
+PREFERRED_PROVIDER_virtual/egl =3D "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/libgles1 =3D "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/libgles2 =3D "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/libgbm =3D "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/gpudriver =3D "ti-sgx-ddk-km"
=20
KERNEL_IMAGETYPE =3D "zImage"
KERNEL_IMAGETYPES =3D "zImage uImage"
diff --git a/meta-ti-bsp/conf/machine/include/ti33x.inc b/meta-ti-bsp/con=
f/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 =3D "r22"
PREFERRED_PROVIDER_virtual/kernel ?=3D "linux-ti-staging"
PREFERRED_PROVIDER_virtual/bootloader =3D "u-boot-ti-staging"
PREFERRED_PROVIDER_u-boot =3D "u-boot-ti-staging"
+PREFERRED_PROVIDER_virtual/egl =3D "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/libgles1 =3D "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/libgles2 =3D "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/libgbm =3D "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/gpudriver =3D "ti-sgx-ddk-km"
=20
KERNEL_IMAGETYPE =3D "zImage"
=20
diff --git a/meta-ti-bsp/conf/machine/include/ti43x.inc b/meta-ti-bsp/con=
f/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 =3D "r3"
PREFERRED_PROVIDER_virtual/kernel ?=3D "linux-ti-staging"
PREFERRED_PROVIDER_virtual/bootloader =3D "u-boot-ti-staging"
PREFERRED_PROVIDER_u-boot =3D "u-boot-ti-staging"
+PREFERRED_PROVIDER_virtual/egl =3D "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/libgles1 =3D "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/libgles2 =3D "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/libgbm =3D "ti-sgx-ddk-um"
+PREFERRED_PROVIDER_virtual/gpudriver =3D "ti-sgx-ddk-km"
=20
KERNEL_IMAGETYPE =3D "zImage"
=20
--=20
2.25.1