From patchwork Sat May 6 02:37:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 23478 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id D8CA2C7EE26 for ; Sat, 6 May 2023 02:37:52 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web11.15232.1683340664557240679 for ; Fri, 05 May 2023 19:37:44 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id A648440A3D for ; Sat, 6 May 2023 02:37:43 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ukW2mfE3dA6x for ; Sat, 6 May 2023 02:37:43 +0000 (UTC) Received: from mail.denix.org (pool-100-15-88-116.washdc.fios.verizon.net [100.15.88.116]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 936F240C61 for ; Sat, 6 May 2023 02:37:43 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 388D11638C9 for ; Fri, 5 May 2023 22:37:01 -0400 (EDT) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Subject: [master][PATCH 1/4] ti-img-rogue-umlibs: bump srcrev, add vulkan, update deps Date: Sat, 6 May 2023 02:37:40 +0000 Message-Id: <20230506023743.1259692-2-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230506023743.1259692-1-denis@denix.org> References: <20230506023743.1259692-1-denis@denix.org> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 06 May 2023 02:37:52 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/16494 From: Randolph Sapp 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. Signed-off-by: Randolph Sapp Signed-off-by: Ryan Eatmon Signed-off-by: Denys Dmytriyenko --- .../ti-img-rogue-umlibs_23.1.6404501.bb | 27 ++++++++++++++----- 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_23.1.6404501.bb b/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_23.1.6404501.bb index 3ad0cce6..9068d341 100644 --- a/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_23.1.6404501.bb +++ b/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_23.1.6404501.bb @@ -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" From patchwork Sat May 6 02:37:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 23477 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id CDC31C77B7D for ; Sat, 6 May 2023 02:37:52 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web10.15224.1683340664392864909 for ; Fri, 05 May 2023 19:37:44 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id AA8AB40C61 for ; Sat, 6 May 2023 02:37:43 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id UI-syuzTsa9s for ; Sat, 6 May 2023 02:37:43 +0000 (UTC) Received: from mail.denix.org (pool-100-15-88-116.washdc.fios.verizon.net [100.15.88.116]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 97A6F40C76 for ; Sat, 6 May 2023 02:37:43 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 438A41638CB for ; Fri, 5 May 2023 22:37:01 -0400 (EDT) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Subject: [master][PATCH 2/4] pvr-mesa: add new vulkan configuration options and wsi Date: Sat, 6 May 2023 02:37:41 +0000 Message-Id: <20230506023743.1259692-3-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230506023743.1259692-1-denis@denix.org> References: <20230506023743.1259692-1-denis@denix.org> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 06 May 2023 02:37:52 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/16492 From: Randolph Sapp 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. Signed-off-by: Randolph Sapp Signed-off-by: Ryan Eatmon Signed-off-by: Denys Dmytriyenko --- meta-ti-bsp/recipes-graphics/mesa/pvr-mesa.inc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta-ti-bsp/recipes-graphics/mesa/pvr-mesa.inc b/meta-ti-bsp/recipes-graphics/mesa/pvr-mesa.inc index d938f41c..caf94156 100644 --- a/meta-ti-bsp/recipes-graphics/mesa/pvr-mesa.inc +++ b/meta-ti-bsp/recipes-graphics/mesa/pvr-mesa.inc @@ -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')}" From patchwork Sat May 6 02:37:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 23475 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id CB6ABC7EE24 for ; Sat, 6 May 2023 02:37:52 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web11.15234.1683340666380683852 for ; Fri, 05 May 2023 19:37:46 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id B805F40C76 for ; Sat, 6 May 2023 02:37:45 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kzDEuiEoEvOa for ; Sat, 6 May 2023 02:37:45 +0000 (UTC) Received: from mail.denix.org (pool-100-15-88-116.washdc.fios.verizon.net [100.15.88.116]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 995E340C88 for ; Sat, 6 May 2023 02:37:43 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 45AD11638CC for ; Fri, 5 May 2023 22:37:01 -0400 (EDT) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Subject: [master][PATCH 3/4] cairo: resolve opengl version Date: Sat, 6 May 2023 02:37:42 +0000 Message-Id: <20230506023743.1259692-4-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230506023743.1259692-1-denis@denix.org> References: <20230506023743.1259692-1-denis@denix.org> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 06 May 2023 02:37:52 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/16496 From: Randolph Sapp 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. Signed-off-by: Randolph Sapp Signed-off-by: Ryan Eatmon Signed-off-by: Denys Dmytriyenko --- 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 diff --git a/meta-ti-bsp/recipes-graphics/cairo/cairo_%.bbappend b/meta-ti-bsp/recipes-graphics/cairo/cairo_%.bbappend new file mode 100644 index 00000000..459d8d09 --- /dev/null +++ b/meta-ti-bsp/recipes-graphics/cairo/cairo_%.bbappend @@ -0,0 +1 @@ +require ${@bb.utils.contains_any('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-img-rogue-driver ti-sgx-ddk-km', 'pvr-cairo.inc', '', d)} diff --git a/meta-ti-bsp/recipes-graphics/cairo/pvr-cairo.inc b/meta-ti-bsp/recipes-graphics/cairo/pvr-cairo.inc new file mode 100644 index 00000000..b41f1a01 --- /dev/null +++ b/meta-ti-bsp/recipes-graphics/cairo/pvr-cairo.inc @@ -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" From patchwork Sat May 6 02:37:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 23476 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id CA140C77B7C for ; Sat, 6 May 2023 02:37:52 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web11.15233.1683340666370550803 for ; Fri, 05 May 2023 19:37:46 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id B621040A3D for ; Sat, 6 May 2023 02:37:45 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 3DAC7xFqgFSz for ; Sat, 6 May 2023 02:37:45 +0000 (UTC) Received: from mail.denix.org (pool-100-15-88-116.washdc.fios.verizon.net [100.15.88.116]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 9C2A540CA2 for ; Sat, 6 May 2023 02:37:43 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 477791638D0 for ; Fri, 5 May 2023 22:37:01 -0400 (EDT) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Subject: [master][PATCH 4/4] ti-img-rogue-umlibs: package firmware separately Date: Sat, 6 May 2023 02:37:43 +0000 Message-Id: <20230506023743.1259692-5-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230506023743.1259692-1-denis@denix.org> References: <20230506023743.1259692-1-denis@denix.org> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 06 May 2023 02:37:52 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/16495 From: Randolph Sapp Split the firmware into it's own package so we can make the insane checks a little more paranoid again. Signed-off-by: Randolph Sapp Signed-off-by: Ryan Eatmon Signed-off-by: Denys Dmytriyenko --- .../libgles/ti-img-rogue-umlibs_23.1.6404501.bb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_23.1.6404501.bb b/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_23.1.6404501.bb index 9068d341..c33f8ae0 100644 --- a/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_23.1.6404501.bb +++ b/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_23.1.6404501.bb @@ -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"