From patchwork Thu Apr 6 19:28:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 22352 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 2DE47C76196 for ; Thu, 6 Apr 2023 19:28:57 +0000 (UTC) Received: from fllv0016.ext.ti.com (fllv0016.ext.ti.com [198.47.19.142]) by mx.groups.io with SMTP id smtpd.web10.168213.1680809330554644408 for ; Thu, 06 Apr 2023 12:28:50 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=NXfDt0ZG; spf=pass (domain: ti.com, ip: 198.47.19.142, mailfrom: afd@ti.com) Received: from fllv0035.itg.ti.com ([10.64.41.0]) by fllv0016.ext.ti.com (8.15.2/8.15.2) with ESMTP id 336JSmrQ003152; Thu, 6 Apr 2023 14:28:48 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1680809328; bh=E75+8ijaL69Xr7bHDE//PWSpiN8RzXmu3NKFG07MAME=; h=From:To:CC:Subject:Date; b=NXfDt0ZGqUiVaIoJiXz+FhGkuN4/FaKGH5X3hliB56boO3q7SkqMGfwVTkVzJyi6U WTl0ePZmd86+UfKQfUagjcpzho0gNdyXrFqJhLySPWos2unk0pyxTYlhSgWagISHgg GoQGU+bbBHYojJn53e8Y78Q4zsXOPGiwZ/DWzhZo= Received: from DLEE100.ent.ti.com (dlee100.ent.ti.com [157.170.170.30]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 336JSmsv067400 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 6 Apr 2023 14:28:48 -0500 Received: from DLEE100.ent.ti.com (157.170.170.30) by DLEE100.ent.ti.com (157.170.170.30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16; Thu, 6 Apr 2023 14:28:48 -0500 Received: from fllv0039.itg.ti.com (10.64.41.19) by DLEE100.ent.ti.com (157.170.170.30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16 via Frontend Transport; Thu, 6 Apr 2023 14:28:48 -0500 Received: from lelv0854.itg.ti.com (ileaxei01-snat2.itg.ti.com [10.180.69.6]) by fllv0039.itg.ti.com (8.15.2/8.15.2) with ESMTP id 336JSm3J012041; Thu, 6 Apr 2023 14:28:48 -0500 From: Andrew Davis To: Denys Dmytriyenko , Ryan Eatmon , Randolph Sapp , CC: Andrew Davis Subject: [meta-ti][master/kirkstone][PATCH 1/5] ti-sgx-ddk-um: Remove RDEPENDS on libdrm-omap Date: Thu, 6 Apr 2023 14:28:43 -0500 Message-ID: <20230406192847.7934-1-afd@ti.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 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 ; Thu, 06 Apr 2023 19:28:57 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/16304 We no longer use libdrm-omap so remove it. Signed-off-by: Andrew Davis --- .../recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-ti-bsp/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb b/meta-ti-bsp/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb index 73d7acb9..9ea3add7 100644 --- a/meta-ti-bsp/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb +++ b/meta-ti-bsp/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb @@ -34,7 +34,7 @@ def use_initscript(d): inherit ${@oe.utils.ifelse(use_initscript(d), 'update-rc.d', '')} -RDEPENDS:${PN} += "libdrm libdrm-omap" +RDEPENDS:${PN} += "libdrm" RRECOMMENDS:${PN} += "ti-sgx-ddk-km" From patchwork Thu Apr 6 19:28:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 22356 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 3B77BC77B6E for ; Thu, 6 Apr 2023 19:28:57 +0000 (UTC) Received: from fllv0015.ext.ti.com (fllv0015.ext.ti.com [198.47.19.141]) by mx.groups.io with SMTP id smtpd.web10.168215.1680809330908143087 for ; Thu, 06 Apr 2023 12:28:51 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=sv9+16sq; spf=pass (domain: ti.com, ip: 198.47.19.141, mailfrom: afd@ti.com) Received: from fllv0035.itg.ti.com ([10.64.41.0]) by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id 336JSnbL075660; Thu, 6 Apr 2023 14:28:49 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1680809329; bh=NHBoqzGppXQ580Yss3A4IBk5EV/wbaHxcHz8ww2ukn4=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=sv9+16sqbEVWfV+V53f7DXJMSP/qMZXe/pF0Da5PS1dWIdnGGdJ+TZumtOhMMI9zk aaH5iQ/fJEoSqbmGadQcJqmV5engbOOxvJzlejuKXFbjqx6M7cgdfvVPe33YA5zddg 5Q65q+AfhCTJ8CWx0VCM63uvG/k7uwJ+ZRjcMAYM= Received: from DFLE113.ent.ti.com (dfle113.ent.ti.com [10.64.6.34]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 336JSnnF067405 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 6 Apr 2023 14:28:49 -0500 Received: from DFLE113.ent.ti.com (10.64.6.34) by DFLE113.ent.ti.com (10.64.6.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16; Thu, 6 Apr 2023 14:28:48 -0500 Received: from fllv0039.itg.ti.com (10.64.41.19) by DFLE113.ent.ti.com (10.64.6.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16 via Frontend Transport; Thu, 6 Apr 2023 14:28:48 -0500 Received: from lelv0854.itg.ti.com (ileaxei01-snat2.itg.ti.com [10.180.69.6]) by fllv0039.itg.ti.com (8.15.2/8.15.2) with ESMTP id 336JSm3K012041; Thu, 6 Apr 2023 14:28:48 -0500 From: Andrew Davis To: Denys Dmytriyenko , Ryan Eatmon , Randolph Sapp , CC: Andrew Davis Subject: [meta-ti][master/kirkstone][PATCH 2/5] ti-sgx-ddk-um: Remove no longer needed CLEANBROKEN and INSANE_SKIPs Date: Thu, 6 Apr 2023 14:28:44 -0500 Message-ID: <20230406192847.7934-2-afd@ti.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230406192847.7934-1-afd@ti.com> References: <20230406192847.7934-1-afd@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 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 ; Thu, 06 Apr 2023 19:28:57 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/16306 The "clean" target has been fixed along with some other issues that caused us to need these set. Remove them now. Signed-off-by: Andrew Davis --- .../recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/meta-ti-bsp/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb b/meta-ti-bsp/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb index 9ea3add7..755cc4f5 100644 --- a/meta-ti-bsp/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb +++ b/meta-ti-bsp/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb @@ -67,7 +67,5 @@ FILES:${PN} += "${sysconfdir}/*" FILES:${PN} += "${datadir}/*" FILES:${PN} += "${nonarch_base_libdir}/udev/rules.d" -INSANE_SKIP:${PN} += "dev-so ldflags useless-rpaths" -INSANE_SKIP:${PN} += "already-stripped dev-deps" - -CLEANBROKEN = "1" +INSANE_SKIP:${PN} += "ldflags" +INSANE_SKIP:${PN} += "already-stripped" From patchwork Thu Apr 6 19:28:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 22354 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 3BDF9C77B6F for ; Thu, 6 Apr 2023 19:28:57 +0000 (UTC) Received: from lelv0143.ext.ti.com (lelv0143.ext.ti.com [198.47.23.248]) by mx.groups.io with SMTP id smtpd.web10.168214.1680809330756699054 for ; Thu, 06 Apr 2023 12:28:50 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=sWmd5PpU; spf=pass (domain: ti.com, ip: 198.47.23.248, mailfrom: afd@ti.com) Received: from lelv0265.itg.ti.com ([10.180.67.224]) by lelv0143.ext.ti.com (8.15.2/8.15.2) with ESMTP id 336JSnL8046061; Thu, 6 Apr 2023 14:28:49 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1680809329; bh=XsEsdIGMGAAqqA2KoG29B3LFaVEvegTAFE5aXnjNAzE=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=sWmd5PpUWtoLweY7T394ElvUjJe97rfbiSqQn4WN3EAZHvlALjyq0BVM9s17POCup fSWwLX455YYzpy0le1ou6VcWH9C6wa9ejB30bPMIp5qdanfdUCkx1x4wd8pnwIDJKr 3rUw10uYITWLLilrNL+X9LTZIaUv1uTZzcaVT4lQ= Received: from DLEE108.ent.ti.com (dlee108.ent.ti.com [157.170.170.38]) by lelv0265.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 336JSnBq003895 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 6 Apr 2023 14:28:49 -0500 Received: from DLEE109.ent.ti.com (157.170.170.41) by DLEE108.ent.ti.com (157.170.170.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16; Thu, 6 Apr 2023 14:28:49 -0500 Received: from fllv0039.itg.ti.com (10.64.41.19) by DLEE109.ent.ti.com (157.170.170.41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16 via Frontend Transport; Thu, 6 Apr 2023 14:28:49 -0500 Received: from lelv0854.itg.ti.com (ileaxei01-snat2.itg.ti.com [10.180.69.6]) by fllv0039.itg.ti.com (8.15.2/8.15.2) with ESMTP id 336JSm3L012041; Thu, 6 Apr 2023 14:28:48 -0500 From: Andrew Davis To: Denys Dmytriyenko , Ryan Eatmon , Randolph Sapp , CC: Andrew Davis Subject: [meta-ti][master/kirkstone][PATCH 3/5] ti-sgx-ddk-km: Be specific on supported K3 machines Date: Thu, 6 Apr 2023 14:28:45 -0500 Message-ID: <20230406192847.7934-3-afd@ti.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230406192847.7934-1-afd@ti.com> References: <20230406192847.7934-1-afd@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 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 ; Thu, 06 Apr 2023 19:28:57 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/16305 Of the K3 family only the AM65x device is currently supported by this driver. COMPATIBLE_MACHINE should match. Signed-off-by: Andrew Davis --- .../recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 13b8757c..dcceed69 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 @@ -7,7 +7,7 @@ inherit module PROVIDES = "virtual/gpudriver" -COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|k3" +COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|am65xx" MACHINE_KERNEL_PR:append = "x" PR = "${MACHINE_KERNEL_PR}" @@ -27,7 +27,7 @@ SRCREV = "eda7780bfd5277e16913c9bc0b0e6892b4e79063" TARGET_PRODUCT:omap-a15 = "jacinto6evm" TARGET_PRODUCT:ti33x = "ti335x" TARGET_PRODUCT:ti43x = "ti437x" -TARGET_PRODUCT:k3 = "ti654x" +TARGET_PRODUCT:am65xx = "ti654x" EXTRA_OEMAKE += 'KERNELDIR="${STAGING_KERNEL_DIR}" TARGET_PRODUCT=${TARGET_PRODUCT} WINDOW_SYSTEM=nulldrmws' From patchwork Thu Apr 6 19:28:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 22353 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 2DE78C77B6C for ; Thu, 6 Apr 2023 19:28:57 +0000 (UTC) Received: from lelv0142.ext.ti.com (lelv0142.ext.ti.com [198.47.23.249]) by mx.groups.io with SMTP id smtpd.web11.168090.1680809331904668307 for ; Thu, 06 Apr 2023 12:28:52 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=lu+hYVpI; spf=pass (domain: ti.com, ip: 198.47.23.249, mailfrom: afd@ti.com) Received: from lelv0266.itg.ti.com ([10.180.67.225]) by lelv0142.ext.ti.com (8.15.2/8.15.2) with ESMTP id 336JSolN006022; Thu, 6 Apr 2023 14:28:50 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1680809330; bh=3Woj22SRCiK/9p2yqhDJFLhXN4XH2Ds/6flH7FYMREo=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=lu+hYVpIb+T5OeL3R4JfLrvXo8r4qGmGhrIpIAS10j1ev0zW09mzGFyY1rI+kj8LW H668vbx8ngTOmOQXH3wg34XMqhpBnE+8IBLA9KibSiQ/R8KxF9zmjtUK4nU2pJLvt6 mGx4KyHAOFRq9iCpWocI5i2yhFQqgXY8lQNlHJBo= Received: from DLEE109.ent.ti.com (dlee109.ent.ti.com [157.170.170.41]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 336JSncW055204 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 6 Apr 2023 14:28:50 -0500 Received: from DLEE112.ent.ti.com (157.170.170.23) by DLEE109.ent.ti.com (157.170.170.41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16; Thu, 6 Apr 2023 14:28:49 -0500 Received: from fllv0039.itg.ti.com (10.64.41.19) by DLEE112.ent.ti.com (157.170.170.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16 via Frontend Transport; Thu, 6 Apr 2023 14:28:49 -0500 Received: from lelv0854.itg.ti.com (ileaxei01-snat2.itg.ti.com [10.180.69.6]) by fllv0039.itg.ti.com (8.15.2/8.15.2) with ESMTP id 336JSm3M012041; Thu, 6 Apr 2023 14:28:49 -0500 From: Andrew Davis To: Denys Dmytriyenko , Ryan Eatmon , Randolph Sapp , CC: Andrew Davis Subject: [meta-ti][master/kirkstone][PATCH 4/5] ti-sgx-ddk-km: Use PVR_BUILD and PVR_WS to match Rogue Date: Thu, 6 Apr 2023 14:28:46 -0500 Message-ID: <20230406192847.7934-4-afd@ti.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230406192847.7934-1-afd@ti.com> References: <20230406192847.7934-1-afd@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 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 ; Thu, 06 Apr 2023 19:28:57 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/16307 Use these to select build type and window system support to match how the Rouge driver does the same. No functional change. Signed-off-by: Andrew Davis --- .../powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) 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 dcceed69..bf4fa98a 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 @@ -28,19 +28,21 @@ TARGET_PRODUCT:omap-a15 = "jacinto6evm" TARGET_PRODUCT:ti33x = "ti335x" TARGET_PRODUCT:ti43x = "ti437x" TARGET_PRODUCT:am65xx = "ti654x" +PVR_BUILD = "release" +PVR_WS = "nulldrmws" -EXTRA_OEMAKE += 'KERNELDIR="${STAGING_KERNEL_DIR}" TARGET_PRODUCT=${TARGET_PRODUCT} WINDOW_SYSTEM=nulldrmws' +EXTRA_OEMAKE += 'KERNELDIR="${STAGING_KERNEL_DIR}" BUILD=${PVR_BUILD} TARGET_PRODUCT=${TARGET_PRODUCT} WINDOW_SYSTEM=${PVR_WS}' do_compile:prepend() { cd ${S}/eurasia_km/eurasiacon/build/linux2/omap_linux } do_install() { - make -C ${STAGING_KERNEL_DIR} M=${B}/eurasia_km/eurasiacon/binary_omap_linux_nulldrmws_release/target_armhf/kbuild INSTALL_MOD_PATH=${D}${root_prefix} PREFIX=${STAGING_DIR_HOST} modules_install + make -C ${STAGING_KERNEL_DIR} M=${B}/eurasia_km/eurasiacon/binary_omap_linux_${PVR_WS}_${PVR_BUILD}/target_armhf/kbuild INSTALL_MOD_PATH=${D}${root_prefix} PREFIX=${STAGING_DIR_HOST} modules_install } -do_install:k3() { - make -C ${STAGING_KERNEL_DIR} M=${B}/eurasia_km/eurasiacon/binary_omap_linux_nulldrmws_release/target_aarch64/kbuild INSTALL_MOD_PATH=${D}${root_prefix} PREFIX=${STAGING_DIR_HOST} modules_install +do_install:am65xx() { + make -C ${STAGING_KERNEL_DIR} M=${B}/eurasia_km/eurasiacon/binary_omap_linux_${PVR_WS}_${PVR_BUILD}/target_aarch64/kbuild INSTALL_MOD_PATH=${D}${root_prefix} PREFIX=${STAGING_DIR_HOST} modules_install } RRECOMMENDS:${PN} += "ti-sgx-ddk-um" From patchwork Thu Apr 6 19:28:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Davis X-Patchwork-Id: 22355 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 3CF90C7618D for ; Thu, 6 Apr 2023 19:28:57 +0000 (UTC) Received: from fllv0015.ext.ti.com (fllv0015.ext.ti.com [198.47.19.141]) by mx.groups.io with SMTP id smtpd.web11.168091.1680809332071418303 for ; Thu, 06 Apr 2023 12:28:52 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@ti.com header.s=ti-com-17q1 header.b=KiqsJmGI; spf=pass (domain: ti.com, ip: 198.47.19.141, mailfrom: afd@ti.com) Received: from fllv0035.itg.ti.com ([10.64.41.0]) by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id 336JSonS075665; Thu, 6 Apr 2023 14:28:50 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1680809330; bh=FZBUU6izhuaGznyGJWvRtoCmhA+KgRQt6JKXZ37HX8I=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=KiqsJmGIY5fyUv/camAt3Gom0K9oK02XKCDcObhZ8aXmt2FgzFX1jbwOCT6GXJxtc 3qa18b5UfBePlBOauvRWe4WA07LkgsJXlzzMSxYpMSjboO68EkumsSMan+xoUtHte6 SH9QGLulzRkwg4CCVFpOWbEzaNZk0ORDzriKAYaw= Received: from DLEE115.ent.ti.com (dlee115.ent.ti.com [157.170.170.26]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 336JSoHw067409 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 6 Apr 2023 14:28:50 -0500 Received: from DLEE101.ent.ti.com (157.170.170.31) by DLEE115.ent.ti.com (157.170.170.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16; Thu, 6 Apr 2023 14:28:49 -0500 Received: from fllv0039.itg.ti.com (10.64.41.19) by DLEE101.ent.ti.com (157.170.170.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16 via Frontend Transport; Thu, 6 Apr 2023 14:28:50 -0500 Received: from lelv0854.itg.ti.com (ileaxei01-snat2.itg.ti.com [10.180.69.6]) by fllv0039.itg.ti.com (8.15.2/8.15.2) with ESMTP id 336JSm3N012041; Thu, 6 Apr 2023 14:28:49 -0500 From: Andrew Davis To: Denys Dmytriyenko , Ryan Eatmon , Randolph Sapp , CC: Andrew Davis Subject: [meta-ti][master/kirkstone][PATCH 5/5] meta-ti-bsp: graphics: Correct dependency chain Date: Thu, 6 Apr 2023 14:28:47 -0500 Message-ID: <20230406192847.7934-5-afd@ti.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230406192847.7934-1-afd@ti.com> References: <20230406192847.7934-1-afd@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 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 ; Thu, 06 Apr 2023 19:28:57 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/16308 Previously the virtual/gpudriver provider would point to the kernel-mode driver, which would cause Mesa libraries to depend on those and not the user-mode driver. It is the user-mode driver that should depend on the kernel-mode driver, not the other way around. The logical dependency chain should be: App -> virtual/libgl -> Mesa -> virtual/gpudriver -> IMG-UM -> IMG-KM Flip the dependency chain so it matches the above. While here make the UM driver depend on, not just recommend, the KM driver as it is not functional with out it. Signed-off-by: Andrew Davis --- meta-ti-bsp/conf/machine/include/am62xx.inc | 2 +- meta-ti-bsp/conf/machine/include/j721e.inc | 2 +- meta-ti-bsp/conf/machine/include/j721s2.inc | 2 +- meta-ti-bsp/conf/machine/include/j784s4.inc | 2 +- .../powervr-drivers/ti-img-rogue-driver_1.18.6276027.bb | 2 -- .../powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb | 2 -- .../libgles/ti-img-rogue-umlibs_1.18.6276027.bb | 5 ++++- .../recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb | 5 +++-- meta-ti-bsp/recipes-graphics/mesa/mesa-gl_22.%.bbappend | 2 +- meta-ti-bsp/recipes-graphics/mesa/mesa_22.%.bbappend | 2 +- meta-ti-bsp/recipes-graphics/mesa/pvr-mesa.inc | 6 +++--- 11 files changed, 16 insertions(+), 16 deletions(-) diff --git a/meta-ti-bsp/conf/machine/include/am62xx.inc b/meta-ti-bsp/conf/machine/include/am62xx.inc index af6a6db4..93151bcf 100644 --- a/meta-ti-bsp/conf/machine/include/am62xx.inc +++ b/meta-ti-bsp/conf/machine/include/am62xx.inc @@ -6,7 +6,7 @@ MACHINE_FEATURES += "screen gpu" SERIAL_CONSOLES = "115200;ttyS2" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" -PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" +PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-umlibs" # Default tiboot3.bin on AM62x is for HS-FS BBMULTICONFIG = "k3r5-hs-fs" diff --git a/meta-ti-bsp/conf/machine/include/j721e.inc b/meta-ti-bsp/conf/machine/include/j721e.inc index 8f9c24e6..05aa7515 100644 --- a/meta-ti-bsp/conf/machine/include/j721e.inc +++ b/meta-ti-bsp/conf/machine/include/j721e.inc @@ -3,7 +3,7 @@ SOC_FAMILY:append = ":j721e" MACHINE_FEATURES += "screen gpu" -PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" +PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-umlibs" # On J721e the file tiboot3.bin comes from the bootloader not ti-sci-fw do_image_wic[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy" diff --git a/meta-ti-bsp/conf/machine/include/j721s2.inc b/meta-ti-bsp/conf/machine/include/j721s2.inc index 70569a16..9a21df49 100644 --- a/meta-ti-bsp/conf/machine/include/j721s2.inc +++ b/meta-ti-bsp/conf/machine/include/j721s2.inc @@ -3,7 +3,7 @@ SOC_FAMILY:append = ":j721s2" MACHINE_FEATURES += "screen gpu" -PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" +PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-umlibs" TFA_BOARD = "generic" diff --git a/meta-ti-bsp/conf/machine/include/j784s4.inc b/meta-ti-bsp/conf/machine/include/j784s4.inc index d03ee4a4..74b64203 100644 --- a/meta-ti-bsp/conf/machine/include/j784s4.inc +++ b/meta-ti-bsp/conf/machine/include/j784s4.inc @@ -3,7 +3,7 @@ SOC_FAMILY:append = ":j784s4" MACHINE_FEATURES += "screen gpu" -PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" +PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-umlibs" TFA_BOARD = "j784s4" diff --git a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.18.6276027.bb b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.18.6276027.bb index 96fb7484..2e2fe1ac 100644 --- a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.18.6276027.bb +++ b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.18.6276027.bb @@ -5,8 +5,6 @@ LIC_FILES_CHKSUM = "file://README;beginline=14;endline=19;md5=0403c7dea01a2b8232 inherit module -PROVIDES = "virtual/gpudriver" - MACHINE_KERNEL_PR:append = "b" PR = "${MACHINE_KERNEL_PR}" 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 bf4fa98a..ed614038 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 @@ -5,8 +5,6 @@ LIC_FILES_CHKSUM = "file://eurasia_km/README;beginline=13;endline=22;md5=74506d9 inherit module -PROVIDES = "virtual/gpudriver" - COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|am65xx" MACHINE_KERNEL_PR:append = "x" diff --git a/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_1.18.6276027.bb b/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_1.18.6276027.bb index 94d14ded..f6f363b0 100644 --- a/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_1.18.6276027.bb +++ b/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_1.18.6276027.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" +PROVIDES = "virtual/gpudriver" + inherit bin_package PACKAGE_ARCH = "${MACHINE_ARCH}" @@ -22,7 +24,8 @@ TARGET_PRODUCT:am62xx = "am62_linux" PVR_BUILD = "release" PVR_WS = "lws-generic" -RDEPENDS:${PN} += "mesa-megadriver libdrm ti-img-rogue-driver" +RDEPENDS:${PN} += "libdrm" +RDEPENDS:${PN} += "ti-img-rogue-driver" do_install:append() { if ${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'true', 'false', d)}; then diff --git a/meta-ti-bsp/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb b/meta-ti-bsp/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb index 755cc4f5..3a91d9c3 100644 --- a/meta-ti-bsp/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb +++ b/meta-ti-bsp/recipes-graphics/libgles/ti-sgx-ddk-um_1.17.4948957.bb @@ -3,6 +3,8 @@ HOMEPAGE = "https://git.ti.com/graphics/omap5-sgx-ddk-um-linux" LICENSE = "TI-TSPA" LIC_FILES_CHKSUM = "file://TI-Linux-Graphics-DDK-UM-Manifest.doc;md5=b17390502bc89535c86cfbbae961a2a8" +PROVIDES = "virtual/gpudriver" + PACKAGE_ARCH = "${MACHINE_ARCH}" COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|am65xx" @@ -35,8 +37,7 @@ def use_initscript(d): inherit ${@oe.utils.ifelse(use_initscript(d), 'update-rc.d', '')} RDEPENDS:${PN} += "libdrm" - -RRECOMMENDS:${PN} += "ti-sgx-ddk-km" +RDEPENDS:${PN} += "ti-sgx-ddk-km" S = "${WORKDIR}/git" diff --git a/meta-ti-bsp/recipes-graphics/mesa/mesa-gl_22.%.bbappend b/meta-ti-bsp/recipes-graphics/mesa/mesa-gl_22.%.bbappend index 912e9e9d..f505a569 100644 --- a/meta-ti-bsp/recipes-graphics/mesa/mesa-gl_22.%.bbappend +++ b/meta-ti-bsp/recipes-graphics/mesa/mesa-gl_22.%.bbappend @@ -1 +1 @@ -require ${@bb.utils.contains_any('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-img-rogue-driver ti-sgx-ddk-km', 'pvr-mesa.inc', '', d)} +require ${@bb.utils.contains_any('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-img-rogue-umlibs ti-sgx-ddk-um', 'pvr-mesa.inc', '', d)} diff --git a/meta-ti-bsp/recipes-graphics/mesa/mesa_22.%.bbappend b/meta-ti-bsp/recipes-graphics/mesa/mesa_22.%.bbappend index 912e9e9d..f505a569 100644 --- a/meta-ti-bsp/recipes-graphics/mesa/mesa_22.%.bbappend +++ b/meta-ti-bsp/recipes-graphics/mesa/mesa_22.%.bbappend @@ -1 +1 @@ -require ${@bb.utils.contains_any('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-img-rogue-driver ti-sgx-ddk-km', 'pvr-mesa.inc', '', d)} +require ${@bb.utils.contains_any('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-img-rogue-umlibs ti-sgx-ddk-um', 'pvr-mesa.inc', '', d)} diff --git a/meta-ti-bsp/recipes-graphics/mesa/pvr-mesa.inc b/meta-ti-bsp/recipes-graphics/mesa/pvr-mesa.inc index 96c484a7..d9e56d84 100644 --- a/meta-ti-bsp/recipes-graphics/mesa/pvr-mesa.inc +++ b/meta-ti-bsp/recipes-graphics/mesa/pvr-mesa.inc @@ -23,8 +23,8 @@ S = "${WORKDIR}/git" SRCREV = "44b82a7b6fa8a86243911b1b0d6a07b0fd8ecfba" PACKAGECONFIG:append = " \ - ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-img-rogue-driver', 'pvr', '', d)} \ - ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-sgx-ddk-km', 'sgx', '', d)} \ + ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-img-rogue-umlibs', 'pvr', '', d)} \ + ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-sgx-ddk-um', 'sgx', '', d)} \ " PVR_DISPLAY_CONTROLLER_ALIAS ??= "tidss" @@ -45,4 +45,4 @@ do_install:append () { rm -rf ${D}${datadir}/pkgconfig } -RRECOMMENDS:mesa-megadriver:append:class-target = " ${@d.getVar('PREFERRED_PROVIDER_virtual/gpudriver')}" +RDEPENDS:mesa-megadriver:append:class-target = " ${@d.getVar('PREFERRED_PROVIDER_virtual/gpudriver')}"