* [meta-ti][master/kirkstone][PATCH 1/5] ti-sgx-ddk-um: Remove RDEPENDS on libdrm-omap
@ 2023-04-06 19:28 Andrew Davis
2023-04-06 19:28 ` [meta-ti][master/kirkstone][PATCH 2/5] ti-sgx-ddk-um: Remove no longer needed CLEANBROKEN and INSANE_SKIPs Andrew Davis
` (3 more replies)
0 siblings, 4 replies; 13+ messages in thread
From: Andrew Davis @ 2023-04-06 19:28 UTC (permalink / raw)
To: Denys Dmytriyenko, Ryan Eatmon, Randolph Sapp, meta-ti; +Cc: Andrew Davis
We no longer use libdrm-omap so remove it.
Signed-off-by: Andrew Davis <afd@ti.com>
---
.../recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-ti-bsp/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb b/meta-ti-bsp/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb
index 73d7acb9..9ea3add7 100644
--- a/meta-ti-bsp/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb
+++ b/meta-ti-bsp/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb
@@ -34,7 +34,7 @@ def use_initscript(d):
inherit ${@oe.utils.ifelse(use_initscript(d), 'update-rc.d', '')}
-RDEPENDS:${PN} += "libdrm libdrm-omap"
+RDEPENDS:${PN} += "libdrm"
RRECOMMENDS:${PN} += "ti-sgx-ddk-km"
--
2.39.2
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [meta-ti][master/kirkstone][PATCH 2/5] ti-sgx-ddk-um: Remove no longer needed CLEANBROKEN and INSANE_SKIPs
2023-04-06 19:28 [meta-ti][master/kirkstone][PATCH 1/5] ti-sgx-ddk-um: Remove RDEPENDS on libdrm-omap Andrew Davis
@ 2023-04-06 19:28 ` Andrew Davis
2023-04-06 19:28 ` [meta-ti][master/kirkstone][PATCH 3/5] ti-sgx-ddk-km: Be specific on supported K3 machines Andrew Davis
` (2 subsequent siblings)
3 siblings, 0 replies; 13+ messages in thread
From: Andrew Davis @ 2023-04-06 19:28 UTC (permalink / raw)
To: Denys Dmytriyenko, Ryan Eatmon, Randolph Sapp, meta-ti; +Cc: Andrew Davis
The "clean" target has been fixed along with some other issues that
caused us to need these set. Remove them now.
Signed-off-by: Andrew Davis <afd@ti.com>
---
.../recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/meta-ti-bsp/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb b/meta-ti-bsp/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb
index 9ea3add7..755cc4f5 100644
--- a/meta-ti-bsp/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb
+++ b/meta-ti-bsp/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb
@@ -67,7 +67,5 @@ FILES:${PN} += "${sysconfdir}/*"
FILES:${PN} += "${datadir}/*"
FILES:${PN} += "${nonarch_base_libdir}/udev/rules.d"
-INSANE_SKIP:${PN} += "dev-so ldflags useless-rpaths"
-INSANE_SKIP:${PN} += "already-stripped dev-deps"
-
-CLEANBROKEN = "1"
+INSANE_SKIP:${PN} += "ldflags"
+INSANE_SKIP:${PN} += "already-stripped"
--
2.39.2
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [meta-ti][master/kirkstone][PATCH 3/5] ti-sgx-ddk-km: Be specific on supported K3 machines
2023-04-06 19:28 [meta-ti][master/kirkstone][PATCH 1/5] ti-sgx-ddk-um: Remove RDEPENDS on libdrm-omap Andrew Davis
2023-04-06 19:28 ` [meta-ti][master/kirkstone][PATCH 2/5] ti-sgx-ddk-um: Remove no longer needed CLEANBROKEN and INSANE_SKIPs Andrew Davis
@ 2023-04-06 19:28 ` Andrew Davis
2023-04-06 19:28 ` [meta-ti][master/kirkstone][PATCH 4/5] ti-sgx-ddk-km: Use PVR_BUILD and PVR_WS to match Rogue Andrew Davis
2023-04-06 19:28 ` [meta-ti][master/kirkstone][PATCH 5/5] meta-ti-bsp: graphics: Correct dependency chain Andrew Davis
3 siblings, 0 replies; 13+ messages in thread
From: Andrew Davis @ 2023-04-06 19:28 UTC (permalink / raw)
To: Denys Dmytriyenko, Ryan Eatmon, Randolph Sapp, meta-ti; +Cc: Andrew Davis
Of the K3 family only the AM65x device is currently supported by this
driver. COMPATIBLE_MACHINE should match.
Signed-off-by: Andrew Davis <afd@ti.com>
---
.../recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb
index 13b8757c..dcceed69 100644
--- a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb
+++ b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb
@@ -7,7 +7,7 @@ inherit module
PROVIDES = "virtual/gpudriver"
-COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|k3"
+COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|am65xx"
MACHINE_KERNEL_PR:append = "x"
PR = "${MACHINE_KERNEL_PR}"
@@ -27,7 +27,7 @@ SRCREV = "eda7780bfd5277e16913c9bc0b0e6892b4e79063"
TARGET_PRODUCT:omap-a15 = "jacinto6evm"
TARGET_PRODUCT:ti33x = "ti335x"
TARGET_PRODUCT:ti43x = "ti437x"
-TARGET_PRODUCT:k3 = "ti654x"
+TARGET_PRODUCT:am65xx = "ti654x"
EXTRA_OEMAKE += 'KERNELDIR="${STAGING_KERNEL_DIR}" TARGET_PRODUCT=${TARGET_PRODUCT} WINDOW_SYSTEM=nulldrmws'
--
2.39.2
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [meta-ti][master/kirkstone][PATCH 4/5] ti-sgx-ddk-km: Use PVR_BUILD and PVR_WS to match Rogue
2023-04-06 19:28 [meta-ti][master/kirkstone][PATCH 1/5] ti-sgx-ddk-um: Remove RDEPENDS on libdrm-omap Andrew Davis
2023-04-06 19:28 ` [meta-ti][master/kirkstone][PATCH 2/5] ti-sgx-ddk-um: Remove no longer needed CLEANBROKEN and INSANE_SKIPs Andrew Davis
2023-04-06 19:28 ` [meta-ti][master/kirkstone][PATCH 3/5] ti-sgx-ddk-km: Be specific on supported K3 machines Andrew Davis
@ 2023-04-06 19:28 ` Andrew Davis
2023-04-06 19:28 ` [meta-ti][master/kirkstone][PATCH 5/5] meta-ti-bsp: graphics: Correct dependency chain Andrew Davis
3 siblings, 0 replies; 13+ messages in thread
From: Andrew Davis @ 2023-04-06 19:28 UTC (permalink / raw)
To: Denys Dmytriyenko, Ryan Eatmon, Randolph Sapp, meta-ti; +Cc: Andrew Davis
Use these to select build type and window system support to match how
the Rouge driver does the same. No functional change.
Signed-off-by: Andrew Davis <afd@ti.com>
---
.../powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb
index dcceed69..bf4fa98a 100644
--- a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb
+++ b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb
@@ -28,19 +28,21 @@ TARGET_PRODUCT:omap-a15 = "jacinto6evm"
TARGET_PRODUCT:ti33x = "ti335x"
TARGET_PRODUCT:ti43x = "ti437x"
TARGET_PRODUCT:am65xx = "ti654x"
+PVR_BUILD = "release"
+PVR_WS = "nulldrmws"
-EXTRA_OEMAKE += 'KERNELDIR="${STAGING_KERNEL_DIR}" TARGET_PRODUCT=${TARGET_PRODUCT} WINDOW_SYSTEM=nulldrmws'
+EXTRA_OEMAKE += 'KERNELDIR="${STAGING_KERNEL_DIR}" BUILD=${PVR_BUILD} TARGET_PRODUCT=${TARGET_PRODUCT} WINDOW_SYSTEM=${PVR_WS}'
do_compile:prepend() {
cd ${S}/eurasia_km/eurasiacon/build/linux2/omap_linux
}
do_install() {
- make -C ${STAGING_KERNEL_DIR} M=${B}/eurasia_km/eurasiacon/binary_omap_linux_nulldrmws_release/target_armhf/kbuild INSTALL_MOD_PATH=${D}${root_prefix} PREFIX=${STAGING_DIR_HOST} modules_install
+ make -C ${STAGING_KERNEL_DIR} M=${B}/eurasia_km/eurasiacon/binary_omap_linux_${PVR_WS}_${PVR_BUILD}/target_armhf/kbuild INSTALL_MOD_PATH=${D}${root_prefix} PREFIX=${STAGING_DIR_HOST} modules_install
}
-do_install:k3() {
- make -C ${STAGING_KERNEL_DIR} M=${B}/eurasia_km/eurasiacon/binary_omap_linux_nulldrmws_release/target_aarch64/kbuild INSTALL_MOD_PATH=${D}${root_prefix} PREFIX=${STAGING_DIR_HOST} modules_install
+do_install:am65xx() {
+ make -C ${STAGING_KERNEL_DIR} M=${B}/eurasia_km/eurasiacon/binary_omap_linux_${PVR_WS}_${PVR_BUILD}/target_aarch64/kbuild INSTALL_MOD_PATH=${D}${root_prefix} PREFIX=${STAGING_DIR_HOST} modules_install
}
RRECOMMENDS:${PN} += "ti-sgx-ddk-um"
--
2.39.2
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [meta-ti][master/kirkstone][PATCH 5/5] meta-ti-bsp: graphics: Correct dependency chain
2023-04-06 19:28 [meta-ti][master/kirkstone][PATCH 1/5] ti-sgx-ddk-um: Remove RDEPENDS on libdrm-omap Andrew Davis
` (2 preceding siblings ...)
2023-04-06 19:28 ` [meta-ti][master/kirkstone][PATCH 4/5] ti-sgx-ddk-km: Use PVR_BUILD and PVR_WS to match Rogue Andrew Davis
@ 2023-04-06 19:28 ` Andrew Davis
2023-04-06 19:46 ` Denys Dmytriyenko
2023-04-06 20:28 ` Randolph Sapp
3 siblings, 2 replies; 13+ messages in thread
From: Andrew Davis @ 2023-04-06 19:28 UTC (permalink / raw)
To: Denys Dmytriyenko, Ryan Eatmon, Randolph Sapp, meta-ti; +Cc: Andrew Davis
Previously the virtual/gpudriver provider would point to the kernel-mode
driver, which would cause Mesa libraries to depend on those and not the
user-mode driver. It is the user-mode driver that should depend on the
kernel-mode driver, not the other way around. The logical dependency
chain should be:
App -> virtual/libgl -> Mesa -> virtual/gpudriver -> IMG-UM -> IMG-KM
Flip the dependency chain so it matches the above. While here make
the UM driver depend on, not just recommend, the KM driver as it is
not functional with out it.
Signed-off-by: Andrew Davis <afd@ti.com>
---
meta-ti-bsp/conf/machine/include/am62xx.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/j784s4.inc | 2 +-
.../powervr-drivers/ti-img-rogue-driver_1.18.6276027.bb | 2 --
.../powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb | 2 --
.../libgles/ti-img-rogue-umlibs_1.18.6276027.bb | 5 ++++-
.../recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb | 5 +++--
meta-ti-bsp/recipes-graphics/mesa/mesa-gl_22.%.bbappend | 2 +-
meta-ti-bsp/recipes-graphics/mesa/mesa_22.%.bbappend | 2 +-
meta-ti-bsp/recipes-graphics/mesa/pvr-mesa.inc | 6 +++---
11 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/meta-ti-bsp/conf/machine/include/am62xx.inc b/meta-ti-bsp/conf/machine/include/am62xx.inc
index af6a6db4..93151bcf 100644
--- a/meta-ti-bsp/conf/machine/include/am62xx.inc
+++ b/meta-ti-bsp/conf/machine/include/am62xx.inc
@@ -6,7 +6,7 @@ MACHINE_FEATURES += "screen gpu"
SERIAL_CONSOLES = "115200;ttyS2"
SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
+PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-umlibs"
# Default tiboot3.bin on AM62x is for HS-FS
BBMULTICONFIG = "k3r5-hs-fs"
diff --git a/meta-ti-bsp/conf/machine/include/j721e.inc b/meta-ti-bsp/conf/machine/include/j721e.inc
index 8f9c24e6..05aa7515 100644
--- a/meta-ti-bsp/conf/machine/include/j721e.inc
+++ b/meta-ti-bsp/conf/machine/include/j721e.inc
@@ -3,7 +3,7 @@ SOC_FAMILY:append = ":j721e"
MACHINE_FEATURES += "screen gpu"
-PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
+PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-umlibs"
# On J721e the file tiboot3.bin comes from the bootloader not ti-sci-fw
do_image_wic[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy"
diff --git a/meta-ti-bsp/conf/machine/include/j721s2.inc b/meta-ti-bsp/conf/machine/include/j721s2.inc
index 70569a16..9a21df49 100644
--- a/meta-ti-bsp/conf/machine/include/j721s2.inc
+++ b/meta-ti-bsp/conf/machine/include/j721s2.inc
@@ -3,7 +3,7 @@ SOC_FAMILY:append = ":j721s2"
MACHINE_FEATURES += "screen gpu"
-PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
+PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-umlibs"
TFA_BOARD = "generic"
diff --git a/meta-ti-bsp/conf/machine/include/j784s4.inc b/meta-ti-bsp/conf/machine/include/j784s4.inc
index d03ee4a4..74b64203 100644
--- a/meta-ti-bsp/conf/machine/include/j784s4.inc
+++ b/meta-ti-bsp/conf/machine/include/j784s4.inc
@@ -3,7 +3,7 @@ SOC_FAMILY:append = ":j784s4"
MACHINE_FEATURES += "screen gpu"
-PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
+PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-umlibs"
TFA_BOARD = "j784s4"
diff --git a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.18.6276027.bb b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.18.6276027.bb
index 96fb7484..2e2fe1ac 100644
--- a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.18.6276027.bb
+++ b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.18.6276027.bb
@@ -5,8 +5,6 @@ LIC_FILES_CHKSUM = "file://README;beginline=14;endline=19;md5=0403c7dea01a2b8232
inherit module
-PROVIDES = "virtual/gpudriver"
-
MACHINE_KERNEL_PR:append = "b"
PR = "${MACHINE_KERNEL_PR}"
diff --git a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb
index bf4fa98a..ed614038 100644
--- a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb
+++ b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb
@@ -5,8 +5,6 @@ LIC_FILES_CHKSUM = "file://eurasia_km/README;beginline=13;endline=22;md5=74506d9
inherit module
-PROVIDES = "virtual/gpudriver"
-
COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|am65xx"
MACHINE_KERNEL_PR:append = "x"
diff --git a/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_1.18.6276027.bb b/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_1.18.6276027.bb
index 94d14ded..f6f363b0 100644
--- a/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_1.18.6276027.bb
+++ b/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_1.18.6276027.bb
@@ -3,6 +3,8 @@ HOMEPAGE = "http://git.ti.com/graphics/ti-img-rogue-umlibs"
LICENSE = "TI-TFL"
LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=7232b98c1c58f99e3baa03de5207e76f"
+PROVIDES = "virtual/gpudriver"
+
inherit bin_package
PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -22,7 +24,8 @@ TARGET_PRODUCT:am62xx = "am62_linux"
PVR_BUILD = "release"
PVR_WS = "lws-generic"
-RDEPENDS:${PN} += "mesa-megadriver libdrm ti-img-rogue-driver"
+RDEPENDS:${PN} += "libdrm"
+RDEPENDS:${PN} += "ti-img-rogue-driver"
do_install:append() {
if ${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'true', 'false', d)}; then
diff --git a/meta-ti-bsp/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb b/meta-ti-bsp/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb
index 755cc4f5..3a91d9c3 100644
--- a/meta-ti-bsp/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb
+++ b/meta-ti-bsp/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb
@@ -3,6 +3,8 @@ HOMEPAGE = "https://git.ti.com/graphics/omap5-sgx-ddk-um-linux"
LICENSE = "TI-TSPA"
LIC_FILES_CHKSUM = "file://TI-Linux-Graphics-DDK-UM-Manifest.doc;md5=b17390502bc89535c86cfbbae961a2a8"
+PROVIDES = "virtual/gpudriver"
+
PACKAGE_ARCH = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|am65xx"
@@ -35,8 +37,7 @@ def use_initscript(d):
inherit ${@oe.utils.ifelse(use_initscript(d), 'update-rc.d', '')}
RDEPENDS:${PN} += "libdrm"
-
-RRECOMMENDS:${PN} += "ti-sgx-ddk-km"
+RDEPENDS:${PN} += "ti-sgx-ddk-km"
S = "${WORKDIR}/git"
diff --git a/meta-ti-bsp/recipes-graphics/mesa/mesa-gl_22.%.bbappend b/meta-ti-bsp/recipes-graphics/mesa/mesa-gl_22.%.bbappend
index 912e9e9d..f505a569 100644
--- a/meta-ti-bsp/recipes-graphics/mesa/mesa-gl_22.%.bbappend
+++ b/meta-ti-bsp/recipes-graphics/mesa/mesa-gl_22.%.bbappend
@@ -1 +1 @@
-require ${@bb.utils.contains_any('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-img-rogue-driver ti-sgx-ddk-km', 'pvr-mesa.inc', '', d)}
+require ${@bb.utils.contains_any('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-img-rogue-umlibs ti-sgx-ddk-um', 'pvr-mesa.inc', '', d)}
diff --git a/meta-ti-bsp/recipes-graphics/mesa/mesa_22.%.bbappend b/meta-ti-bsp/recipes-graphics/mesa/mesa_22.%.bbappend
index 912e9e9d..f505a569 100644
--- a/meta-ti-bsp/recipes-graphics/mesa/mesa_22.%.bbappend
+++ b/meta-ti-bsp/recipes-graphics/mesa/mesa_22.%.bbappend
@@ -1 +1 @@
-require ${@bb.utils.contains_any('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-img-rogue-driver ti-sgx-ddk-km', 'pvr-mesa.inc', '', d)}
+require ${@bb.utils.contains_any('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-img-rogue-umlibs ti-sgx-ddk-um', 'pvr-mesa.inc', '', d)}
diff --git a/meta-ti-bsp/recipes-graphics/mesa/pvr-mesa.inc b/meta-ti-bsp/recipes-graphics/mesa/pvr-mesa.inc
index 96c484a7..d9e56d84 100644
--- a/meta-ti-bsp/recipes-graphics/mesa/pvr-mesa.inc
+++ b/meta-ti-bsp/recipes-graphics/mesa/pvr-mesa.inc
@@ -23,8 +23,8 @@ S = "${WORKDIR}/git"
SRCREV = "44b82a7b6fa8a86243911b1b0d6a07b0fd8ecfba"
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)} \
+ ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-img-rogue-umlibs', 'pvr', '', d)} \
+ ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-sgx-ddk-um', 'sgx', '', d)} \
"
PVR_DISPLAY_CONTROLLER_ALIAS ??= "tidss"
@@ -45,4 +45,4 @@ do_install:append () {
rm -rf ${D}${datadir}/pkgconfig
}
-RRECOMMENDS:mesa-megadriver:append:class-target = " ${@d.getVar('PREFERRED_PROVIDER_virtual/gpudriver')}"
+RDEPENDS:mesa-megadriver:append:class-target = " ${@d.getVar('PREFERRED_PROVIDER_virtual/gpudriver')}"
--
2.39.2
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [meta-ti][master/kirkstone][PATCH 5/5] meta-ti-bsp: graphics: Correct dependency chain
2023-04-06 19:28 ` [meta-ti][master/kirkstone][PATCH 5/5] meta-ti-bsp: graphics: Correct dependency chain Andrew Davis
@ 2023-04-06 19:46 ` Denys Dmytriyenko
2023-04-06 20:58 ` Andrew Davis
2023-04-06 20:28 ` Randolph Sapp
1 sibling, 1 reply; 13+ messages in thread
From: Denys Dmytriyenko @ 2023-04-06 19:46 UTC (permalink / raw)
To: afd; +Cc: Denys Dmytriyenko, Ryan Eatmon, Randolph Sapp, meta-ti
On Thu, Apr 06, 2023 at 02:28:47PM -0500, Andrew Davis via lists.yoctoproject.org wrote:
> Previously the virtual/gpudriver provider would point to the kernel-mode
> driver, which would cause Mesa libraries to depend on those and not the
> user-mode driver. It is the user-mode driver that should depend on the
> kernel-mode driver, not the other way around. The logical dependency
> chain should be:
No, umlibs already has lots of virtual providers to choose from - virtual/egl,
virtual/gles and even virtual/mesa. And virtual/gpudriver was specifically
added to point to a kernel-mode driver - rogue-driver or sgx-km.
So, flipping the dependency chain is probably the correct change, but changing
what virtual/gpudriver means seems wrong.
> App -> virtual/libgl -> Mesa -> virtual/gpudriver -> IMG-UM -> IMG-KM
>
> Flip the dependency chain so it matches the above. While here make
> the UM driver depend on, not just recommend, the KM driver as it is
> not functional with out it.
>
> Signed-off-by: Andrew Davis <afd@ti.com>
> ---
> meta-ti-bsp/conf/machine/include/am62xx.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/j784s4.inc | 2 +-
> .../powervr-drivers/ti-img-rogue-driver_1.18.6276027.bb | 2 --
> .../powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb | 2 --
> .../libgles/ti-img-rogue-umlibs_1.18.6276027.bb | 5 ++++-
> .../recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb | 5 +++--
> meta-ti-bsp/recipes-graphics/mesa/mesa-gl_22.%.bbappend | 2 +-
> meta-ti-bsp/recipes-graphics/mesa/mesa_22.%.bbappend | 2 +-
> meta-ti-bsp/recipes-graphics/mesa/pvr-mesa.inc | 6 +++---
> 11 files changed, 16 insertions(+), 16 deletions(-)
>
> diff --git a/meta-ti-bsp/conf/machine/include/am62xx.inc b/meta-ti-bsp/conf/machine/include/am62xx.inc
> index af6a6db4..93151bcf 100644
> --- a/meta-ti-bsp/conf/machine/include/am62xx.inc
> +++ b/meta-ti-bsp/conf/machine/include/am62xx.inc
> @@ -6,7 +6,7 @@ MACHINE_FEATURES += "screen gpu"
> SERIAL_CONSOLES = "115200;ttyS2"
> SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
>
> -PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
> +PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-umlibs"
>
> # Default tiboot3.bin on AM62x is for HS-FS
> BBMULTICONFIG = "k3r5-hs-fs"
> diff --git a/meta-ti-bsp/conf/machine/include/j721e.inc b/meta-ti-bsp/conf/machine/include/j721e.inc
> index 8f9c24e6..05aa7515 100644
> --- a/meta-ti-bsp/conf/machine/include/j721e.inc
> +++ b/meta-ti-bsp/conf/machine/include/j721e.inc
> @@ -3,7 +3,7 @@ SOC_FAMILY:append = ":j721e"
>
> MACHINE_FEATURES += "screen gpu"
>
> -PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
> +PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-umlibs"
>
> # On J721e the file tiboot3.bin comes from the bootloader not ti-sci-fw
> do_image_wic[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy"
> diff --git a/meta-ti-bsp/conf/machine/include/j721s2.inc b/meta-ti-bsp/conf/machine/include/j721s2.inc
> index 70569a16..9a21df49 100644
> --- a/meta-ti-bsp/conf/machine/include/j721s2.inc
> +++ b/meta-ti-bsp/conf/machine/include/j721s2.inc
> @@ -3,7 +3,7 @@ SOC_FAMILY:append = ":j721s2"
>
> MACHINE_FEATURES += "screen gpu"
>
> -PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
> +PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-umlibs"
>
> TFA_BOARD = "generic"
>
> diff --git a/meta-ti-bsp/conf/machine/include/j784s4.inc b/meta-ti-bsp/conf/machine/include/j784s4.inc
> index d03ee4a4..74b64203 100644
> --- a/meta-ti-bsp/conf/machine/include/j784s4.inc
> +++ b/meta-ti-bsp/conf/machine/include/j784s4.inc
> @@ -3,7 +3,7 @@ SOC_FAMILY:append = ":j784s4"
>
> MACHINE_FEATURES += "screen gpu"
>
> -PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
> +PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-umlibs"
>
> TFA_BOARD = "j784s4"
>
> diff --git a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.18.6276027.bb b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.18.6276027.bb
> index 96fb7484..2e2fe1ac 100644
> --- a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.18.6276027.bb
> +++ b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.18.6276027.bb
> @@ -5,8 +5,6 @@ LIC_FILES_CHKSUM = "file://README;beginline=14;endline=19;md5=0403c7dea01a2b8232
>
> inherit module
>
> -PROVIDES = "virtual/gpudriver"
> -
> MACHINE_KERNEL_PR:append = "b"
> PR = "${MACHINE_KERNEL_PR}"
>
> diff --git a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb
> index bf4fa98a..ed614038 100644
> --- a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb
> +++ b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb
> @@ -5,8 +5,6 @@ LIC_FILES_CHKSUM = "file://eurasia_km/README;beginline=13;endline=22;md5=74506d9
>
> inherit module
>
> -PROVIDES = "virtual/gpudriver"
> -
> COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|am65xx"
>
> MACHINE_KERNEL_PR:append = "x"
> diff --git a/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_1.18.6276027.bb b/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_1.18.6276027.bb
> index 94d14ded..f6f363b0 100644
> --- a/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_1.18.6276027.bb
> +++ b/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_1.18.6276027.bb
> @@ -3,6 +3,8 @@ HOMEPAGE = "http://git.ti.com/graphics/ti-img-rogue-umlibs"
> LICENSE = "TI-TFL"
> LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=7232b98c1c58f99e3baa03de5207e76f"
>
> +PROVIDES = "virtual/gpudriver"
> +
> inherit bin_package
>
> PACKAGE_ARCH = "${MACHINE_ARCH}"
> @@ -22,7 +24,8 @@ TARGET_PRODUCT:am62xx = "am62_linux"
> PVR_BUILD = "release"
> PVR_WS = "lws-generic"
>
> -RDEPENDS:${PN} += "mesa-megadriver libdrm ti-img-rogue-driver"
> +RDEPENDS:${PN} += "libdrm"
> +RDEPENDS:${PN} += "ti-img-rogue-driver"
>
> do_install:append() {
> if ${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'true', 'false', d)}; then
> diff --git a/meta-ti-bsp/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb b/meta-ti-bsp/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb
> index 755cc4f5..3a91d9c3 100644
> --- a/meta-ti-bsp/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb
> +++ b/meta-ti-bsp/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb
> @@ -3,6 +3,8 @@ HOMEPAGE = "https://git.ti.com/graphics/omap5-sgx-ddk-um-linux"
> LICENSE = "TI-TSPA"
> LIC_FILES_CHKSUM = "file://TI-Linux-Graphics-DDK-UM-Manifest.doc;md5=b17390502bc89535c86cfbbae961a2a8"
>
> +PROVIDES = "virtual/gpudriver"
> +
> PACKAGE_ARCH = "${MACHINE_ARCH}"
> COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|am65xx"
>
> @@ -35,8 +37,7 @@ def use_initscript(d):
> inherit ${@oe.utils.ifelse(use_initscript(d), 'update-rc.d', '')}
>
> RDEPENDS:${PN} += "libdrm"
> -
> -RRECOMMENDS:${PN} += "ti-sgx-ddk-km"
> +RDEPENDS:${PN} += "ti-sgx-ddk-km"
>
> S = "${WORKDIR}/git"
>
> diff --git a/meta-ti-bsp/recipes-graphics/mesa/mesa-gl_22.%.bbappend b/meta-ti-bsp/recipes-graphics/mesa/mesa-gl_22.%.bbappend
> index 912e9e9d..f505a569 100644
> --- a/meta-ti-bsp/recipes-graphics/mesa/mesa-gl_22.%.bbappend
> +++ b/meta-ti-bsp/recipes-graphics/mesa/mesa-gl_22.%.bbappend
> @@ -1 +1 @@
> -require ${@bb.utils.contains_any('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-img-rogue-driver ti-sgx-ddk-km', 'pvr-mesa.inc', '', d)}
> +require ${@bb.utils.contains_any('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-img-rogue-umlibs ti-sgx-ddk-um', 'pvr-mesa.inc', '', d)}
> diff --git a/meta-ti-bsp/recipes-graphics/mesa/mesa_22.%.bbappend b/meta-ti-bsp/recipes-graphics/mesa/mesa_22.%.bbappend
> index 912e9e9d..f505a569 100644
> --- a/meta-ti-bsp/recipes-graphics/mesa/mesa_22.%.bbappend
> +++ b/meta-ti-bsp/recipes-graphics/mesa/mesa_22.%.bbappend
> @@ -1 +1 @@
> -require ${@bb.utils.contains_any('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-img-rogue-driver ti-sgx-ddk-km', 'pvr-mesa.inc', '', d)}
> +require ${@bb.utils.contains_any('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-img-rogue-umlibs ti-sgx-ddk-um', 'pvr-mesa.inc', '', d)}
> diff --git a/meta-ti-bsp/recipes-graphics/mesa/pvr-mesa.inc b/meta-ti-bsp/recipes-graphics/mesa/pvr-mesa.inc
> index 96c484a7..d9e56d84 100644
> --- a/meta-ti-bsp/recipes-graphics/mesa/pvr-mesa.inc
> +++ b/meta-ti-bsp/recipes-graphics/mesa/pvr-mesa.inc
> @@ -23,8 +23,8 @@ S = "${WORKDIR}/git"
> SRCREV = "44b82a7b6fa8a86243911b1b0d6a07b0fd8ecfba"
>
> 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)} \
> + ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-img-rogue-umlibs', 'pvr', '', d)} \
> + ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-sgx-ddk-um', 'sgx', '', d)} \
> "
>
> PVR_DISPLAY_CONTROLLER_ALIAS ??= "tidss"
> @@ -45,4 +45,4 @@ do_install:append () {
> rm -rf ${D}${datadir}/pkgconfig
> }
>
> -RRECOMMENDS:mesa-megadriver:append:class-target = " ${@d.getVar('PREFERRED_PROVIDER_virtual/gpudriver')}"
> +RDEPENDS:mesa-megadriver:append:class-target = " ${@d.getVar('PREFERRED_PROVIDER_virtual/gpudriver')}"
> --
> 2.39.2
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [meta-ti][master/kirkstone][PATCH 5/5] meta-ti-bsp: graphics: Correct dependency chain
2023-04-06 19:28 ` [meta-ti][master/kirkstone][PATCH 5/5] meta-ti-bsp: graphics: Correct dependency chain Andrew Davis
2023-04-06 19:46 ` Denys Dmytriyenko
@ 2023-04-06 20:28 ` Randolph Sapp
2023-04-06 20:47 ` Andrew Davis
1 sibling, 1 reply; 13+ messages in thread
From: Randolph Sapp @ 2023-04-06 20:28 UTC (permalink / raw)
To: Andrew Davis, Denys Dmytriyenko, Ryan Eatmon, meta-ti
On 4/6/23 14:28, Andrew Davis wrote:
> Previously the virtual/gpudriver provider would point to the kernel-mode
> driver, which would cause Mesa libraries to depend on those and not the
> user-mode driver. It is the user-mode driver that should depend on the
> kernel-mode driver, not the other way around. The logical dependency
> chain should be:
>
> App -> virtual/libgl -> Mesa -> virtual/gpudriver -> IMG-UM -> IMG-KM
We already talked about this so I'm fine with it.
>
> Flip the dependency chain so it matches the above. While here make
> the UM driver depend on, not just recommend, the KM driver as it is
> not functional with out it.
>
> Signed-off-by: Andrew Davis <afd@ti.com>
...
> -RRECOMMENDS:mesa-megadriver:append:class-target = " ${@d.getVar('PREFERRED_PROVIDER_virtual/gpudriver')}"
> +RDEPENDS:mesa-megadriver:append:class-target = " ${@d.getVar('PREFERRED_PROVIDER_virtual/gpudriver')}"
I have issues with making this a full dependency here. We're adding the
PVR components to mesa, software rendering is still there as a fallback.
If someone wishes to remove the powervr umlibs with OPKG having this as
a hard dependency will break a lot of things.
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [meta-ti][master/kirkstone][PATCH 5/5] meta-ti-bsp: graphics: Correct dependency chain
2023-04-06 20:28 ` Randolph Sapp
@ 2023-04-06 20:47 ` Andrew Davis
0 siblings, 0 replies; 13+ messages in thread
From: Andrew Davis @ 2023-04-06 20:47 UTC (permalink / raw)
To: Randolph Sapp, Denys Dmytriyenko, Ryan Eatmon, meta-ti
On 4/6/23 3:28 PM, Randolph Sapp wrote:
> On 4/6/23 14:28, Andrew Davis wrote:
>> Previously the virtual/gpudriver provider would point to the kernel-mode
>> driver, which would cause Mesa libraries to depend on those and not the
>> user-mode driver. It is the user-mode driver that should depend on the
>> kernel-mode driver, not the other way around. The logical dependency
>> chain should be:
>>
>> App -> virtual/libgl -> Mesa -> virtual/gpudriver -> IMG-UM -> IMG-KM
>
> We already talked about this so I'm fine with it.
>
>>
>> Flip the dependency chain so it matches the above. While here make
>> the UM driver depend on, not just recommend, the KM driver as it is
>> not functional with out it.
>>
>> Signed-off-by: Andrew Davis <afd@ti.com>
>
> ...
>
>> -RRECOMMENDS:mesa-megadriver:append:class-target = " ${@d.getVar('PREFERRED_PROVIDER_virtual/gpudriver')}"
>> +RDEPENDS:mesa-megadriver:append:class-target = " ${@d.getVar('PREFERRED_PROVIDER_virtual/gpudriver')}"
>
> I have issues with making this a full dependency here. We're adding the PVR components to mesa, software rendering is still there as a fallback. If someone wishes to remove the powervr umlibs with OPKG having this as a hard dependency will break a lot of things.
Not sure I'd agree that is what "depends" and "recommends" means for
a version of Mesa specifically built to use SGX/RGX hardware accel..
For now I'll drop this part of the patch for v2, at least until we
can sync on this.
Andrew
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [meta-ti][master/kirkstone][PATCH 5/5] meta-ti-bsp: graphics: Correct dependency chain
2023-04-06 19:46 ` Denys Dmytriyenko
@ 2023-04-06 20:58 ` Andrew Davis
2023-04-06 21:25 ` Denys Dmytriyenko
0 siblings, 1 reply; 13+ messages in thread
From: Andrew Davis @ 2023-04-06 20:58 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: Denys Dmytriyenko, Ryan Eatmon, Randolph Sapp, meta-ti
On 4/6/23 2:46 PM, Denys Dmytriyenko wrote:
> On Thu, Apr 06, 2023 at 02:28:47PM -0500, Andrew Davis via lists.yoctoproject.org wrote:
>> Previously the virtual/gpudriver provider would point to the kernel-mode
>> driver, which would cause Mesa libraries to depend on those and not the
>> user-mode driver. It is the user-mode driver that should depend on the
>> kernel-mode driver, not the other way around. The logical dependency
>> chain should be:
>
> No, umlibs already has lots of virtual providers to choose from - virtual/egl,
> virtual/gles and even virtual/mesa. And virtual/gpudriver was specifically
> added to point to a kernel-mode driver - rogue-driver or sgx-km.
>
But none of these virtual providers actually point to the umlibs anymore,
those all point to Mesa.
> So, flipping the dependency chain is probably the correct change, but changing
> what virtual/gpudriver means seems wrong.
>
Not sure what the issue is with changing what this virtual provider means.
It is our creation that no one else uses, it exists today only as a flag to
tell our Mesa bbappend which backend to choose.
Andrew
>
>> App -> virtual/libgl -> Mesa -> virtual/gpudriver -> IMG-UM -> IMG-KM
>>
>> Flip the dependency chain so it matches the above. While here make
>> the UM driver depend on, not just recommend, the KM driver as it is
>> not functional with out it.
>>
>> Signed-off-by: Andrew Davis <afd@ti.com>
>> ---
>> meta-ti-bsp/conf/machine/include/am62xx.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/j784s4.inc | 2 +-
>> .../powervr-drivers/ti-img-rogue-driver_1.18.6276027.bb | 2 --
>> .../powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb | 2 --
>> .../libgles/ti-img-rogue-umlibs_1.18.6276027.bb | 5 ++++-
>> .../recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb | 5 +++--
>> meta-ti-bsp/recipes-graphics/mesa/mesa-gl_22.%.bbappend | 2 +-
>> meta-ti-bsp/recipes-graphics/mesa/mesa_22.%.bbappend | 2 +-
>> meta-ti-bsp/recipes-graphics/mesa/pvr-mesa.inc | 6 +++---
>> 11 files changed, 16 insertions(+), 16 deletions(-)
>>
>> diff --git a/meta-ti-bsp/conf/machine/include/am62xx.inc b/meta-ti-bsp/conf/machine/include/am62xx.inc
>> index af6a6db4..93151bcf 100644
>> --- a/meta-ti-bsp/conf/machine/include/am62xx.inc
>> +++ b/meta-ti-bsp/conf/machine/include/am62xx.inc
>> @@ -6,7 +6,7 @@ MACHINE_FEATURES += "screen gpu"
>> SERIAL_CONSOLES = "115200;ttyS2"
>> SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
>>
>> -PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
>> +PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-umlibs"
>>
>> # Default tiboot3.bin on AM62x is for HS-FS
>> BBMULTICONFIG = "k3r5-hs-fs"
>> diff --git a/meta-ti-bsp/conf/machine/include/j721e.inc b/meta-ti-bsp/conf/machine/include/j721e.inc
>> index 8f9c24e6..05aa7515 100644
>> --- a/meta-ti-bsp/conf/machine/include/j721e.inc
>> +++ b/meta-ti-bsp/conf/machine/include/j721e.inc
>> @@ -3,7 +3,7 @@ SOC_FAMILY:append = ":j721e"
>>
>> MACHINE_FEATURES += "screen gpu"
>>
>> -PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
>> +PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-umlibs"
>>
>> # On J721e the file tiboot3.bin comes from the bootloader not ti-sci-fw
>> do_image_wic[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy"
>> diff --git a/meta-ti-bsp/conf/machine/include/j721s2.inc b/meta-ti-bsp/conf/machine/include/j721s2.inc
>> index 70569a16..9a21df49 100644
>> --- a/meta-ti-bsp/conf/machine/include/j721s2.inc
>> +++ b/meta-ti-bsp/conf/machine/include/j721s2.inc
>> @@ -3,7 +3,7 @@ SOC_FAMILY:append = ":j721s2"
>>
>> MACHINE_FEATURES += "screen gpu"
>>
>> -PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
>> +PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-umlibs"
>>
>> TFA_BOARD = "generic"
>>
>> diff --git a/meta-ti-bsp/conf/machine/include/j784s4.inc b/meta-ti-bsp/conf/machine/include/j784s4.inc
>> index d03ee4a4..74b64203 100644
>> --- a/meta-ti-bsp/conf/machine/include/j784s4.inc
>> +++ b/meta-ti-bsp/conf/machine/include/j784s4.inc
>> @@ -3,7 +3,7 @@ SOC_FAMILY:append = ":j784s4"
>>
>> MACHINE_FEATURES += "screen gpu"
>>
>> -PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
>> +PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-umlibs"
>>
>> TFA_BOARD = "j784s4"
>>
>> diff --git a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.18.6276027.bb b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.18.6276027.bb
>> index 96fb7484..2e2fe1ac 100644
>> --- a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.18.6276027.bb
>> +++ b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.18.6276027.bb
>> @@ -5,8 +5,6 @@ LIC_FILES_CHKSUM = "file://README;beginline=14;endline=19;md5=0403c7dea01a2b8232
>>
>> inherit module
>>
>> -PROVIDES = "virtual/gpudriver"
>> -
>> MACHINE_KERNEL_PR:append = "b"
>> PR = "${MACHINE_KERNEL_PR}"
>>
>> diff --git a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb
>> index bf4fa98a..ed614038 100644
>> --- a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb
>> +++ b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb
>> @@ -5,8 +5,6 @@ LIC_FILES_CHKSUM = "file://eurasia_km/README;beginline=13;endline=22;md5=74506d9
>>
>> inherit module
>>
>> -PROVIDES = "virtual/gpudriver"
>> -
>> COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|am65xx"
>>
>> MACHINE_KERNEL_PR:append = "x"
>> diff --git a/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_1.18.6276027.bb b/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_1.18.6276027.bb
>> index 94d14ded..f6f363b0 100644
>> --- a/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_1.18.6276027.bb
>> +++ b/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_1.18.6276027.bb
>> @@ -3,6 +3,8 @@ HOMEPAGE = "http://git.ti.com/graphics/ti-img-rogue-umlibs"
>> LICENSE = "TI-TFL"
>> LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=7232b98c1c58f99e3baa03de5207e76f"
>>
>> +PROVIDES = "virtual/gpudriver"
>> +
>> inherit bin_package
>>
>> PACKAGE_ARCH = "${MACHINE_ARCH}"
>> @@ -22,7 +24,8 @@ TARGET_PRODUCT:am62xx = "am62_linux"
>> PVR_BUILD = "release"
>> PVR_WS = "lws-generic"
>>
>> -RDEPENDS:${PN} += "mesa-megadriver libdrm ti-img-rogue-driver"
>> +RDEPENDS:${PN} += "libdrm"
>> +RDEPENDS:${PN} += "ti-img-rogue-driver"
>>
>> do_install:append() {
>> if ${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'true', 'false', d)}; then
>> diff --git a/meta-ti-bsp/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb b/meta-ti-bsp/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb
>> index 755cc4f5..3a91d9c3 100644
>> --- a/meta-ti-bsp/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb
>> +++ b/meta-ti-bsp/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb
>> @@ -3,6 +3,8 @@ HOMEPAGE = "https://git.ti.com/graphics/omap5-sgx-ddk-um-linux"
>> LICENSE = "TI-TSPA"
>> LIC_FILES_CHKSUM = "file://TI-Linux-Graphics-DDK-UM-Manifest.doc;md5=b17390502bc89535c86cfbbae961a2a8"
>>
>> +PROVIDES = "virtual/gpudriver"
>> +
>> PACKAGE_ARCH = "${MACHINE_ARCH}"
>> COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|am65xx"
>>
>> @@ -35,8 +37,7 @@ def use_initscript(d):
>> inherit ${@oe.utils.ifelse(use_initscript(d), 'update-rc.d', '')}
>>
>> RDEPENDS:${PN} += "libdrm"
>> -
>> -RRECOMMENDS:${PN} += "ti-sgx-ddk-km"
>> +RDEPENDS:${PN} += "ti-sgx-ddk-km"
>>
>> S = "${WORKDIR}/git"
>>
>> diff --git a/meta-ti-bsp/recipes-graphics/mesa/mesa-gl_22.%.bbappend b/meta-ti-bsp/recipes-graphics/mesa/mesa-gl_22.%.bbappend
>> index 912e9e9d..f505a569 100644
>> --- a/meta-ti-bsp/recipes-graphics/mesa/mesa-gl_22.%.bbappend
>> +++ b/meta-ti-bsp/recipes-graphics/mesa/mesa-gl_22.%.bbappend
>> @@ -1 +1 @@
>> -require ${@bb.utils.contains_any('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-img-rogue-driver ti-sgx-ddk-km', 'pvr-mesa.inc', '', d)}
>> +require ${@bb.utils.contains_any('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-img-rogue-umlibs ti-sgx-ddk-um', 'pvr-mesa.inc', '', d)}
>> diff --git a/meta-ti-bsp/recipes-graphics/mesa/mesa_22.%.bbappend b/meta-ti-bsp/recipes-graphics/mesa/mesa_22.%.bbappend
>> index 912e9e9d..f505a569 100644
>> --- a/meta-ti-bsp/recipes-graphics/mesa/mesa_22.%.bbappend
>> +++ b/meta-ti-bsp/recipes-graphics/mesa/mesa_22.%.bbappend
>> @@ -1 +1 @@
>> -require ${@bb.utils.contains_any('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-img-rogue-driver ti-sgx-ddk-km', 'pvr-mesa.inc', '', d)}
>> +require ${@bb.utils.contains_any('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-img-rogue-umlibs ti-sgx-ddk-um', 'pvr-mesa.inc', '', d)}
>> diff --git a/meta-ti-bsp/recipes-graphics/mesa/pvr-mesa.inc b/meta-ti-bsp/recipes-graphics/mesa/pvr-mesa.inc
>> index 96c484a7..d9e56d84 100644
>> --- a/meta-ti-bsp/recipes-graphics/mesa/pvr-mesa.inc
>> +++ b/meta-ti-bsp/recipes-graphics/mesa/pvr-mesa.inc
>> @@ -23,8 +23,8 @@ S = "${WORKDIR}/git"
>> SRCREV = "44b82a7b6fa8a86243911b1b0d6a07b0fd8ecfba"
>>
>> 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)} \
>> + ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-img-rogue-umlibs', 'pvr', '', d)} \
>> + ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-sgx-ddk-um', 'sgx', '', d)} \
>> "
>>
>> PVR_DISPLAY_CONTROLLER_ALIAS ??= "tidss"
>> @@ -45,4 +45,4 @@ do_install:append () {
>> rm -rf ${D}${datadir}/pkgconfig
>> }
>>
>> -RRECOMMENDS:mesa-megadriver:append:class-target = " ${@d.getVar('PREFERRED_PROVIDER_virtual/gpudriver')}"
>> +RDEPENDS:mesa-megadriver:append:class-target = " ${@d.getVar('PREFERRED_PROVIDER_virtual/gpudriver')}"
>> --
>> 2.39.2
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [meta-ti][master/kirkstone][PATCH 5/5] meta-ti-bsp: graphics: Correct dependency chain
2023-04-06 20:58 ` Andrew Davis
@ 2023-04-06 21:25 ` Denys Dmytriyenko
2023-04-06 21:30 ` [EXTERNAL] " Randolph Sapp
0 siblings, 1 reply; 13+ messages in thread
From: Denys Dmytriyenko @ 2023-04-06 21:25 UTC (permalink / raw)
To: afd; +Cc: Denys Dmytriyenko, Ryan Eatmon, Randolph Sapp, meta-ti
On Thu, Apr 06, 2023 at 03:58:41PM -0500, Andrew Davis via lists.yoctoproject.org wrote:
> On 4/6/23 2:46 PM, Denys Dmytriyenko wrote:
> >On Thu, Apr 06, 2023 at 02:28:47PM -0500, Andrew Davis via lists.yoctoproject.org wrote:
> >>Previously the virtual/gpudriver provider would point to the kernel-mode
> >>driver, which would cause Mesa libraries to depend on those and not the
> >>user-mode driver. It is the user-mode driver that should depend on the
> >>kernel-mode driver, not the other way around. The logical dependency
> >>chain should be:
> >
> >No, umlibs already has lots of virtual providers to choose from - virtual/egl,
> >virtual/gles and even virtual/mesa. And virtual/gpudriver was specifically
> >added to point to a kernel-mode driver - rogue-driver or sgx-km.
> >
>
> But none of these virtual providers actually point to the umlibs anymore,
> those all point to Mesa.
Ah, right...
> >So, flipping the dependency chain is probably the correct change, but changing
> >what virtual/gpudriver means seems wrong.
> >
>
> Not sure what the issue is with changing what this virtual provider means.
> It is our creation that no one else uses, it exists today only as a flag to
> tell our Mesa bbappend which backend to choose.
It seems confusing - the kernel-mode for Rogue has the word "driver" in it.
If it's not being used anywhere else any longer, and it should point to
user-mode part now, why not also rename it to, let's say, virtual/gpulibs?
How does Imagination Tech call this proprietary piece?
--
Denys
> >>App -> virtual/libgl -> Mesa -> virtual/gpudriver -> IMG-UM -> IMG-KM
> >>
> >>Flip the dependency chain so it matches the above. While here make
> >>the UM driver depend on, not just recommend, the KM driver as it is
> >>not functional with out it.
> >>
> >>Signed-off-by: Andrew Davis <afd@ti.com>
> >>---
> >> meta-ti-bsp/conf/machine/include/am62xx.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/j784s4.inc | 2 +-
> >> .../powervr-drivers/ti-img-rogue-driver_1.18.6276027.bb | 2 --
> >> .../powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb | 2 --
> >> .../libgles/ti-img-rogue-umlibs_1.18.6276027.bb | 5 ++++-
> >> .../recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb | 5 +++--
> >> meta-ti-bsp/recipes-graphics/mesa/mesa-gl_22.%.bbappend | 2 +-
> >> meta-ti-bsp/recipes-graphics/mesa/mesa_22.%.bbappend | 2 +-
> >> meta-ti-bsp/recipes-graphics/mesa/pvr-mesa.inc | 6 +++---
> >> 11 files changed, 16 insertions(+), 16 deletions(-)
> >>
> >>diff --git a/meta-ti-bsp/conf/machine/include/am62xx.inc b/meta-ti-bsp/conf/machine/include/am62xx.inc
> >>index af6a6db4..93151bcf 100644
> >>--- a/meta-ti-bsp/conf/machine/include/am62xx.inc
> >>+++ b/meta-ti-bsp/conf/machine/include/am62xx.inc
> >>@@ -6,7 +6,7 @@ MACHINE_FEATURES += "screen gpu"
> >> SERIAL_CONSOLES = "115200;ttyS2"
> >> SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
> >>-PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
> >>+PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-umlibs"
> >> # Default tiboot3.bin on AM62x is for HS-FS
> >> BBMULTICONFIG = "k3r5-hs-fs"
> >>diff --git a/meta-ti-bsp/conf/machine/include/j721e.inc b/meta-ti-bsp/conf/machine/include/j721e.inc
> >>index 8f9c24e6..05aa7515 100644
> >>--- a/meta-ti-bsp/conf/machine/include/j721e.inc
> >>+++ b/meta-ti-bsp/conf/machine/include/j721e.inc
> >>@@ -3,7 +3,7 @@ SOC_FAMILY:append = ":j721e"
> >> MACHINE_FEATURES += "screen gpu"
> >>-PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
> >>+PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-umlibs"
> >> # On J721e the file tiboot3.bin comes from the bootloader not ti-sci-fw
> >> do_image_wic[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy"
> >>diff --git a/meta-ti-bsp/conf/machine/include/j721s2.inc b/meta-ti-bsp/conf/machine/include/j721s2.inc
> >>index 70569a16..9a21df49 100644
> >>--- a/meta-ti-bsp/conf/machine/include/j721s2.inc
> >>+++ b/meta-ti-bsp/conf/machine/include/j721s2.inc
> >>@@ -3,7 +3,7 @@ SOC_FAMILY:append = ":j721s2"
> >> MACHINE_FEATURES += "screen gpu"
> >>-PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
> >>+PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-umlibs"
> >> TFA_BOARD = "generic"
> >>diff --git a/meta-ti-bsp/conf/machine/include/j784s4.inc b/meta-ti-bsp/conf/machine/include/j784s4.inc
> >>index d03ee4a4..74b64203 100644
> >>--- a/meta-ti-bsp/conf/machine/include/j784s4.inc
> >>+++ b/meta-ti-bsp/conf/machine/include/j784s4.inc
> >>@@ -3,7 +3,7 @@ SOC_FAMILY:append = ":j784s4"
> >> MACHINE_FEATURES += "screen gpu"
> >>-PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
> >>+PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-umlibs"
> >> TFA_BOARD = "j784s4"
> >>diff --git a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.18.6276027.bb b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.18.6276027.bb
> >>index 96fb7484..2e2fe1ac 100644
> >>--- a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.18.6276027.bb
> >>+++ b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.18.6276027.bb
> >>@@ -5,8 +5,6 @@ LIC_FILES_CHKSUM = "file://README;beginline=14;endline=19;md5=0403c7dea01a2b8232
> >> inherit module
> >>-PROVIDES = "virtual/gpudriver"
> >>-
> >> MACHINE_KERNEL_PR:append = "b"
> >> PR = "${MACHINE_KERNEL_PR}"
> >>diff --git a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb
> >>index bf4fa98a..ed614038 100644
> >>--- a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb
> >>+++ b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb
> >>@@ -5,8 +5,6 @@ LIC_FILES_CHKSUM = "file://eurasia_km/README;beginline=13;endline=22;md5=74506d9
> >> inherit module
> >>-PROVIDES = "virtual/gpudriver"
> >>-
> >> COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|am65xx"
> >> MACHINE_KERNEL_PR:append = "x"
> >>diff --git a/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_1.18.6276027.bb b/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_1.18.6276027.bb
> >>index 94d14ded..f6f363b0 100644
> >>--- a/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_1.18.6276027.bb
> >>+++ b/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_1.18.6276027.bb
> >>@@ -3,6 +3,8 @@ HOMEPAGE = "http://git.ti.com/graphics/ti-img-rogue-umlibs"
> >> LICENSE = "TI-TFL"
> >> LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=7232b98c1c58f99e3baa03de5207e76f"
> >>+PROVIDES = "virtual/gpudriver"
> >>+
> >> inherit bin_package
> >> PACKAGE_ARCH = "${MACHINE_ARCH}"
> >>@@ -22,7 +24,8 @@ TARGET_PRODUCT:am62xx = "am62_linux"
> >> PVR_BUILD = "release"
> >> PVR_WS = "lws-generic"
> >>-RDEPENDS:${PN} += "mesa-megadriver libdrm ti-img-rogue-driver"
> >>+RDEPENDS:${PN} += "libdrm"
> >>+RDEPENDS:${PN} += "ti-img-rogue-driver"
> >> do_install:append() {
> >> if ${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'true', 'false', d)}; then
> >>diff --git a/meta-ti-bsp/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb b/meta-ti-bsp/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb
> >>index 755cc4f5..3a91d9c3 100644
> >>--- a/meta-ti-bsp/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb
> >>+++ b/meta-ti-bsp/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb
> >>@@ -3,6 +3,8 @@ HOMEPAGE = "https://git.ti.com/graphics/omap5-sgx-ddk-um-linux"
> >> LICENSE = "TI-TSPA"
> >> LIC_FILES_CHKSUM = "file://TI-Linux-Graphics-DDK-UM-Manifest.doc;md5=b17390502bc89535c86cfbbae961a2a8"
> >>+PROVIDES = "virtual/gpudriver"
> >>+
> >> PACKAGE_ARCH = "${MACHINE_ARCH}"
> >> COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|am65xx"
> >>@@ -35,8 +37,7 @@ def use_initscript(d):
> >> inherit ${@oe.utils.ifelse(use_initscript(d), 'update-rc.d', '')}
> >> RDEPENDS:${PN} += "libdrm"
> >>-
> >>-RRECOMMENDS:${PN} += "ti-sgx-ddk-km"
> >>+RDEPENDS:${PN} += "ti-sgx-ddk-km"
> >> S = "${WORKDIR}/git"
> >>diff --git a/meta-ti-bsp/recipes-graphics/mesa/mesa-gl_22.%.bbappend b/meta-ti-bsp/recipes-graphics/mesa/mesa-gl_22.%.bbappend
> >>index 912e9e9d..f505a569 100644
> >>--- a/meta-ti-bsp/recipes-graphics/mesa/mesa-gl_22.%.bbappend
> >>+++ b/meta-ti-bsp/recipes-graphics/mesa/mesa-gl_22.%.bbappend
> >>@@ -1 +1 @@
> >>-require ${@bb.utils.contains_any('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-img-rogue-driver ti-sgx-ddk-km', 'pvr-mesa.inc', '', d)}
> >>+require ${@bb.utils.contains_any('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-img-rogue-umlibs ti-sgx-ddk-um', 'pvr-mesa.inc', '', d)}
> >>diff --git a/meta-ti-bsp/recipes-graphics/mesa/mesa_22.%.bbappend b/meta-ti-bsp/recipes-graphics/mesa/mesa_22.%.bbappend
> >>index 912e9e9d..f505a569 100644
> >>--- a/meta-ti-bsp/recipes-graphics/mesa/mesa_22.%.bbappend
> >>+++ b/meta-ti-bsp/recipes-graphics/mesa/mesa_22.%.bbappend
> >>@@ -1 +1 @@
> >>-require ${@bb.utils.contains_any('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-img-rogue-driver ti-sgx-ddk-km', 'pvr-mesa.inc', '', d)}
> >>+require ${@bb.utils.contains_any('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-img-rogue-umlibs ti-sgx-ddk-um', 'pvr-mesa.inc', '', d)}
> >>diff --git a/meta-ti-bsp/recipes-graphics/mesa/pvr-mesa.inc b/meta-ti-bsp/recipes-graphics/mesa/pvr-mesa.inc
> >>index 96c484a7..d9e56d84 100644
> >>--- a/meta-ti-bsp/recipes-graphics/mesa/pvr-mesa.inc
> >>+++ b/meta-ti-bsp/recipes-graphics/mesa/pvr-mesa.inc
> >>@@ -23,8 +23,8 @@ S = "${WORKDIR}/git"
> >> SRCREV = "44b82a7b6fa8a86243911b1b0d6a07b0fd8ecfba"
> >> 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)} \
> >>+ ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-img-rogue-umlibs', 'pvr', '', d)} \
> >>+ ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-sgx-ddk-um', 'sgx', '', d)} \
> >> "
> >> PVR_DISPLAY_CONTROLLER_ALIAS ??= "tidss"
> >>@@ -45,4 +45,4 @@ do_install:append () {
> >> rm -rf ${D}${datadir}/pkgconfig
> >> }
> >>-RRECOMMENDS:mesa-megadriver:append:class-target = " ${@d.getVar('PREFERRED_PROVIDER_virtual/gpudriver')}"
> >>+RDEPENDS:mesa-megadriver:append:class-target = " ${@d.getVar('PREFERRED_PROVIDER_virtual/gpudriver')}"
> >>--
> >>2.39.2
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [EXTERNAL] Re: [meta-ti][master/kirkstone][PATCH 5/5] meta-ti-bsp: graphics: Correct dependency chain
2023-04-06 21:25 ` Denys Dmytriyenko
@ 2023-04-06 21:30 ` Randolph Sapp
2023-04-10 14:16 ` Andrew Davis
0 siblings, 1 reply; 13+ messages in thread
From: Randolph Sapp @ 2023-04-06 21:30 UTC (permalink / raw)
To: Denys Dmytriyenko, afd; +Cc: Denys Dmytriyenko, Ryan Eatmon, meta-ti
On 4/6/23 16:25, Denys Dmytriyenko wrote:
> On Thu, Apr 06, 2023 at 03:58:41PM -0500, Andrew Davis via lists.yoctoproject.org wrote:
>> On 4/6/23 2:46 PM, Denys Dmytriyenko wrote:
>>> On Thu, Apr 06, 2023 at 02:28:47PM -0500, Andrew Davis via lists.yoctoproject.org wrote:
>>>> Previously the virtual/gpudriver provider would point to the kernel-mode
>>>> driver, which would cause Mesa libraries to depend on those and not the
>>>> user-mode driver. It is the user-mode driver that should depend on the
>>>> kernel-mode driver, not the other way around. The logical dependency
>>>> chain should be:
>>>
>>> No, umlibs already has lots of virtual providers to choose from - virtual/egl,
>>> virtual/gles and even virtual/mesa. And virtual/gpudriver was specifically
>>> added to point to a kernel-mode driver - rogue-driver or sgx-km.
>>>
>>
>> But none of these virtual providers actually point to the umlibs anymore,
>> those all point to Mesa.
>
> Ah, right...
>
>
>>> So, flipping the dependency chain is probably the correct change, but changing
>>> what virtual/gpudriver means seems wrong.
>>>
>>
>> Not sure what the issue is with changing what this virtual provider means.
>> It is our creation that no one else uses, it exists today only as a flag to
>> tell our Mesa bbappend which backend to choose.
>
> It seems confusing - the kernel-mode for Rogue has the word "driver" in it.
> If it's not being used anywhere else any longer, and it should point to
> user-mode part now, why not also rename it to, let's say, virtual/gpulibs?
>
> How does Imagination Tech call this proprietary piece?
>
They just refer to the whole bag of software as the DDK. No specific
terminology for the components. Even if there was it, wouldn't apply
here, unfortunately, as this is specifically our packaged version. But
no, they don't even give us a hint to create a naming convention here.
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [EXTERNAL] Re: [meta-ti][master/kirkstone][PATCH 5/5] meta-ti-bsp: graphics: Correct dependency chain
2023-04-06 21:30 ` [EXTERNAL] " Randolph Sapp
@ 2023-04-10 14:16 ` Andrew Davis
2023-04-11 20:03 ` Denys Dmytriyenko
0 siblings, 1 reply; 13+ messages in thread
From: Andrew Davis @ 2023-04-10 14:16 UTC (permalink / raw)
To: Randolph Sapp, Denys Dmytriyenko; +Cc: Denys Dmytriyenko, Ryan Eatmon, meta-ti
On 4/6/23 4:30 PM, Randolph Sapp wrote:
> On 4/6/23 16:25, Denys Dmytriyenko wrote:
>> On Thu, Apr 06, 2023 at 03:58:41PM -0500, Andrew Davis via lists.yoctoproject.org wrote:
>>> On 4/6/23 2:46 PM, Denys Dmytriyenko wrote:
>>>> On Thu, Apr 06, 2023 at 02:28:47PM -0500, Andrew Davis via lists.yoctoproject.org wrote:
>>>>> Previously the virtual/gpudriver provider would point to the kernel-mode
>>>>> driver, which would cause Mesa libraries to depend on those and not the
>>>>> user-mode driver. It is the user-mode driver that should depend on the
>>>>> kernel-mode driver, not the other way around. The logical dependency
>>>>> chain should be:
>>>>
>>>> No, umlibs already has lots of virtual providers to choose from - virtual/egl,
>>>> virtual/gles and even virtual/mesa. And virtual/gpudriver was specifically
>>>> added to point to a kernel-mode driver - rogue-driver or sgx-km.
>>>>
>>>
>>> But none of these virtual providers actually point to the umlibs anymore,
>>> those all point to Mesa.
>>
>> Ah, right...
>>
>>
>>>> So, flipping the dependency chain is probably the correct change, but changing
>>>> what virtual/gpudriver means seems wrong.
>>>>
>>>
>>> Not sure what the issue is with changing what this virtual provider means.
>>> It is our creation that no one else uses, it exists today only as a flag to
>>> tell our Mesa bbappend which backend to choose.
>>
>> It seems confusing - the kernel-mode for Rogue has the word "driver" in it.
>> If it's not being used anywhere else any longer, and it should point to
>> user-mode part now, why not also rename it to, let's say, virtual/gpulibs?
>>
For GPU drivers, they are always two part drivers, so both mode drivers are
"drivers". In SGX we use "UM/KM" instead of "umlib/driver", we could always
rename the Rogue recipes if it's more clear. Since both are parts of the
"gpudriver" I still don't see an issue with pointing to either with that
label.
If a rename like "virtual/umlibs" makes it easier then I also have no
issue doing that.
>> How does Imagination Tech call this proprietary piece?
>>
> They just refer to the whole bag of software as the DDK. No specific terminology for the components. Even if there was it, wouldn't apply here, unfortunately, as this is specifically our packaged version. But no, they don't even give us a hint to create a naming convention here.
In the DDK they just call the UM side without a postfix, and the KM
side with "_km". So maybe "driver" and "driver_km", but as you say
it doesn't much matter here.
Andrew
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [meta-ti][master/kirkstone][PATCH 5/5] meta-ti-bsp: graphics: Correct dependency chain
2023-04-10 14:16 ` Andrew Davis
@ 2023-04-11 20:03 ` Denys Dmytriyenko
0 siblings, 0 replies; 13+ messages in thread
From: Denys Dmytriyenko @ 2023-04-11 20:03 UTC (permalink / raw)
To: afd; +Cc: Randolph Sapp, Denys Dmytriyenko, Ryan Eatmon, meta-ti
On Mon, Apr 10, 2023 at 09:16:27AM -0500, Andrew Davis via lists.yoctoproject.org wrote:
> On 4/6/23 4:30 PM, Randolph Sapp wrote:
> >On 4/6/23 16:25, Denys Dmytriyenko wrote:
> >>On Thu, Apr 06, 2023 at 03:58:41PM -0500, Andrew Davis via lists.yoctoproject.org wrote:
> >>>On 4/6/23 2:46 PM, Denys Dmytriyenko wrote:
> >>>>On Thu, Apr 06, 2023 at 02:28:47PM -0500, Andrew Davis via lists.yoctoproject.org wrote:
> >>>>>Previously the virtual/gpudriver provider would point to the kernel-mode
> >>>>>driver, which would cause Mesa libraries to depend on those and not the
> >>>>>user-mode driver. It is the user-mode driver that should depend on the
> >>>>>kernel-mode driver, not the other way around. The logical dependency
> >>>>>chain should be:
> >>>>
> >>>>No, umlibs already has lots of virtual providers to choose from - virtual/egl,
> >>>>virtual/gles and even virtual/mesa. And virtual/gpudriver was specifically
> >>>>added to point to a kernel-mode driver - rogue-driver or sgx-km.
> >>>>
> >>>
> >>>But none of these virtual providers actually point to the umlibs anymore,
> >>>those all point to Mesa.
> >>
> >>Ah, right...
> >>
> >>
> >>>>So, flipping the dependency chain is probably the correct change, but changing
> >>>>what virtual/gpudriver means seems wrong.
> >>>>
> >>>
> >>>Not sure what the issue is with changing what this virtual provider means.
> >>>It is our creation that no one else uses, it exists today only as a flag to
> >>>tell our Mesa bbappend which backend to choose.
> >>
> >>It seems confusing - the kernel-mode for Rogue has the word "driver" in it.
> >>If it's not being used anywhere else any longer, and it should point to
> >>user-mode part now, why not also rename it to, let's say, virtual/gpulibs?
> >>
>
> For GPU drivers, they are always two part drivers, so both mode drivers are
> "drivers". In SGX we use "UM/KM" instead of "umlib/driver", we could always
> rename the Rogue recipes if it's more clear.
Heh, and both ti-sgx-ddk-km and ti-img-rogue-driver recipes reside in the
powervr-drivers directory... :) I know we've discussed already that it's
no longer correct to call all these GPUs as PowerVR, but that's historic
and isn't absolutely wrong. We have other references to "pvr" in other
places, like Mesa now...
> Since both are parts of the
> "gpudriver" I still don't see an issue with pointing to either with that
> label.
>
> If a rename like "virtual/umlibs" makes it easier then I also have no
> issue doing that.
I'd hate changing the behavior of an existing old variable, even if it's
not that widely used in meta-ti - we don't know if there are any downstream
layers using it, so don't want to break that.
So, the safest approach would be to leave KM recipes still providing this
virtual/gpudriver, but add a new virtual provider for UM recipes to be
used a dependency for Mesa. Whether it's "umlibs" or something else - I
don't have strong preferences. Ryan?
> >>How does Imagination Tech call this proprietary piece?
> >>
> >They just refer to the whole bag of software as the DDK. No specific terminology for the components. Even if there was it, wouldn't apply here, unfortunately, as this is specifically our packaged version. But no, they don't even give us a hint to create a naming convention here.
>
> In the DDK they just call the UM side without a postfix, and the KM
> side with "_km". So maybe "driver" and "driver_km", but as you say
> it doesn't much matter here.
>
> Andrew
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2023-04-11 20:04 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-04-06 19:28 [meta-ti][master/kirkstone][PATCH 1/5] ti-sgx-ddk-um: Remove RDEPENDS on libdrm-omap Andrew Davis
2023-04-06 19:28 ` [meta-ti][master/kirkstone][PATCH 2/5] ti-sgx-ddk-um: Remove no longer needed CLEANBROKEN and INSANE_SKIPs Andrew Davis
2023-04-06 19:28 ` [meta-ti][master/kirkstone][PATCH 3/5] ti-sgx-ddk-km: Be specific on supported K3 machines Andrew Davis
2023-04-06 19:28 ` [meta-ti][master/kirkstone][PATCH 4/5] ti-sgx-ddk-km: Use PVR_BUILD and PVR_WS to match Rogue Andrew Davis
2023-04-06 19:28 ` [meta-ti][master/kirkstone][PATCH 5/5] meta-ti-bsp: graphics: Correct dependency chain Andrew Davis
2023-04-06 19:46 ` Denys Dmytriyenko
2023-04-06 20:58 ` Andrew Davis
2023-04-06 21:25 ` Denys Dmytriyenko
2023-04-06 21:30 ` [EXTERNAL] " Randolph Sapp
2023-04-10 14:16 ` Andrew Davis
2023-04-11 20:03 ` Denys Dmytriyenko
2023-04-06 20:28 ` Randolph Sapp
2023-04-06 20:47 ` Andrew Davis
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.