ti-sgx-ddk-um: Remove RDEPENDS on libdrm-omap
PATCH 1/5 ti-sgx-ddk-um: Remove RDEPENDS on libdrm-omap
We no longer use libdrm-omap so remove it.
--- .../recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-ti-bsp/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb +1 -1
@@ -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"
Signature · 1 line
2.39.2
PATCH 2/5 ti-sgx-ddk-um: Remove no longer needed CLEANBROKEN and INSANE_SKIPs
The "clean" target has been fixed along with some other issues that caused us to need these set. Remove them now.
--- .../recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
meta-ti-bsp/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb +2 -4
@@ -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"
Signature · 1 line
2.39.2
PATCH 3/5 ti-sgx-ddk-km: Be specific on supported K3 machines
In reply to Andrew DavisOf the K3 family only the AM65x device is currently supported by this driver. COMPATIBLE_MACHINE should match.
--- .../recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb +2 -2
@@ -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'
Signature · 1 line
2.39.2
PATCH 4/5 ti-sgx-ddk-km: Use PVR_BUILD and PVR_WS to match Rogue
In reply to Andrew DavisUse these to select build type and window system support to match how the Rouge driver does the same. No functional change.
--- .../powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb +6 -4
@@ -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"
Signature · 1 line
2.39.2
PATCH 5/5 meta-ti-bsp: graphics: Correct dependency chain
In reply to Andrew DavisPreviously 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.
--- 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(-)
meta-ti-bsp/conf/machine/include/am62xx.inc +1 -1
@@ -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"
meta-ti-bsp/conf/machine/include/j721e.inc +1 -1
@@ -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"
meta-ti-bsp/conf/machine/include/j721s2.inc +1 -1
@@ -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"
meta-ti-bsp/conf/machine/include/j784s4.inc +1 -1
@@ -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"
meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.18.6276027.bb +0 -2
@@ -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}"
meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb +0 -2
@@ -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"
meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_1.18.6276027.bb +4 -1
@@ -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
meta-ti-bsp/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb +3 -2
@@ -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"
meta-ti-bsp/recipes-graphics/mesa/mesa-gl_22.%.bbappend +1 -1
@@ -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)}
meta-ti-bsp/recipes-graphics/mesa/mesa_22.%.bbappend +1 -1
@@ -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)}
meta-ti-bsp/recipes-graphics/mesa/pvr-mesa.inc +3 -3
@@ -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')}"
Signature · 1 line
2.39.2
Re: [meta-ti][master/kirkstone][PATCH 5/5] meta-ti-bsp: graphics: Correct dependency chain
Quoted 5 lines · Andrew Davis via lists.yoctoproject.org
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.
Quoted 182 lines
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 <[email protected]>--- 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(-)meta-ti-bsp/conf/machine/include/am62xx.inc +1
-1@@ -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"meta-ti-bsp/conf/machine/include/j721e.inc +1
-1@@ -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"meta-ti-bsp/conf/machine/include/j721s2.inc +1
-1@@ -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"meta-ti-bsp/conf/machine/include/j784s4.inc +1
-1@@ -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"meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.18.6276027.bb +0
-2@@ -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}"meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb +0
-2@@ -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"meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_1.18.6276027.bb +4
-1@@ -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)}; thenmeta-ti-bsp/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb +3
-2@@ -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"meta-ti-bsp/recipes-graphics/mesa/mesa-gl_22.%.bbappend +1
-1@@ -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)}meta-ti-bsp/recipes-graphics/mesa/mesa_22.%.bbappend +1
-1@@ -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)}meta-ti-bsp/recipes-graphics/mesa/pvr-mesa.inc +3
-3@@ -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')}"Signature · 1 line
2.39.2
Re: [meta-ti][master/kirkstone][PATCH 5/5] meta-ti-bsp: graphics: Correct dependency chain
Quoted 11 lines · Denys Dmytriyenko
Quoted 5 lines · Andrew Davis via lists.yoctoproject.org
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.
Quoted 3 lines
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
Quoted 183 lines
Quoted 183 lines
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 <[email protected]>--- 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(-)meta-ti-bsp/conf/machine/include/am62xx.inc +1
-1@@ -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"meta-ti-bsp/conf/machine/include/j721e.inc +1
-1@@ -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"meta-ti-bsp/conf/machine/include/j721s2.inc +1
-1@@ -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"meta-ti-bsp/conf/machine/include/j784s4.inc +1
-1@@ -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"meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.18.6276027.bb +0
-2@@ -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}"meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb +0
-2@@ -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"meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_1.18.6276027.bb +4
-1@@ -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)}; thenmeta-ti-bsp/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb +3
-2@@ -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"meta-ti-bsp/recipes-graphics/mesa/mesa-gl_22.%.bbappend +1
-1@@ -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)}meta-ti-bsp/recipes-graphics/mesa/mesa_22.%.bbappend +1
-1@@ -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)}meta-ti-bsp/recipes-graphics/mesa/pvr-mesa.inc +3
-3@@ -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')}"Signature · 1 line
2.39.2
Re: [meta-ti][master/kirkstone][PATCH 5/5] meta-ti-bsp: graphics: Correct dependency chain
Quoted 8 lines · Andrew Davis via lists.yoctoproject.org
Quoted 7 lines · Denys Dmytriyenko
Quoted 5 lines · Andrew Davis via lists.yoctoproject.org
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:
Quoted 7 lines
Quoted 4 lines
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...
Quoted 7 lines
Quoted 3 lines
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?
Signature · 1 line
Denys
Quoted 151 lines
Quoted 151 lines
Quoted 151 lines
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 <[email protected]>--- 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(-)meta-ti-bsp/conf/machine/include/am62xx.inc +1
-1@@ -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"meta-ti-bsp/conf/machine/include/j721e.inc +1
-1@@ -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"meta-ti-bsp/conf/machine/include/j721s2.inc +1
-1@@ -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"meta-ti-bsp/conf/machine/include/j784s4.inc +1
-1@@ -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"meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.18.6276027.bb +0
-2@@ -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}"meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb +0
-2@@ -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"meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_1.18.6276027.bb +4
-1@@ -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)}; thenmeta-ti-bsp/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb +3
-2@@ -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"meta-ti-bsp/recipes-graphics/mesa/mesa-gl_22.%.bbappend +1
-1@@ -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)}meta-ti-bsp/recipes-graphics/mesa/mesa_22.%.bbappend +1
-1@@ -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)}meta-ti-bsp/recipes-graphics/mesa/pvr-mesa.inc +3
-3@@ -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')}"Signature · 1 line
2.39.2
Re: [EXTERNAL] Re: [meta-ti][master/kirkstone][PATCH 5/5] meta-ti-bsp: graphics: Correct dependency chain
Quoted 28 lines · Denys Dmytriyenko
Quoted 8 lines · Andrew Davis via lists.yoctoproject.org
Quoted 7 lines · Denys Dmytriyenko
Quoted 5 lines · Andrew Davis via lists.yoctoproject.org
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:
Quoted 7 lines
Quoted 4 lines
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...
Quoted 7 lines
Quoted 3 lines
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.
Quoted 6 lines
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.
Re: [EXTERNAL] Re: [meta-ti][master/kirkstone][PATCH 5/5] meta-ti-bsp: graphics: Correct dependency chain
Quoted 25 lines · Randolph Sapp
Quoted 24 lines · Denys Dmytriyenko
Quoted 8 lines · Andrew Davis via lists.yoctoproject.org
Quoted 7 lines · Denys Dmytriyenko
Quoted 5 lines · Andrew Davis via lists.yoctoproject.org
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:
Quoted 7 lines
Quoted 4 lines
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...
Quoted 4 lines
Quoted 3 lines
So, flipping the dependency chain is probably the correct change, but changing what virtual/gpudriver means seems wrong.
Quoted 8 lines
Quoted 8 lines
Quoted 3 lines
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.
Quoted 3 lines
Quoted 2 lines
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
Re: [meta-ti][master/kirkstone][PATCH 5/5] meta-ti-bsp: graphics: Correct dependency chain
Quoted 30 lines · Andrew Davis via lists.yoctoproject.org
Quoted 29 lines · Randolph Sapp
Quoted 28 lines · Denys Dmytriyenko
Quoted 8 lines · Andrew Davis via lists.yoctoproject.org
Quoted 7 lines · Denys Dmytriyenko
Quoted 5 lines · Andrew Davis via lists.yoctoproject.org
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:
Quoted 7 lines
Quoted 4 lines
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...
Quoted 7 lines
Quoted 3 lines
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.
Quoted 8 lines
Quoted 4 lines
Quoted 4 lines
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...
Quoted 6 lines
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?
Quoted 9 lines
Quoted 3 lines
Quoted 2 lines
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
Re: [meta-ti][master/kirkstone][PATCH 5/5] meta-ti-bsp: graphics: Correct dependency chain
In reply to Andrew DavisQuoted 7 lines · 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
We already talked about this so I'm fine with it.
Quoted 6 lines
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 <[email protected]>
...
meta-ti-bsp/recipes-graphics/mesa/pvr-mesa.inc do_install:append () { · line 48
Quoted 2 lines
meta-ti-bsp/recipes-graphics/mesa/pvr-mesa.inc +1
-1-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.
Re: [meta-ti][master/kirkstone][PATCH 5/5] meta-ti-bsp: graphics: Correct dependency chain
Quoted 16 lines · Randolph Sapp
Quoted 7 lines · 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
We already talked about this so I'm fine with it.
Quoted 5 lines
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.
Quoted 8 lines
Quoted 1 line
Signed-off-by Andrew Davis <[email protected]>...
meta-ti-bsp/recipes-graphics/mesa/pvr-mesa.inc do_install:append () { · line 48
Quoted 2 lines
meta-ti-bsp/recipes-graphics/mesa/pvr-mesa.inc +1
-1-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