From patchwork Thu May 5 17:44:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 7655 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 1F976C433FE for ; Thu, 5 May 2022 17:44:39 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web09.184.1651772675529184728 for ; Thu, 05 May 2022 10:44:36 -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 AB09E40C16; Thu, 5 May 2022 17:44:34 +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 zmxjR97wx-Tf; Thu, 5 May 2022 17:44:34 +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 83B8140A3D; Thu, 5 May 2022 17:44:33 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 8A6DB17491D; Thu, 5 May 2022 13:44:31 -0400 (EDT) From: Denys Dmytriyenko To: meta-ti@lists.yoctoproject.org Cc: Denys Dmytriyenko Subject: [master][PATCH 2/5] conf/machine: add preferences for 3D graphics providers Date: Thu, 5 May 2022 17:44:19 +0000 Message-Id: <20220505174422.334666-2-denis@denix.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220505174422.334666-1-denis@denix.org> References: <20220505174422.334666-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 ; Thu, 05 May 2022 17:44:39 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-ti/message/14710 From: Denys Dmytriyenko Specify default 3D GLES/EGL providers for platforms using SGX and Rogue GPUs, both kernel and user-space components. Signed-off-by: Denys Dmytriyenko --- meta-ti-bsp/conf/machine/include/am62xx.inc | 6 ++++++ meta-ti-bsp/conf/machine/include/am65xx.inc | 6 ++++++ meta-ti-bsp/conf/machine/include/j721e.inc | 6 ++++++ meta-ti-bsp/conf/machine/include/j721s2.inc | 6 ++++++ meta-ti-bsp/conf/machine/include/omap-a15.inc | 5 +++++ meta-ti-bsp/conf/machine/include/ti33x.inc | 5 +++++ meta-ti-bsp/conf/machine/include/ti43x.inc | 5 +++++ 7 files changed, 39 insertions(+) diff --git a/meta-ti-bsp/conf/machine/include/am62xx.inc b/meta-ti-bsp/conf/machine/include/am62xx.inc index 56cd7c20..ce768895 100644 --- a/meta-ti-bsp/conf/machine/include/am62xx.inc +++ b/meta-ti-bsp/conf/machine/include/am62xx.inc @@ -6,6 +6,12 @@ MACHINE_FEATURES += "screen touchscreen gpu" SERIAL_CONSOLES = "115200;ttyS2" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" +PREFERRED_PROVIDER_virtual/egl = "ti-img-rogue-umlibs" +PREFERRED_PROVIDER_virtual/libgles1 = "ti-img-rogue-umlibs" +PREFERRED_PROVIDER_virtual/libgles2 = "ti-img-rogue-umlibs" +PREFERRED_PROVIDER_virtual/libgbm = "ti-img-rogue-umlibs" +PREFERRED_PROVIDER_virtual/gpudriver = "ti-img-rogue-driver" + # AM62 supports multi-certificate images, use the same IMAGE_BOOT_FILES = "${IMAGE_BOOT_FILES_MULTI_CERT}" diff --git a/meta-ti-bsp/conf/machine/include/am65xx.inc b/meta-ti-bsp/conf/machine/include/am65xx.inc index 111ef96f..b71b4686 100644 --- a/meta-ti-bsp/conf/machine/include/am65xx.inc +++ b/meta-ti-bsp/conf/machine/include/am65xx.inc @@ -6,6 +6,12 @@ MACHINE_FEATURES += "screen touchscreen gpu" SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" +PREFERRED_PROVIDER_virtual/egl = "ti-sgx-ddk-um" +PREFERRED_PROVIDER_virtual/libgles1 = "ti-sgx-ddk-um" +PREFERRED_PROVIDER_virtual/libgles2 = "ti-sgx-ddk-um" +PREFERRED_PROVIDER_virtual/libgbm = "ti-sgx-ddk-um" +PREFERRED_PROVIDER_virtual/gpudriver = "ti-sgx-ddk-km" + KERNEL_DEVICETREE = " \ ti/k3-am654-base-board.dtb \ ti/k3-am654-base-board-sr1.dtbo \ diff --git a/meta-ti-bsp/conf/machine/include/j721e.inc b/meta-ti-bsp/conf/machine/include/j721e.inc index d965327c..85952d32 100644 --- a/meta-ti-bsp/conf/machine/include/j721e.inc +++ b/meta-ti-bsp/conf/machine/include/j721e.inc @@ -2,3 +2,9 @@ require conf/machine/include/j7.inc SOC_FAMILY:append = ":j721e" MACHINE_FEATURES += "gpu" + +PREFERRED_PROVIDER_virtual/egl = "ti-img-rogue-umlibs" +PREFERRED_PROVIDER_virtual/libgles1 = "ti-img-rogue-umlibs" +PREFERRED_PROVIDER_virtual/libgles2 = "ti-img-rogue-umlibs" +PREFERRED_PROVIDER_virtual/libgbm = "ti-img-rogue-umlibs" +PREFERRED_PROVIDER_virtual/gpudriver = "ti-img-rogue-driver" diff --git a/meta-ti-bsp/conf/machine/include/j721s2.inc b/meta-ti-bsp/conf/machine/include/j721s2.inc index 06654179..65b39118 100644 --- a/meta-ti-bsp/conf/machine/include/j721s2.inc +++ b/meta-ti-bsp/conf/machine/include/j721s2.inc @@ -2,3 +2,9 @@ require conf/machine/include/j7.inc SOC_FAMILY:append = ":j721s2" MACHINE_FEATURES += "gpu" + +PREFERRED_PROVIDER_virtual/egl = "ti-img-rogue-umlibs" +PREFERRED_PROVIDER_virtual/libgles1 = "ti-img-rogue-umlibs" +PREFERRED_PROVIDER_virtual/libgles2 = "ti-img-rogue-umlibs" +PREFERRED_PROVIDER_virtual/libgbm = "ti-img-rogue-umlibs" +PREFERRED_PROVIDER_virtual/gpudriver = "ti-img-rogue-driver" diff --git a/meta-ti-bsp/conf/machine/include/omap-a15.inc b/meta-ti-bsp/conf/machine/include/omap-a15.inc index 94ecab34..7cff38dc 100644 --- a/meta-ti-bsp/conf/machine/include/omap-a15.inc +++ b/meta-ti-bsp/conf/machine/include/omap-a15.inc @@ -10,6 +10,11 @@ MACHINE_KERNEL_PR = "r7" PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging" PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging" PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging" +PREFERRED_PROVIDER_virtual/egl = "ti-sgx-ddk-um" +PREFERRED_PROVIDER_virtual/libgles1 = "ti-sgx-ddk-um" +PREFERRED_PROVIDER_virtual/libgles2 = "ti-sgx-ddk-um" +PREFERRED_PROVIDER_virtual/libgbm = "ti-sgx-ddk-um" +PREFERRED_PROVIDER_virtual/gpudriver = "ti-sgx-ddk-km" KERNEL_IMAGETYPE = "zImage" KERNEL_IMAGETYPES = "zImage uImage" diff --git a/meta-ti-bsp/conf/machine/include/ti33x.inc b/meta-ti-bsp/conf/machine/include/ti33x.inc index 083a24b6..2f493404 100644 --- a/meta-ti-bsp/conf/machine/include/ti33x.inc +++ b/meta-ti-bsp/conf/machine/include/ti33x.inc @@ -20,6 +20,11 @@ MACHINE_KERNEL_PR = "r22" PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging" PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging" PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging" +PREFERRED_PROVIDER_virtual/egl = "ti-sgx-ddk-um" +PREFERRED_PROVIDER_virtual/libgles1 = "ti-sgx-ddk-um" +PREFERRED_PROVIDER_virtual/libgles2 = "ti-sgx-ddk-um" +PREFERRED_PROVIDER_virtual/libgbm = "ti-sgx-ddk-um" +PREFERRED_PROVIDER_virtual/gpudriver = "ti-sgx-ddk-km" KERNEL_IMAGETYPE = "zImage" diff --git a/meta-ti-bsp/conf/machine/include/ti43x.inc b/meta-ti-bsp/conf/machine/include/ti43x.inc index 8757b545..3d69e453 100644 --- a/meta-ti-bsp/conf/machine/include/ti43x.inc +++ b/meta-ti-bsp/conf/machine/include/ti43x.inc @@ -23,6 +23,11 @@ MACHINE_KERNEL_PR = "r3" PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging" PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging" PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging" +PREFERRED_PROVIDER_virtual/egl = "ti-sgx-ddk-um" +PREFERRED_PROVIDER_virtual/libgles1 = "ti-sgx-ddk-um" +PREFERRED_PROVIDER_virtual/libgles2 = "ti-sgx-ddk-um" +PREFERRED_PROVIDER_virtual/libgbm = "ti-sgx-ddk-um" +PREFERRED_PROVIDER_virtual/gpudriver = "ti-sgx-ddk-km" KERNEL_IMAGETYPE = "zImage"