| Message ID | 20240502002621.3456112-1-denis@denix.org |
|---|---|
| State | Not Applicable |
| Delegated to: | Ryan Eatmon |
| Headers | show |
| Series | [master/scarthgap,1/3] ti-img-rogue-*: add ddk 24.1 recipes for ltsprep | expand |
On Wed, May 01, 2024 at 08:26:21PM -0400, Denys Dmytriyenko wrote: > From: Randolph Sapp <rs@ti.com> > > Add a recipe for mesa-pvr to use a newer branch based on mesa 23.2.1. > This branch does not currently contain SGX patches so it is also being > masked by the ltsprep branding to prevent regressing those devices > currently. > > Please note that because this recipe is currently in > SIGGEN_EXCLUDERECIPES_ABISAFE you may run into sstate errors when > switching away from the ltsprep tag. Please issue a clean to mesa and > ti-img-rogue-umlibs if you get warnings from either package's > do_create_runtime_spdx step. > > Signed-off-by: Randolph Sapp <rs@ti.com> > Signed-off-by: Denys Dmytriyenko <denys@konsulko.com> > --- > .../mesa/{mesa-pvr_22.3.5.bb => mesa-pvr_23.2.1.bb} | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > copy meta-ti-bsp/recipes-graphics/mesa/{mesa-pvr_22.3.5.bb => mesa-pvr_23.2.1.bb} (83%) > > diff --git a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_22.3.5.bb b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_23.2.1.bb > similarity index 83% > copy from meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_22.3.5.bb > copy to meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_23.2.1.bb > index 5abd0793..c83ba87d 100644 > --- a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_22.3.5.bb > +++ b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_23.2.1.bb > @@ -2,23 +2,23 @@ > # upstream yet. This allows us to build the shims we need without completely > # clobbering mesa. > > +DEFAULT_PREFERENCE = "-1" > +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}_${PV}:" This is wrong - ${PN}-${PV} is one of the default locations for patches, not ${PN}_${PV}. > + > require recipes-graphics/mesa/mesa.inc > > SUMMARY += " (with PowerVR support for TI platforms)" > > LIC_FILES_CHKSUM = "file://docs/license.rst;md5=63779ec98d78d823a9dc533a0735ef10" > > -BRANCH = "powervr/kirkstone/${PV}" > +BRANCH = "powervr/${PV}" > > SRC_URI = " \ > git://gitlab.freedesktop.org/StaticRocket/mesa.git;protocol=https;branch=${BRANCH} \ > file://0001-meson.build-check-for-all-linux-host_os-combinations.patch \ > file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ > - file://0001-util-format-Check-for-NEON-before-using-it.patch \ > - file://0001-gbm-backend-fix-gbm-compile-without-dri.patch \ > - file://0001-freedreno-pm4-Use-unsigned-instead-of-uint-to-fix-mu.patch \ > file://0001-gallium-Fix-build-with-llvm-17.patch \ > - file://0001-fix-gallivm-limit-usage-of-LLVMContextSetOpaquePoint.patch \ > + file://0001-meson-Disable-cmake-dependency-detector-for-llvm.patch \ > " > > S = "${WORKDIR}/git" > @@ -28,7 +28,7 @@ PACKAGECONFIG:append = " \ > ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-sgx-ddk-km', 'sgx', '', d)} \ > " > > -SRCREV = "1be98ba80452ebe38546a7fca26b5a70f2629083" > +SRCREV = "b12290126ba6a154f0e8b0a8c8b2b0d64f98e427" > > PVR_DISPLAY_CONTROLLER_ALIAS ??= "tidss" > PACKAGECONFIG[pvr] = "-Dgallium-pvr-alias=${PVR_DISPLAY_CONTROLLER_ALIAS}," > -- > 2.25.1
On Wed May 1, 2024 at 10:06 PM CDT, Denys Dmytriyenko wrote: > On Wed, May 01, 2024 at 08:26:21PM -0400, Denys Dmytriyenko wrote: > > From: Randolph Sapp <rs@ti.com> > > > > Add a recipe for mesa-pvr to use a newer branch based on mesa 23.2.1. > > This branch does not currently contain SGX patches so it is also being > > masked by the ltsprep branding to prevent regressing those devices > > currently. > > > > Please note that because this recipe is currently in > > SIGGEN_EXCLUDERECIPES_ABISAFE you may run into sstate errors when > > switching away from the ltsprep tag. Please issue a clean to mesa and > > ti-img-rogue-umlibs if you get warnings from either package's > > do_create_runtime_spdx step. > > > > Signed-off-by: Randolph Sapp <rs@ti.com> > > Signed-off-by: Denys Dmytriyenko <denys@konsulko.com> > > --- > > .../mesa/{mesa-pvr_22.3.5.bb => mesa-pvr_23.2.1.bb} | 12 ++++++------ > > 1 file changed, 6 insertions(+), 6 deletions(-) > > copy meta-ti-bsp/recipes-graphics/mesa/{mesa-pvr_22.3.5.bb => mesa-pvr_23.2.1.bb} (83%) > > > > diff --git a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_22.3.5.bb b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_23.2.1.bb > > similarity index 83% > > copy from meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_22.3.5.bb > > copy to meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_23.2.1.bb > > index 5abd0793..c83ba87d 100644 > > --- a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_22.3.5.bb > > +++ b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_23.2.1.bb > > @@ -2,23 +2,23 @@ > > # upstream yet. This allows us to build the shims we need without completely > > # clobbering mesa. > > > > +DEFAULT_PREFERENCE = "-1" > > +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}_${PV}:" > > This is wrong - ${PN}-${PV} is one of the default locations for patches, > not ${PN}_${PV}. > Huh. Checking oe-core/meta/classes-global/base.bbclass and the documentation it doesn't look like it but dumping the variables at runtime, you seem to be right... Wonder what's appending that. I'll spin up a new revision. > > + > > require recipes-graphics/mesa/mesa.inc > > > > SUMMARY += " (with PowerVR support for TI platforms)" > > > > LIC_FILES_CHKSUM = "file://docs/license.rst;md5=63779ec98d78d823a9dc533a0735ef10" > > > > -BRANCH = "powervr/kirkstone/${PV}" > > +BRANCH = "powervr/${PV}" > > > > SRC_URI = " \ > > git://gitlab.freedesktop.org/StaticRocket/mesa.git;protocol=https;branch=${BRANCH} \ > > file://0001-meson.build-check-for-all-linux-host_os-combinations.patch \ > > file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ > > - file://0001-util-format-Check-for-NEON-before-using-it.patch \ > > - file://0001-gbm-backend-fix-gbm-compile-without-dri.patch \ > > - file://0001-freedreno-pm4-Use-unsigned-instead-of-uint-to-fix-mu.patch \ > > file://0001-gallium-Fix-build-with-llvm-17.patch \ > > - file://0001-fix-gallivm-limit-usage-of-LLVMContextSetOpaquePoint.patch \ > > + file://0001-meson-Disable-cmake-dependency-detector-for-llvm.patch \ > > " > > > > S = "${WORKDIR}/git" > > @@ -28,7 +28,7 @@ PACKAGECONFIG:append = " \ > > ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-sgx-ddk-km', 'sgx', '', d)} \ > > " > > > > -SRCREV = "1be98ba80452ebe38546a7fca26b5a70f2629083" > > +SRCREV = "b12290126ba6a154f0e8b0a8c8b2b0d64f98e427" > > > > PVR_DISPLAY_CONTROLLER_ALIAS ??= "tidss" > > PACKAGECONFIG[pvr] = "-Dgallium-pvr-alias=${PVR_DISPLAY_CONTROLLER_ALIAS}," > > -- > > 2.25.1
On Thu, May 02, 2024 at 12:49:13PM -0500, Randolph Sapp wrote: > On Wed May 1, 2024 at 10:06 PM CDT, Denys Dmytriyenko wrote: > > On Wed, May 01, 2024 at 08:26:21PM -0400, Denys Dmytriyenko wrote: > > > From: Randolph Sapp <rs@ti.com> > > > > > > Add a recipe for mesa-pvr to use a newer branch based on mesa 23.2.1. > > > This branch does not currently contain SGX patches so it is also being > > > masked by the ltsprep branding to prevent regressing those devices > > > currently. > > > > > > Please note that because this recipe is currently in > > > SIGGEN_EXCLUDERECIPES_ABISAFE you may run into sstate errors when > > > switching away from the ltsprep tag. Please issue a clean to mesa and > > > ti-img-rogue-umlibs if you get warnings from either package's > > > do_create_runtime_spdx step. > > > > > > Signed-off-by: Randolph Sapp <rs@ti.com> > > > Signed-off-by: Denys Dmytriyenko <denys@konsulko.com> > > > --- > > > .../mesa/{mesa-pvr_22.3.5.bb => mesa-pvr_23.2.1.bb} | 12 ++++++------ > > > 1 file changed, 6 insertions(+), 6 deletions(-) > > > copy meta-ti-bsp/recipes-graphics/mesa/{mesa-pvr_22.3.5.bb => mesa-pvr_23.2.1.bb} (83%) > > > > > > diff --git a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_22.3.5.bb b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_23.2.1.bb > > > similarity index 83% > > > copy from meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_22.3.5.bb > > > copy to meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_23.2.1.bb > > > index 5abd0793..c83ba87d 100644 > > > --- a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_22.3.5.bb > > > +++ b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_23.2.1.bb > > > @@ -2,23 +2,23 @@ > > > # upstream yet. This allows us to build the shims we need without completely > > > # clobbering mesa. > > > > > > +DEFAULT_PREFERENCE = "-1" > > > +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}_${PV}:" > > > > This is wrong - ${PN}-${PV} is one of the default locations for patches, > > not ${PN}_${PV}. > > > > > Huh. Checking oe-core/meta/classes-global/base.bbclass and the documentation it > doesn't look like it but dumping the variables at runtime, you seem to be > right... > > Wonder what's appending that. I'll spin up a new revision. P = "${PN}-${PV}" BP is "base" P w/o any prefixes/suffixes like "nativesdk-" or "-native" And base.bbclass adds both ${BP}, ${BPN} and files to FILESPATH (from most to least specific): https://git.openembedded.org/openembedded-core/tree/meta/classes-global/base.bbclass#n59 > > > require recipes-graphics/mesa/mesa.inc > > > > > > SUMMARY += " (with PowerVR support for TI platforms)" > > > > > > LIC_FILES_CHKSUM = "file://docs/license.rst;md5=63779ec98d78d823a9dc533a0735ef10" > > > > > > -BRANCH = "powervr/kirkstone/${PV}" > > > +BRANCH = "powervr/${PV}" > > > > > > SRC_URI = " \ > > > git://gitlab.freedesktop.org/StaticRocket/mesa.git;protocol=https;branch=${BRANCH} \ > > > file://0001-meson.build-check-for-all-linux-host_os-combinations.patch \ > > > file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ > > > - file://0001-util-format-Check-for-NEON-before-using-it.patch \ > > > - file://0001-gbm-backend-fix-gbm-compile-without-dri.patch \ > > > - file://0001-freedreno-pm4-Use-unsigned-instead-of-uint-to-fix-mu.patch \ > > > file://0001-gallium-Fix-build-with-llvm-17.patch \ > > > - file://0001-fix-gallivm-limit-usage-of-LLVMContextSetOpaquePoint.patch \ > > > + file://0001-meson-Disable-cmake-dependency-detector-for-llvm.patch \ > > > " > > > > > > S = "${WORKDIR}/git" > > > @@ -28,7 +28,7 @@ PACKAGECONFIG:append = " \ > > > ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-sgx-ddk-km', 'sgx', '', d)} \ > > > " > > > > > > -SRCREV = "1be98ba80452ebe38546a7fca26b5a70f2629083" > > > +SRCREV = "b12290126ba6a154f0e8b0a8c8b2b0d64f98e427" > > > > > > PVR_DISPLAY_CONTROLLER_ALIAS ??= "tidss" > > > PACKAGECONFIG[pvr] = "-Dgallium-pvr-alias=${PVR_DISPLAY_CONTROLLER_ALIAS}," > > > -- > > > 2.25.1
On Thu May 2, 2024 at 1:20 PM CDT, Denys Dmytriyenko wrote: > On Thu, May 02, 2024 at 12:49:13PM -0500, Randolph Sapp wrote: > > On Wed May 1, 2024 at 10:06 PM CDT, Denys Dmytriyenko wrote: > > > On Wed, May 01, 2024 at 08:26:21PM -0400, Denys Dmytriyenko wrote: > > > > From: Randolph Sapp <rs@ti.com> > > > > > > > > Add a recipe for mesa-pvr to use a newer branch based on mesa 23.2.1. > > > > This branch does not currently contain SGX patches so it is also being > > > > masked by the ltsprep branding to prevent regressing those devices > > > > currently. > > > > > > > > Please note that because this recipe is currently in > > > > SIGGEN_EXCLUDERECIPES_ABISAFE you may run into sstate errors when > > > > switching away from the ltsprep tag. Please issue a clean to mesa and > > > > ti-img-rogue-umlibs if you get warnings from either package's > > > > do_create_runtime_spdx step. > > > > > > > > Signed-off-by: Randolph Sapp <rs@ti.com> > > > > Signed-off-by: Denys Dmytriyenko <denys@konsulko.com> > > > > --- > > > > .../mesa/{mesa-pvr_22.3.5.bb => mesa-pvr_23.2.1.bb} | 12 ++++++------ > > > > 1 file changed, 6 insertions(+), 6 deletions(-) > > > > copy meta-ti-bsp/recipes-graphics/mesa/{mesa-pvr_22.3.5.bb => mesa-pvr_23.2.1.bb} (83%) > > > > > > > > diff --git a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_22.3.5.bb b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_23.2.1.bb > > > > similarity index 83% > > > > copy from meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_22.3.5.bb > > > > copy to meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_23.2.1.bb > > > > index 5abd0793..c83ba87d 100644 > > > > --- a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_22.3.5.bb > > > > +++ b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_23.2.1.bb > > > > @@ -2,23 +2,23 @@ > > > > # upstream yet. This allows us to build the shims we need without completely > > > > # clobbering mesa. > > > > > > > > +DEFAULT_PREFERENCE = "-1" > > > > +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}_${PV}:" > > > > > > This is wrong - ${PN}-${PV} is one of the default locations for patches, > > > not ${PN}_${PV}. > > > > > > > > > Huh. Checking oe-core/meta/classes-global/base.bbclass and the documentation it > > doesn't look like it but dumping the variables at runtime, you seem to be > > right... > > > > Wonder what's appending that. I'll spin up a new revision. > > P = "${PN}-${PV}" > BP is "base" P w/o any prefixes/suffixes like "nativesdk-" or "-native" > And base.bbclass adds both ${BP}, ${BPN} and files to FILESPATH (from most > to least specific): > https://git.openembedded.org/openembedded-core/tree/meta/classes-global/base.bbclass#n59 Ah, rats. I didn't realize BP was "${PN}-${PV}", I figured it base the base package name. Thanks for the info. > > > > require recipes-graphics/mesa/mesa.inc > > > > > > > > SUMMARY += " (with PowerVR support for TI platforms)" > > > > > > > > LIC_FILES_CHKSUM = "file://docs/license.rst;md5=63779ec98d78d823a9dc533a0735ef10" > > > > > > > > -BRANCH = "powervr/kirkstone/${PV}" > > > > +BRANCH = "powervr/${PV}" > > > > > > > > SRC_URI = " \ > > > > git://gitlab.freedesktop.org/StaticRocket/mesa.git;protocol=https;branch=${BRANCH} \ > > > > file://0001-meson.build-check-for-all-linux-host_os-combinations.patch \ > > > > file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ > > > > - file://0001-util-format-Check-for-NEON-before-using-it.patch \ > > > > - file://0001-gbm-backend-fix-gbm-compile-without-dri.patch \ > > > > - file://0001-freedreno-pm4-Use-unsigned-instead-of-uint-to-fix-mu.patch \ > > > > file://0001-gallium-Fix-build-with-llvm-17.patch \ > > > > - file://0001-fix-gallivm-limit-usage-of-LLVMContextSetOpaquePoint.patch \ > > > > + file://0001-meson-Disable-cmake-dependency-detector-for-llvm.patch \ > > > > " > > > > > > > > S = "${WORKDIR}/git" > > > > @@ -28,7 +28,7 @@ PACKAGECONFIG:append = " \ > > > > ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-sgx-ddk-km', 'sgx', '', d)} \ > > > > " > > > > > > > > -SRCREV = "1be98ba80452ebe38546a7fca26b5a70f2629083" > > > > +SRCREV = "b12290126ba6a154f0e8b0a8c8b2b0d64f98e427" > > > > > > > > PVR_DISPLAY_CONTROLLER_ALIAS ??= "tidss" > > > > PACKAGECONFIG[pvr] = "-Dgallium-pvr-alias=${PVR_DISPLAY_CONTROLLER_ALIAS}," > > > > -- > > > > 2.25.1
diff --git a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_23.3.6512818.bb b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_24.1.6554834.bb similarity index 94% copy from meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_23.3.6512818.bb copy to meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_24.1.6554834.bb index 02ec9fe9..a1b76d27 100644 --- a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_23.3.6512818.bb +++ b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_24.1.6554834.bb @@ -3,6 +3,8 @@ HOMEPAGE = "http://git.ti.com/graphics/ti-img-rogue-driver" LICENSE = "MIT | GPL-2.0-only" LIC_FILES_CHKSUM = "file://README;beginline=14;endline=19;md5=0403c7dea01a2b8232261e805325fac2" +DEFAULT_PREFERENCE = "-1" + inherit module PROVIDES = "virtual/gpudriver" @@ -22,7 +24,7 @@ SRC_URI = "git://git.ti.com/git/graphics/ti-img-rogue-driver.git;protocol=https; S = "${WORKDIR}/git" -SRCREV = "2f409b4dd2540e896b54bff02219d4fc51129b81" +SRCREV = "e2dfdfee991dadc18175f27fe9e8676e910a2f8d" TARGET_PRODUCT:j721e = "j721e_linux" TARGET_PRODUCT:j721s2 = "j721s2_linux" diff --git a/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_23.3.6512818.bb b/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_24.1.6554834.bb similarity index 94% copy from meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_23.3.6512818.bb copy to meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_24.1.6554834.bb index a0a9a295..df426d1a 100644 --- a/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_23.3.6512818.bb +++ b/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_24.1.6554834.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" +DEFAULT_PREFERENCE = "-1" + inherit bin_package INHIBIT_DEFAULT_DEPS = "" @@ -14,7 +16,7 @@ PR = "r3" BRANCH = "linuxws/scarthgap/k6.6/${PV}" SRC_URI = "git://git.ti.com/git/graphics/ti-img-rogue-umlibs.git;protocol=https;branch=${BRANCH}" -SRCREV = "0b9e64254269be2fa95c4f3e1dd925d6e4d58199" +SRCREV = "e473234158c736248cf71a60080b7faf76fca561" S = "${WORKDIR}/git/targetfs/${TARGET_PRODUCT}/${PVR_WS}/${PVR_BUILD}" TARGET_PRODUCT:j721e = "j721e_linux" @@ -109,7 +111,7 @@ python __anonymous() { mlprefix = d.getVar("MLPREFIX") pkgs = " " + " ".join(mlprefix + x + suffix for x in p[1:]) d.setVar("DEBIAN_NOAUTONAME:" + fullp, "1") - d.setVar("INSANE_SKIP:" + fullp, "dev-so") + d.setVar("INSANE_SKIP:" + fullp, "dev-so ldflags") d.appendVar("RRECOMMENDS:" + fullp, " ${MLPREFIX}ti-img-rogue-umlibs" + suffix) } @@ -133,6 +135,8 @@ DEBIAN_NOAUTONAME:libopencl-rogue-tools = "1" # optional tools and tests FILES:${PN}-tools = "${bindir}/" RDEPENDS:${PN}-tools = "python3-core ${PN}" +INSANE_SKIP:${PN}-tools = "ldflags" +RDEPENDS:${PN}-tools = "libdrm" # required firmware FILES:${PN}-firmware = "${base_libdir}/firmware/*" @@ -142,4 +146,4 @@ RRECOMMENDS:${PN} += " \ ${PN}-tools \ " -INSANE_SKIP:${PN} += "already-stripped dev-so" +INSANE_SKIP:${PN} += "already-stripped dev-so ldflags"