From patchwork Mon May 2 14:51:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 7495 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 47B00C4707F for ; Mon, 2 May 2022 14:51:30 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web11.11528.1651503086753504843 for ; Mon, 02 May 2022 07:51:27 -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 204D540B86 for ; Mon, 2 May 2022 14:51:26 +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 s7GFY45LXzoh for ; Mon, 2 May 2022 14:51:26 +0000 (UTC) Received: from mail.denix.org (pool-100-15-86-127.washdc.fios.verizon.net [100.15.86.127]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 55D9740C8A for ; Mon, 2 May 2022 14:51:23 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 50051174921 for ; Mon, 2 May 2022 10:51:21 -0400 (EDT) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Subject: [master][PATCH 12/26] ti-graphics: gpu enable and move all platforms to ddk 1.15 Date: Mon, 2 May 2022 14:51:06 +0000 Message-Id: <20220502145120.726632-13-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220502145120.726632-1-denis@denix.org> References: <20220502145120.726632-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 ; Mon, 02 May 2022 14:51:30 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/14664 From: "Etheridge, Darren" 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 Signed-off-by: Denys Dmytriyenko --- meta-ti-bsp/conf/machine/am62xx-evm.conf | 2 ++ meta-ti-bsp/conf/machine/j721s2-evm.conf | 2 ++ ...bb => ti-img-rogue-driver_1.15.6133109.bb} | 20 +++++++++++-------- ...bb => ti-img-rogue-umlibs_1.15.6133109.bb} | 13 ++++++------ 4 files changed, 23 insertions(+), 14 deletions(-) rename meta-ti-bsp/recipes-bsp/powervr-drivers/{ti-img-rogue-driver_1.13.5776728.bb => ti-img-rogue-driver_1.15.6133109.bb} (49%) rename meta-ti-bsp/recipes-graphics/libgles/{ti-img-rogue-umlibs_1.13.5776728.bb => ti-img-rogue-umlibs_1.15.6133109.bb} (84%) diff --git a/meta-ti-bsp/conf/machine/am62xx-evm.conf b/meta-ti-bsp/conf/machine/am62xx-evm.conf index 0588d34c..eb1563f8 100644 --- a/meta-ti-bsp/conf/machine/am62xx-evm.conf +++ b/meta-ti-bsp/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/meta-ti-bsp/conf/machine/j721s2-evm.conf b/meta-ti-bsp/conf/machine/j721s2-evm.conf index a2c15f74..5d977776 100644 --- a/meta-ti-bsp/conf/machine/j721s2-evm.conf +++ b/meta-ti-bsp/conf/machine/j721s2-evm.conf @@ -4,6 +4,8 @@ require conf/machine/include/j721s2.inc +MACHINE_FEATURES += "gpu" + SERIAL_CONSOLES = "115200;ttyS10" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" TFA_K3_USART = "0x8" diff --git a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.13.5776728.bb b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.15.6133109.bb similarity index 49% rename from meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.13.5776728.bb rename to meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.15.6133109.bb index 6ed3a40b..94b05436 100644 --- a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.13.5776728.bb +++ b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.15.6133109.bb @@ -7,17 +7,17 @@ inherit module features_check REQUIRED_MACHINE_FEATURES = "gpu" -MACHINE_KERNEL_PR:append = "b" +MACHINE_KERNEL_PR:append = "a" PR = "${MACHINE_KERNEL_PR}" PACKAGE_ARCH = "${MACHINE_ARCH}" -COMPATIBLE_MACHINE = "j7" +COMPATIBLE_MACHINE = "j721e|j721s2|am62xx" DEPENDS = "virtual/kernel" PROVIDES = "virtual/gpudriver" -BRANCH = "1.13-5776728/linux-k5.10" +BRANCH = "linuxws/dunfell/k5.10/${PV}" SRC_URI = " \ git://git.ti.com/graphics/ti-img-rogue-driver.git;branch=${BRANCH} \ @@ -26,15 +26,19 @@ SRC_URI = " \ S = "${WORKDIR}/git" -SRCREV = "35a25875ae8738f82c7cabc6b077ef992b0cca84" +SRCREV = "ee0674adccac16f5b2f7cb8d5d05948706080cb5" -PVR_SOC = "j721e_linux" -PVR_BVNC = "22.104.208.318" +TARGET_PRODUCT:j721e = "j721e_linux" +TARGET_PRODUCT:j721s2 = "j721s2_linux" +TARGET_PRODUCT:am62xx = "am62_linux" +TARGET_BVNC:j721e = "22.104.208.318" +TARGET_BVNC:j721s2 = "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=${PVR_BVNC} BUILD=${PVR_BUILD} PVR_BUILD_DIR=${PVR_SOC} WINDOW_SYSTEM=${PVR_WS}' +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_${PVR_SOC}_${PVR_WS}_${PVR_BUILD}/target_aarch64/kbuild INSTALL_MOD_PATH=${D}${root_prefix} PREFIX=${STAGING_DIR_HOST} modules_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/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_1.13.5776728.bb b/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb similarity index 84% rename from meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_1.13.5776728.bb rename to meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb index 18b36fbb..115344b1 100644 --- a/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_1.13.5776728.bb +++ b/meta-ti-bsp/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 = "j721e" +COMPATIBLE_MACHINE = "j721e|j721s2|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:j721e = "j721e_linux" +TARGET_PRODUCT:j721s2 = "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} }