Message ID | 20241031234743.435950-1-rs@ti.com |
---|---|
State | Superseded |
Delegated to: | Ryan Eatmon |
Headers | show |
Series | [meta-ti,scarthgap/master] sgx: bump version for kernel 6.6 / mesa 23.2.1 | expand |
On Thu, Oct 31, 2024 at 06:47:43PM -0500, rs@ti.com wrote: > From: Randolph Sapp <rs@ti.com> > > Bump versions of mesa-pvr and ti-sgx-ddk-km to support SGX with kernel > 6.6 and the same version of mesa rogue is using right now (23.2.1). > These commits are currently compatible with both kernel 6.1 and 6.6. > > Enable SGX by default in the 6.6 BSP provider section logic. Great to finally get "legacy" SGX working on 6.6! Thanks for doing it. > Signed-off-by: Randolph Sapp <rs@ti.com> > --- > meta-ti-bsp/conf/machine/include/ti-bsp.inc | 4 +++- > .../recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb | 2 +- > meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_23.2.1.bb | 2 +- > 3 files changed, 5 insertions(+), 3 deletions(-) > > diff --git a/meta-ti-bsp/conf/machine/include/ti-bsp.inc b/meta-ti-bsp/conf/machine/include/ti-bsp.inc > index 0c8f657d..d06fed1e 100644 > --- a/meta-ti-bsp/conf/machine/include/ti-bsp.inc > +++ b/meta-ti-bsp/conf/machine/include/ti-bsp.inc > @@ -57,7 +57,9 @@ BSP_KERNEL_VERSION:bsp-ti-6_6 = "6.6%" > BSP_BOOTLOADER_PROVIDER:bsp-ti-6_6 = "u-boot-ti-staging" > BSP_BOOTLOADER_VERSION:bsp-ti-6_6 = "2024.04%" > > -# Only Rogue is enabled so far, SGX falls back to SW rendering > +BSP_SGX_DRIVER_PROVIDER:bsp-ti-6_6 = "ti-sgx-ddk-km" > +BSP_SGX_DRIVER_VERSION:bsp-ti-6_6 = "1.17%" > +BSP_SGX_UMLIBS_VERSION:bsp-ti-6_6 = "1.17%" > BSP_ROGUE_DRIVER_PROVIDER:bsp-ti-6_6 = "ti-img-rogue-driver" > BSP_ROGUE_DRIVER_VERSION:bsp-ti-6_6 = "24%" > BSP_ROGUE_UMLIBS_VERSION:bsp-ti-6_6 = "24%" > diff --git a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb > index 100c10c1..31cffaf1 100644 > --- a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb > +++ b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb > @@ -19,7 +19,7 @@ SRC_URI = "git://git.ti.com/git/graphics/omap5-sgx-ddk-linux.git;protocol=https; > > S = "${WORKDIR}/git" > > -SRCREV = "652ae16657cc4acda664e669d0c9b4891252f37f" > +SRCREV = "97c49d302efd50d1e52bf55a25fe8ecf3e5476c3" > > TARGET_PRODUCT:omap-a15 = "ti572x_linux" > TARGET_PRODUCT:ti33x = "ti335x_linux" > diff --git a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_23.2.1.bb b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_23.2.1.bb > index 21134bc7..fa765a64 100644 > --- a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_23.2.1.bb > +++ b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_23.2.1.bb > @@ -25,7 +25,7 @@ PACKAGECONFIG:append = " \ > ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-sgx-ddk-km', 'sgx', '', d)} \ > " > > -SRCREV = "b12290126ba6a154f0e8b0a8c8b2b0d64f98e427" > +SRCREV = "0e75e7ded360ea6aee4140393b30960e152f3994" > PV = "23.2.1" > > PVR_DISPLAY_CONTROLLER_ALIAS ??= "tidss" > -- > 2.47.0 >
diff --git a/meta-ti-bsp/conf/machine/include/ti-bsp.inc b/meta-ti-bsp/conf/machine/include/ti-bsp.inc index 0c8f657d..d06fed1e 100644 --- a/meta-ti-bsp/conf/machine/include/ti-bsp.inc +++ b/meta-ti-bsp/conf/machine/include/ti-bsp.inc @@ -57,7 +57,9 @@ BSP_KERNEL_VERSION:bsp-ti-6_6 = "6.6%" BSP_BOOTLOADER_PROVIDER:bsp-ti-6_6 = "u-boot-ti-staging" BSP_BOOTLOADER_VERSION:bsp-ti-6_6 = "2024.04%" -# Only Rogue is enabled so far, SGX falls back to SW rendering +BSP_SGX_DRIVER_PROVIDER:bsp-ti-6_6 = "ti-sgx-ddk-km" +BSP_SGX_DRIVER_VERSION:bsp-ti-6_6 = "1.17%" +BSP_SGX_UMLIBS_VERSION:bsp-ti-6_6 = "1.17%" BSP_ROGUE_DRIVER_PROVIDER:bsp-ti-6_6 = "ti-img-rogue-driver" BSP_ROGUE_DRIVER_VERSION:bsp-ti-6_6 = "24%" BSP_ROGUE_UMLIBS_VERSION:bsp-ti-6_6 = "24%" diff --git a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb index 100c10c1..31cffaf1 100644 --- a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb +++ b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb @@ -19,7 +19,7 @@ SRC_URI = "git://git.ti.com/git/graphics/omap5-sgx-ddk-linux.git;protocol=https; S = "${WORKDIR}/git" -SRCREV = "652ae16657cc4acda664e669d0c9b4891252f37f" +SRCREV = "97c49d302efd50d1e52bf55a25fe8ecf3e5476c3" TARGET_PRODUCT:omap-a15 = "ti572x_linux" TARGET_PRODUCT:ti33x = "ti335x_linux" diff --git a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_23.2.1.bb b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_23.2.1.bb index 21134bc7..fa765a64 100644 --- a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_23.2.1.bb +++ b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_23.2.1.bb @@ -25,7 +25,7 @@ PACKAGECONFIG:append = " \ ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-sgx-ddk-km', 'sgx', '', d)} \ " -SRCREV = "b12290126ba6a154f0e8b0a8c8b2b0d64f98e427" +SRCREV = "0e75e7ded360ea6aee4140393b30960e152f3994" PV = "23.2.1" PVR_DISPLAY_CONTROLLER_ALIAS ??= "tidss"