From ed94c75b436f2f8c5c3a8a6ebed45d7276cc35e4 Mon Sep 17 00:00:00 2001 From: "Etheridge, Darren" Date: Wed, 23 Mar 2022 14:37:07 -0500 Subject: [PATCH] ti-graphics: gpu enable and move all platforms to ddk 1.15 Enable the GPU for am62xx and j721s2 and use IMG DDK 1.15 Migrate Imagination DDK 1.13 to DDK 1.15 for J721e Signed-off-by: Darren Etheridge Signed-off-by: Ryan Eatmon --- conf/machine/am62xx-evm.conf | 2 + conf/machine/j721s2-evm.conf | 2 + .../ti-img-rogue-driver_1.13.5776728.bb | 40 ----------------- .../ti-img-rogue-driver_1.15.6133109.bb | 44 +++++++++++++++++++ ...bb => ti-img-rogue-umlibs_1.15.6133109.bb} | 13 +++--- 5 files changed, 55 insertions(+), 46 deletions(-) delete mode 100644 recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.13.5776728.bb create mode 100644 recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.15.6133109.bb rename recipes-graphics/libgles/{ti-img-rogue-umlibs_1.13.5776728.bb => ti-img-rogue-umlibs_1.15.6133109.bb} (84%) diff --git a/conf/machine/am62xx-evm.conf b/conf/machine/am62xx-evm.conf index 0588d34c..eb1563f8 100644 --- a/conf/machine/am62xx-evm.conf +++ b/conf/machine/am62xx-evm.conf @@ -4,6 +4,8 @@ require conf/machine/include/am62xx.inc +MACHINE_FEATURES += "gpu" + KERNEL_DEVICETREE = " \ ti/k3-am625-sk.dtb \ " diff --git a/conf/machine/j721s2-evm.conf b/conf/machine/j721s2-evm.conf index 82fd33da..e5ed0b73 100644 --- a/conf/machine/j721s2-evm.conf +++ b/conf/machine/j721s2-evm.conf @@ -4,6 +4,8 @@ require conf/machine/include/j7.inc +MACHINE_FEATURES += "gpu" + SERIAL_CONSOLES = "115200;ttyS10" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" TFA_K3_USART = "0x8" diff --git a/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.13.5776728.bb b/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.13.5776728.bb deleted file mode 100644 index a05de0f2..00000000 --- a/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.13.5776728.bb +++ /dev/null @@ -1,40 +0,0 @@ -DESCRIPTION = "Kernel drivers for the PowerVR Rogue GPU found in the TI SoCs" -HOMEPAGE = "http://git.ti.com/graphics/ti-img-rogue-driver" -LICENSE = "MIT | GPLv2" -LIC_FILES_CHKSUM = "file://README;beginline=14;endline=19;md5=0403c7dea01a2b8232261e805325fac2" - -inherit module features_check - -REQUIRED_MACHINE_FEATURES = "gpu" - -MACHINE_KERNEL_PR_append = "b" -PR = "${MACHINE_KERNEL_PR}" - -PACKAGE_ARCH = "${MACHINE_ARCH}" -COMPATIBLE_MACHINE = "j7" - -DEPENDS = "virtual/kernel" - -PROVIDES = "virtual/gpudriver" - -BRANCH = "1.13-5776728/linux-k5.10" - -SRC_URI = " \ - git://git.ti.com/graphics/ti-img-rogue-driver.git;branch=${BRANCH} \ - file://0001-compiler-support-OpenEmbedded-nodistro-internal-aarc.patch \ -" - -S = "${WORKDIR}/git" - -SRCREV = "35a25875ae8738f82c7cabc6b077ef992b0cca84" - -PVR_SOC = "j721e_linux" -PVR_BVNC = "22.104.208.318" -PVR_BUILD = "release" -PVR_WS = "wayland" - -EXTRA_OEMAKE += 'KERNELDIR="${STAGING_KERNEL_DIR}" RGX_BVNC=${PVR_BVNC} BUILD=${PVR_BUILD} PVR_BUILD_DIR=${PVR_SOC} WINDOW_SYSTEM=${PVR_WS}' - -do_install() { - make -C ${STAGING_KERNEL_DIR} M=${B}/binary_${PVR_SOC}_${PVR_WS}_${PVR_BUILD}/target_aarch64/kbuild INSTALL_MOD_PATH=${D}${root_prefix} PREFIX=${STAGING_DIR_HOST} modules_install -} diff --git a/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.15.6133109.bb b/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.15.6133109.bb new file mode 100644 index 00000000..fbff6c51 --- /dev/null +++ b/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.15.6133109.bb @@ -0,0 +1,44 @@ +DESCRIPTION = "Kernel drivers for the PowerVR Rogue GPU found in the TI SoCs" +HOMEPAGE = "http://git.ti.com/graphics/ti-img-rogue-driver" +LICENSE = "MIT | GPLv2" +LIC_FILES_CHKSUM = "file://README;beginline=14;endline=19;md5=0403c7dea01a2b8232261e805325fac2" + +inherit module features_check + +REQUIRED_MACHINE_FEATURES = "gpu" + +MACHINE_KERNEL_PR_append = "a" +PR = "${MACHINE_KERNEL_PR}" + +PACKAGE_ARCH = "${MACHINE_ARCH}" +COMPATIBLE_MACHINE = "j7-evm|j721s2-evm|am62xx" + +DEPENDS = "virtual/kernel" + +PROVIDES = "virtual/gpudriver" + +BRANCH = "linuxws/dunfell/k5.10/${PV}" + +SRC_URI = " \ + git://git.ti.com/graphics/ti-img-rogue-driver.git;branch=${BRANCH} \ + file://0001-compiler-support-OpenEmbedded-nodistro-internal-aarc.patch \ +" + +S = "${WORKDIR}/git" + +SRCREV = "ee0674adccac16f5b2f7cb8d5d05948706080cb5" + +TARGET_PRODUCT_j7-evm = "j721e_linux" +TARGET_PRODUCT_j721s2-evm = "j721s2_linux" +TARGET_PRODUCT_am62xx = "am62_linux" +TARGET_BVNC_j7-evm = "22.104.208.318" +TARGET_BVNC_j721s2-evm = "36.53.104.796" +TARGET_BVNC_am62xx = "33.15.11.3" +PVR_BUILD = "release" +PVR_WS = "wayland" + +EXTRA_OEMAKE += 'KERNELDIR="${STAGING_KERNEL_DIR}" RGX_BVNC=${TARGET_BVNC} BUILD=${PVR_BUILD} PVR_BUILD_DIR=${TARGET_PRODUCT} WINDOW_SYSTEM=${PVR_WS}' + +do_install() { + make -C ${STAGING_KERNEL_DIR} M=${B}/binary_${TARGET_PRODUCT}_${PVR_WS}_${PVR_BUILD}/target_aarch64/kbuild INSTALL_MOD_PATH=${D}${root_prefix} PREFIX=${STAGING_DIR_HOST} modules_install +} diff --git a/recipes-graphics/libgles/ti-img-rogue-umlibs_1.13.5776728.bb b/recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb similarity index 84% rename from recipes-graphics/libgles/ti-img-rogue-umlibs_1.13.5776728.bb rename to recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb index 5194015e..e00dce99 100644 --- a/recipes-graphics/libgles/ti-img-rogue-umlibs_1.13.5776728.bb +++ b/recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb @@ -8,17 +8,18 @@ inherit features_check REQUIRED_MACHINE_FEATURES = "gpu" PACKAGE_ARCH = "${MACHINE_ARCH}" -COMPATIBLE_MACHINE = "j7" +COMPATIBLE_MACHINE = "j7-evm|j721s2-evm|am62xx" -PR = "r3" +PR = "r1" BRANCH = "linuxws/dunfell/k5.10/${PV}" SRC_URI = "git://git.ti.com/graphics/ti-img-rogue-umlibs.git;branch=${BRANCH}" +SRCREV = "47c3ffc44f2881397d45c8a2b5dfa7d6c58b79fb" -SRCREV = "5ef38353c38d921a65ea6df75c7b6ce710b66034" - -PVR_SOC ?= "j721e_linux" +TARGET_PRODUCT_j7-evm = "j721e_linux" +TARGET_PRODUCT_j721s2-evm = "j721s2_linux" +TARGET_PRODUCT_am62xx = "am62_linux" PVR_BUILD ?= "release" PVR_WS = "wayland" @@ -50,7 +51,7 @@ RRECOMMENDS_${PN} += "ti-img-rogue-driver" S = "${WORKDIR}/git" do_install () { - oe_runmake install DESTDIR=${D} TARGET_PRODUCT=${PVR_SOC} BUILD=${PVR_BUILD} WINDOW_SYSTEM=${PVR_WS} + oe_runmake install DESTDIR=${D} TARGET_PRODUCT=${TARGET_PRODUCT} BUILD=${PVR_BUILD} WINDOW_SYSTEM=${PVR_WS} chown -R root:root ${D} }