From: Randolph Sapp <[email protected]> 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.
Enable SGX by default in the 6.6 BSP provider section logic. Signed-off-by: Randolph Sapp <[email protected]> --- v2: address qa issues by passing yocto kernel_* variables through to our build scripts meta-ti-bsp/conf/machine/include/ti-bsp.inc | 4 +++- .../powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb | 10 +++++++++- meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_23.2.1.bb | 2 +- 3 files changed, 13 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 d27bbe3c..814c6ca8 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..5e9c6e6e 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 = "3005cf8145a6720daa47e4e273f9e421ff77cb58" TARGET_PRODUCT:omap-a15 = "ti572x_linux" TARGET_PRODUCT:ti33x = "ti335x_linux" @@ -31,6 +31,14 @@ PVR_WS = "lws-generic" EXTRA_OEMAKE += 'KERNELDIR="${STAGING_KERNEL_DIR}" BUILD=${PVR_BUILD} \ WINDOW_SYSTEM=${PVR_WS} PVR_BUILD_DIR=${TARGET_PRODUCT}' +# There are useful flags here that are interpreted by the final kbuild pass +# These variables are not necessary when compiling outside of Yocto +export KERNEL_CC +export KERNEL_LD +export KERNEL_AR +export KERNEL_OBJCOPY +export KERNEL_STRIP + do_install() { make -C ${STAGING_KERNEL_DIR} M=${B}/eurasiacon/binary_${TARGET_PRODUCT}_${PVR_WS}_${PVR_BUILD}/target_armhf/kbuild INSTALL_MOD_PATH=${D}${root_prefix} PREFIX=${STAGING_DIR_HOST} modules_install } 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
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#18052): https://lists.yoctoproject.org/g/meta-ti/message/18052 Mute This Topic: https://lists.yoctoproject.org/mt/109451056/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
