Enable vulkan proper
v2 cover Enable vulkan proper
From: Randolph Sapp <[email protected]>
Properly enable Vulkan with all WSI extensions enabled. Attempt some light packaging changes to the graphics umlibs recipe so we can decrease the number of check we have to skip, and the checks become a little more targeted.
This version uses a cairo append that conditionally tweaks PACKAGECONFIG flags based on the GPU driver that is selected. We're using this driver flag instead of a machine feature because the open source driver will add a whole new set of preferred configs that will be optimized later.
Randolph Sapp (4):
ti-img-rogue-umlibs: bump srcrev, add vulkan, update deps
pvr-mesa: add new vulkan configuration options and wsi
cairo: resolve opengl version
ti-img-rogue-umlibs: package firmware separately
.../recipes-graphics/cairo/cairo_%.bbappend | 1 + .../recipes-graphics/cairo/pvr-cairo.inc | 5 +++ .../ti-img-rogue-umlibs_23.1.6404501.bb | 33 +++++++++++++++---- .../recipes-graphics/mesa/pvr-mesa.inc | 6 +++- 4 files changed, 37 insertions(+), 8 deletions(-) create mode 100644 meta-ti-bsp/recipes-graphics/cairo/cairo_%.bbappend create mode 100644 meta-ti-bsp/recipes-graphics/cairo/pvr-cairo.inc
Signature · 1 line
2.40.0
PATCH v2 1/4 ti-img-rogue-umlibs: bump srcrev, add vulkan, update deps
From: Randolph Sapp <[email protected]>
Update the source revision for the following upstream changes:
- Drop the included ICD loader. Use the Mesa/Khronos one instead.
- Enable all vulkan window system extensions
Separate the vulkan libs into their own package so people can choose to ignore them if they want, considering the new runtime deps.
--- .../ti-img-rogue-umlibs_23.1.6404501.bb | 27 ++++++++++++++----- 1 file changed, 21 insertions(+), 6 deletions(-)
meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_23.1.6404501.bb +21 -6
@@ -12,7 +12,7 @@ PR = "r2" BRANCH = "linuxws/kirkstone/k6.1/${PV}" SRC_URI = "git://git.ti.com/git/graphics/ti-img-rogue-umlibs.git;protocol=https;branch=${BRANCH}" -SRCREV = "49958a8e820a321d22ac3c635bd21d4a3118c006" +SRCREV = "452b0f50d2984171c81d5a0d3b22198177d919ad" S = "${WORKDIR}/git/targetfs/${TARGET_PRODUCT}/${PVR_WS}/${PVR_BUILD}" TARGET_PRODUCT:j721e = "j721e_linux"
@@ -30,14 +30,29 @@ do_install:append() { rmdir ${D}/lib fi rm -rf "${D}/etc/init.d" - rm -rf "${D}/usr/lib/libvulkan.so" - rm -rf "${D}/usr/lib/libvulkan.so.0" - rm -rf "${D}/usr/lib/libvulkan.so.1" } -PACKAGES = "${PN}-tools ${PN}" +PACKAGES = "${PN}-vulkan ${PN}-tools ${PN}" + +FILES:${PN}-vulkan = " \ + ${datadir}/vulkan \ + ${libdir}/libVK_IMG.so* \ +" +RDEPENDS:${PN}-vulkan += " \ + mesa-vulkan-drivers \ + libdrm \ + ti-img-rogue-driver \ + libx11-xcb \ + wayland \ +" +INSANE_SKIP:${PN}-vulkan += " \ + already-stripped \ + dev-so \ +" + FILES:${PN}-tools = "${bindir}/" RDEPENDS:${PN}-tools = "python3-core" -RRECOMMENDS:${PN} += "${PN}-tools" + +RRECOMMENDS:${PN} += "${PN}-vulkan ${PN}-tools" INSANE_SKIP:${PN} += "ldflags arch already-stripped dev-so"
Signature · 1 line
2.40.0
PATCH v2 2/4 pvr-mesa: add new vulkan configuration options and wsi
In reply to [email protected]From: Randolph Sapp <[email protected]>
Add the required vulkan configuration options and the new PVR WSI file to the corresponding package.
Also bump the PV to match the version of Mesa actually being shipped.
--- meta-ti-bsp/recipes-graphics/mesa/pvr-mesa.inc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
meta-ti-bsp/recipes-graphics/mesa/pvr-mesa.inc +5 -1
@@ -38,14 +38,18 @@ PACKAGECONFIG:remove = "xvmc" PACKAGECONFIG[xvmc] = "" PACKAGE_ARCH = "${MACHINE_ARCH}" -PV = "22.0.3+pvr" +PV = "22.3.5+pvr" GALLIUMDRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'pvr', ',pvr', '', d)}" GALLIUMDRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'sgx', ',sgx', '', d)}" +VULKAN_DRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'pvr', ',pvr', '', d)}" + do_install:append () { # remove pvr custom pkgconfig rm -rf ${D}${datadir}/pkgconfig } +FILES:mesa-vulkan-drivers += " ${libdir}/libpvr_mesa_wsi.so" + RRECOMMENDS:mesa-megadriver:append:class-target = " ${@d.getVar('PREFERRED_PROVIDER_virtual/gpudriver')}"
Signature · 1 line
2.40.0
PATCH v2 3/4 cairo: resolve opengl version
In reply to [email protected]From: Randolph Sapp <[email protected]>
Cairo can either be built for use with OpenGL or OpenGLES. By default it assumes it can use OpenGL if X11 is provided as a distro feature. This assumption is not true when using the proprietary SGX / Rogue drivers.
Vulkan libraries need some X libs at runtime now, so we need to manually override the PACKAGECONFIG for cairo to use OpenGLES.
--- meta-ti-bsp/recipes-graphics/cairo/cairo_%.bbappend | 1 + meta-ti-bsp/recipes-graphics/cairo/pvr-cairo.inc | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 meta-ti-bsp/recipes-graphics/cairo/cairo_%.bbappend create mode 100644 meta-ti-bsp/recipes-graphics/cairo/pvr-cairo.inc
meta-ti-bsp/recipes-graphics/cairo/cairo_%.bbappend new file +1 -0
@@ -0,0 +1 @@ +require ${@bb.utils.contains_any('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-img-rogue-driver ti-sgx-ddk-km', 'pvr-cairo.inc', '', d)}
meta-ti-bsp/recipes-graphics/cairo/pvr-cairo.inc new file +5 -0
@@ -0,0 +1,5 @@ +# This is required since cairo expects the opengl distro feature to refer to +# the desktop version of OpenGL. Imagination drivers only provide OpenGLES. + +PACKAGECONFIG:remove = "opengl" +PACKAGECONFIG:append = " glesv2"
Signature · 1 line
2.40.0
PATCH v2 4/4 ti-img-rogue-umlibs: package firmware separately
In reply to [email protected]From: Randolph Sapp <[email protected]>
Split the firmware into it's own package so we can make the insane checks a little more paranoid again.
--- .../libgles/ti-img-rogue-umlibs_23.1.6404501.bb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_23.1.6404501.bb +6 -2
@@ -32,7 +32,7 @@ do_install:append() { rm -rf "${D}/etc/init.d" } -PACKAGES = "${PN}-vulkan ${PN}-tools ${PN}" +PACKAGES = "${PN}-vulkan ${PN}-tools ${PN}-firmware ${PN}" FILES:${PN}-vulkan = " \ ${datadir}/vulkan \
@@ -53,6 +53,10 @@ INSANE_SKIP:${PN}-vulkan += " \ FILES:${PN}-tools = "${bindir}/" RDEPENDS:${PN}-tools = "python3-core" +FILES:${PN}-firmware = "${base_libdir}/firmware/*" +INSANE_SKIP:${PN}-firmware += "arch" + RRECOMMENDS:${PN} += "${PN}-vulkan ${PN}-tools" +RDEPENDS:${PN} += " ${PN}-firmware" -INSANE_SKIP:${PN} += "ldflags arch already-stripped dev-so" +INSANE_SKIP:${PN} += "already-stripped dev-so"
Signature · 1 line
2.40.0
Quoted 11 lines · On Thu, Apr 27, 2023 at 04:07:42PM -0500, [email protected] wrote:
From: Randolph Sapp <[email protected]>
Properly enable Vulkan with all WSI extensions enabled. Attempt some light packaging changes to the graphics umlibs recipe so we can decrease the number of check we have to skip, and the checks become a little more targeted.
This version uses a cairo append that conditionally tweaks PACKAGECONFIG flags based on the GPU driver that is selected. We're using this driver flag instead of a machine feature because the open source driver will add a whole new set of preferred configs that will be optimized later.
LGTM. Is it kirkstone-specific? Any plans for master?
Quoted 13 lines
Randolph Sapp (4):
ti-img-rogue-umlibs: bump srcrev, add vulkan, update deps
pvr-mesa: add new vulkan configuration options and wsi
cairo: resolve opengl version
ti-img-rogue-umlibs: package firmware separately.../recipes-graphics/cairo/cairo_%.bbappend | 1 + .../recipes-graphics/cairo/pvr-cairo.inc | 5 +++ .../ti-img-rogue-umlibs_23.1.6404501.bb | 33 +++++++++++++++---- .../recipes-graphics/mesa/pvr-mesa.inc | 6 +++- 4 files changed, 37 insertions(+), 8 deletions(-) create mode 100644 meta-ti-bsp/recipes-graphics/cairo/cairo_%.bbappend create mode 100644 meta-ti-bsp/recipes-graphics/cairo/pvr-cairo.inc
Quoted 8 lines · Denys Dmytriyenko
Quoted 7 lines · On Thu, Apr 27, 2023 at 04:07:42PM -0500, [email protected] wrote:
From: Randolph Sapp <[email protected]>
Properly enable Vulkan with all WSI extensions enabled. Attempt some light packaging changes to the graphics umlibs recipe so we can decrease the number of check we have to skip, and the checks become a little more targeted.
Quoted 6 lines
Quoted 4 lines
This version uses a cairo append that conditionally tweaks PACKAGECONFIG flags based on the GPU driver that is selected. We're using this driver flag instead of a machine feature because the open source driver will add a whole new set of preferred configs that will be optimized later.
LGTM. Is it kirkstone-specific? Any plans for master?
Yeah, unfortunately this is kirkstone specific for now. Master version soon. Just wanted to get this and the meta-arago patches sorted and merged first.
Quoted 14 lines
Quoted 14 lines
Randolph Sapp (4):
ti-img-rogue-umlibs: bump srcrev, add vulkan, update deps
pvr-mesa: add new vulkan configuration options and wsi
cairo: resolve opengl version
ti-img-rogue-umlibs: package firmware separately.../recipes-graphics/cairo/cairo_%.bbappend | 1 + .../recipes-graphics/cairo/pvr-cairo.inc | 5 +++ .../ti-img-rogue-umlibs_23.1.6404501.bb | 33 +++++++++++++++---- .../recipes-graphics/mesa/pvr-mesa.inc | 6 +++- 4 files changed, 37 insertions(+), 8 deletions(-)create mode 100644 meta-ti-bsp/recipes-graphics/cairo/cairo_%.bbappend create mode 100644 meta-ti-bsp/recipes-graphics/cairo/pvr-cairo.inc
Quoted 8 lines · Denys Dmytriyenko
Quoted 7 lines · On Thu, Apr 27, 2023 at 04:07:42PM -0500, [email protected] wrote:
From: Randolph Sapp <[email protected]>
Properly enable Vulkan with all WSI extensions enabled. Attempt some light packaging changes to the graphics umlibs recipe so we can decrease the number of check we have to skip, and the checks become a little more targeted.
Quoted 6 lines
Quoted 4 lines
This version uses a cairo append that conditionally tweaks PACKAGECONFIG flags based on the GPU driver that is selected. We're using this driver flag instead of a machine feature because the open source driver will add a whole new set of preferred configs that will be optimized later.
LGTM. Is it kirkstone-specific? Any plans for master?
Actually, disregard that last response. It'll apply cleanly to master if you also cherry-pick the following patches from kirkstone:c994d48021664d328ced52829542a3b1b86c4e022cc7895ebfea1df4afc2229f9762f129946b0b06b86fb13fb9638635bf957156833bccc10ddf5393
I must have incorrectly assumed those wouldn't apply to master when I submitted them originally. My bad, they apply fine.
Quoted 14 lines
Quoted 14 lines
Randolph Sapp (4):
ti-img-rogue-umlibs: bump srcrev, add vulkan, update deps
pvr-mesa: add new vulkan configuration options and wsi
cairo: resolve opengl version
ti-img-rogue-umlibs: package firmware separately.../recipes-graphics/cairo/cairo_%.bbappend | 1 + .../recipes-graphics/cairo/pvr-cairo.inc | 5 +++ .../ti-img-rogue-umlibs_23.1.6404501.bb | 33 +++++++++++++++---- .../recipes-graphics/mesa/pvr-mesa.inc | 6 +++- 4 files changed, 37 insertions(+), 8 deletions(-)create mode 100644 meta-ti-bsp/recipes-graphics/cairo/cairo_%.bbappend create mode 100644 meta-ti-bsp/recipes-graphics/cairo/pvr-cairo.inc
Quoted 14 lines · Randolph Sapp via lists.yoctoproject.org
Quoted 13 lines · Denys Dmytriyenko
Quoted 11 lines · On Thu, Apr 27, 2023 at 04:07:42PM -0500, [email protected] wrote:
From: Randolph Sapp <[email protected]>
Properly enable Vulkan with all WSI extensions enabled. Attempt some light packaging changes to the graphics umlibs recipe so we can decrease the number of check we have to skip, and the checks become a little more targeted.
This version uses a cairo append that conditionally tweaks PACKAGECONFIG flags based on the GPU driver that is selected. We're using this driver flag instead of a machine feature because the open source driver will add a whole new set of preferred configs that will be optimized later.
Quoted 7 lines
Quoted 1 line
LGTM. Is it kirkstone-specific? Any plans for master?
Actually, disregard that last response. It'll apply cleanly to master if you also cherry-pick the following patches from kirkstone:
c994d48021664d328ced52829542a3b1b86c4e022cc7895ebfea1df4afc2229f9762f129946b0b06b86fb13fb9638635bf957156833bccc10ddf5393
Can you please be more specific - none of these 3 commits exist in meta-ti nor meta-arago...
Quoted 17 lines
I must have incorrectly assumed those wouldn't apply to master when I submitted them originally. My bad, they apply fine.
Quoted 14 lines
Quoted 14 lines
Randolph Sapp (4):
ti-img-rogue-umlibs: bump srcrev, add vulkan, update deps
pvr-mesa: add new vulkan configuration options and wsi
cairo: resolve opengl version
ti-img-rogue-umlibs: package firmware separately.../recipes-graphics/cairo/cairo_%.bbappend | 1 + .../recipes-graphics/cairo/pvr-cairo.inc | 5 +++ .../ti-img-rogue-umlibs_23.1.6404501.bb | 33 +++++++++++++++---- .../recipes-graphics/mesa/pvr-mesa.inc | 6 +++- 4 files changed, 37 insertions(+), 8 deletions(-) create mode 100644 meta-ti-bsp/recipes-graphics/cairo/cairo_%.bbappend create mode 100644 meta-ti-bsp/recipes-graphics/cairo/pvr-cairo.inc
Quoted 17 lines · Denys Dmytriyenko
Quoted 16 lines · Randolph Sapp via lists.yoctoproject.org
Quoted 14 lines · Denys Dmytriyenko
Quoted 11 lines · On Thu, Apr 27, 2023 at 04:07:42PM -0500, [email protected] wrote:
From: Randolph Sapp <[email protected]>
Properly enable Vulkan with all WSI extensions enabled. Attempt some light packaging changes to the graphics umlibs recipe so we can decrease the number of check we have to skip, and the checks become a little more targeted.
This version uses a cairo append that conditionally tweaks PACKAGECONFIG flags based on the GPU driver that is selected. We're using this driver flag instead of a machine feature because the open source driver will add a whole new set of preferred configs that will be optimized later.
LGTM. Is it kirkstone-specific? Any plans for master?
Quoted 9 lines
Quoted 5 lines
Actually, disregard that last response. It'll apply cleanly to master if you also cherry-pick the following patches from kirkstone:
c994d48021664d328ced52829542a3b1b86c4e022cc7895ebfea1df4afc2229f9762f129946b0b06b86fb13fb9638635bf957156833bccc10ddf5393Can you please be more specific - none of these 3 commits exist in meta-ti nor meta-arago...
Right, my bad. I meant this patch set: https://lists.yoctoproject.org/g/meta-ti/message/16397
Or these commits from kirkstone:16a8078a43eef297449a04d6861fd9811bfeb052b9581a704648cb3ed70c6bcb28d5a1a89b08534dc8ba8aaade90101f06164aec1b393d7c8b3aa201
I don't know where I got those previous hashes. Must have done something goofy.
Quoted 18 lines
Quoted 18 lines
I must have incorrectly assumed those wouldn't apply to master when I submitted them originally. My bad, they apply fine.
Quoted 14 lines
Quoted 14 lines
Randolph Sapp (4):
ti-img-rogue-umlibs: bump srcrev, add vulkan, update deps
pvr-mesa: add new vulkan configuration options and wsi
cairo: resolve opengl version
ti-img-rogue-umlibs: package firmware separately.../recipes-graphics/cairo/cairo_%.bbappend | 1 + .../recipes-graphics/cairo/pvr-cairo.inc | 5 +++ .../ti-img-rogue-umlibs_23.1.6404501.bb | 33 +++++++++++++++---- .../recipes-graphics/mesa/pvr-mesa.inc | 6 +++- 4 files changed, 37 insertions(+), 8 deletions(-)create mode 100644 meta-ti-bsp/recipes-graphics/cairo/cairo_%.bbappend create mode 100644 meta-ti-bsp/recipes-graphics/cairo/pvr-cairo.inc
Quoted 28 lines · Randolph Sapp
Quoted 17 lines · Denys Dmytriyenko
Quoted 16 lines · Randolph Sapp via lists.yoctoproject.org
Quoted 14 lines · Denys Dmytriyenko
Quoted 11 lines · On Thu, Apr 27, 2023 at 04:07:42PM -0500, [email protected] wrote:
From: Randolph Sapp <[email protected]>
Properly enable Vulkan with all WSI extensions enabled. Attempt some light packaging changes to the graphics umlibs recipe so we can decrease the number of check we have to skip, and the checks become a little more targeted.
This version uses a cairo append that conditionally tweaks PACKAGECONFIG flags based on the GPU driver that is selected. We're using this driver flag instead of a machine feature because the open source driver will add a whole new set of preferred configs that will be optimized later.
LGTM. Is it kirkstone-specific? Any plans for master?
Quoted 9 lines
Quoted 5 lines
Actually, disregard that last response. It'll apply cleanly to master if you also cherry-pick the following patches from kirkstone:
c994d48021664d328ced52829542a3b1b86c4e022cc7895ebfea1df4afc2229f9762f129946b0b06b86fb13fb9638635bf957156833bccc10ddf5393Can you please be more specific - none of these 3 commits exist in meta-ti nor meta-arago...
Quoted 7 lines
Right, my bad. I meant this patch set:
https://lists.yoctoproject.org/g/meta-ti/message/16397Or these commits from kirkstone:
16a8078a43eef297449a04d6861fd9811bfeb052b9581a704648cb3ed70c6bcb28d5a1a89b08534dc8ba8aaade90101f06164aec1b393d7c8b3aa201
Thanks. The original patches for these commits were marked specifically for kirkstone (same as this series) and I guess the assumption was that they won't apply to master and were skipped.
I just cherry-picked them for master and can confirm everything applies and builds cleanly - I just re-sent them to the list just in case. Once they are in, this Vulkan series can also be applied to master.
Quoted 21 lines
I don't know where I got those previous hashes. Must have done something goofy.
Quoted 17 lines
Quoted 17 lines
I must have incorrectly assumed those wouldn't apply to master when I submitted them originally. My bad, they apply fine.
Quoted 13 lines
Quoted 13 lines
Randolph Sapp (4):
ti-img-rogue-umlibs: bump srcrev, add vulkan, update deps
pvr-mesa: add new vulkan configuration options and wsi
cairo: resolve opengl version
ti-img-rogue-umlibs: package firmware separately.../recipes-graphics/cairo/cairo_%.bbappend | 1 + .../recipes-graphics/cairo/pvr-cairo.inc | 5 +++ .../ti-img-rogue-umlibs_23.1.6404501.bb | 33 +++++++++++++++---- .../recipes-graphics/mesa/pvr-mesa.inc | 6 +++- 4 files changed, 37 insertions(+), 8 deletions(-) create mode 100644 meta-ti-bsp/recipes-graphics/cairo/cairo_%.bbappend
Quoted 37 lines · Denys Dmytriyenko
Quoted 28 lines · Randolph Sapp
Quoted 17 lines · Denys Dmytriyenko
Quoted 16 lines · Randolph Sapp via lists.yoctoproject.org
Quoted 14 lines · Denys Dmytriyenko
Quoted 11 lines · On Thu, Apr 27, 2023 at 04:07:42PM -0500, [email protected] wrote:
From: Randolph Sapp <[email protected]>
Properly enable Vulkan with all WSI extensions enabled. Attempt some light packaging changes to the graphics umlibs recipe so we can decrease the number of check we have to skip, and the checks become a little more targeted.
This version uses a cairo append that conditionally tweaks PACKAGECONFIG flags based on the GPU driver that is selected. We're using this driver flag instead of a machine feature because the open source driver will add a whole new set of preferred configs that will be optimized later.
LGTM. Is it kirkstone-specific? Any plans for master?
Quoted 9 lines
Quoted 5 lines
Actually, disregard that last response. It'll apply cleanly to master if you also cherry-pick the following patches from kirkstone:
c994d48021664d328ced52829542a3b1b86c4e022cc7895ebfea1df4afc2229f9762f129946b0b06b86fb13fb9638635bf957156833bccc10ddf5393Can you please be more specific - none of these 3 commits exist in meta-ti nor meta-arago...
Quoted 7 lines
Right, my bad. I meant this patch set:
https://lists.yoctoproject.org/g/meta-ti/message/16397Or these commits from kirkstone:
16a8078a43eef297449a04d6861fd9811bfeb052b9581a704648cb3ed70c6bcb28d5a1a89b08534dc8ba8aaade90101f06164aec1b393d7c8b3aa201
Quoted 8 lines
Thanks. The original patches for these commits were marked specifically for kirkstone (same as this series) and I guess the assumption was that they won't apply to master and were skipped.
I just cherry-picked them for master and can confirm everything applies and builds cleanly - I just re-sent them to the list just in case. Once they are in, this Vulkan series can also be applied to master.
Excellent, thanks Denys!
Quoted 22 lines
Quoted 22 lines
I don't know where I got those previous hashes. Must have done something goofy.
Quoted 17 lines
Quoted 17 lines
I must have incorrectly assumed those wouldn't apply to master when I submitted them originally. My bad, they apply fine.
Quoted 13 lines
Quoted 13 lines
Randolph Sapp (4):
ti-img-rogue-umlibs: bump srcrev, add vulkan, update deps
pvr-mesa: add new vulkan configuration options and wsi
cairo: resolve opengl version
ti-img-rogue-umlibs: package firmware separately.../recipes-graphics/cairo/cairo_%.bbappend | 1 + .../recipes-graphics/cairo/pvr-cairo.inc | 5 +++ .../ti-img-rogue-umlibs_23.1.6404501.bb | 33 +++++++++++++++---- .../recipes-graphics/mesa/pvr-mesa.inc | 6 +++- 4 files changed, 37 insertions(+), 8 deletions(-)create mode 100644 meta-ti-bsp/recipes-graphics/cairo/cairo_%.bbappend