From patchwork Sat Jun 12 22:30:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 1491353 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=KUQ3ibM3; dkim-atps=neutral Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4G2XV531yHz9sWk for ; Sun, 13 Jun 2021 08:30:37 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 5CEF760788; Sat, 12 Jun 2021 22:30:35 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id MwGxKPjPDxVc; Sat, 12 Jun 2021 22:30:34 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id 9B7366062A; Sat, 12 Jun 2021 22:30:33 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 78A891BF2A9 for ; Sat, 12 Jun 2021 22:30:19 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 679A96062A for ; Sat, 12 Jun 2021 22:30:19 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7WaUUO0aaui2 for ; Sat, 12 Jun 2021 22:30:17 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) by smtp3.osuosl.org (Postfix) with ESMTPS id DC867605B2 for ; Sat, 12 Jun 2021 22:30:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1623537012; bh=LuOofSk4rzSsNs2fXHHU7V1RQKK2jSSWRazsENpK2TQ=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=KUQ3ibM3VKzbyIKjCDF2YRTF/gaGTs9I5YIcw6EbSdKx5hvUnzB1SolrWp/znXSJ7 afnlceNjmRnc+G2nb2z+1F0g+n7htIAuCnJ0joXDXeVd33VkU2ZFzgLLPhZaIv+zjs +vpOv5eUf5OA/b7/JF1h30EPxUswvg5ukItunBtw= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.fritz.box ([62.216.208.96]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1N7QxB-1lFa2b1qkH-017p0d; Sun, 13 Jun 2021 00:30:12 +0200 From: Peter Seiderer To: buildroot@buildroot.org Date: Sun, 13 Jun 2021 00:30:10 +0200 Message-Id: <20210612223011.26118-1-ps.report@gmx.net> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-Provags-ID: V03:K1:qh746AD9mOIoQAYANvXW+wP0VA9Dv9GMSJ/80P2m6KQIsIEg/87 ngjMBHamWW6KSTgfZjtItaWZN9BAcpowsAVMTFR9uQaijNbouzVtZl4nLyz62jnHbVOIph7 svbqtD/D3tuqE+ZF54eDXjIWCbFWEAXrR36A4V6jvisbqRyzWQmYLiAj71yTGXnZB5+mdy0 zfJyfrptpVL5XC6O8EdDA== X-UI-Out-Filterresults: notjunk:1;V03:K0:OUyFxZ6lo4c=:d7+eMxVsID5yWUSobsq46L ewuetQ62huBTpmqILxy7cmRk4lglP7JySLrwBtxPqyU8sBUXaPspxYq4YTJx3VOR6/fbZXmwS sXooUbk87LYqbEgPf47fC5kirL0H4fBL1JjeoAgi1vnPm1UOF1OQDcsskB0JsG9cYTkmGEp/z McRluEvM7P7fvzE2aO09AI5pFfe24lq5njDu4rO1LNlAo+q/B/96YcTzMdVLGKW/ao4aQmkq7 cgex6Ccpkz68tt0vw2xyoBhQ2uclHaSDW5e/9mWhtHNm03daRSv15Q9ZJ+OhO7bgrwl+WiWnQ FztF0poBO4EJqfMPfNEf5sRQ0lO36USu7L6F3NrwQQHmDzTTYPk9GT5BHW0QF8nAtQcV/CnXT kIUIwugHo6d25b9At4rI8OhW+EkKE7OGdwTAflaAY9DVIm8ha9Wnym4cluipVJsS1oyUUbF5n HbYkw9lcyxW3CtUe8J8hPZi22jiti9g/w6CaQ4CL3BSnU3kifora/dNeAvobTt4/13p1CC5Vr ImA45SbYluiwd21axUW6oYCF1CyAlq9mYnr4ijyqOEGyAQt/h0ybIT9Ft3JCuXIxQ2aeCtbjt kO9l9Y07F9zFd8zMrmgXY5oSTLniNvBfyNE6OP9cBo12ITr0PzxOpDuK0wWvXIdhR8qhDz2X5 8voAchxip5iSOubELFGvpUe0Xz47/7sKeHcF47hRFrHq5cdTHPtu/Y/Hx3oiVcGcsioxSVphZ iZ8x8b6WDZ1pkSZs9iAwq3wDsVY03ou63WSCjuJAcFNnNVYyn23LVzVeFHGG1Zf936mbbNvLL e1fPUI/+jNn1CEkltf2rPSCeOAGASVlGqSCITcpveSvzUAKOpGKiySLc4VslGL95D/U2qf/c2 Clrpr8WyDSdss+v7pqKs4fxpTg1MelqeK04yrQRQjJZ33t75IO8hbg6YOlR1M6nhzaXUVYtpy EZ1z1kPYYaaBCZV/ddFfX5db7gIzEUh3hTmoKEO+FIsfsWw/hSf1dGz5G9XSnkm/6C+y/yMf6 HH7sguxU114jJ/zH3w6FtWB0VFvH2vmWKkHzA7Dvc2wFAPG5HiGKTIvCHrXQAALV6Rel95rry v3tmsb8bg13MPF8lvjK5eAPQJch/9AymnUe Subject: [Buildroot] [PATCH v1 1/2] package/mesa3d: add config option for DRI3 support X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bernd Kuhls , Marek Kraus , Romain Naour Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Add config option for DRI3 support and use it instead of DRI3 enable/disable logic in *.mk file. Signed-off-by: Peter Seiderer --- package/mesa3d/Config.in | 8 ++++++++ package/mesa3d/mesa3d.mk | 12 +++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index d1b3af2054..36acd9758c 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -16,6 +16,11 @@ menuconfig BR2_PACKAGE_MESA3D if BR2_PACKAGE_MESA3D +config BR2_PACKAGE_MESA3D_DRI3 + bool "Enable DRI3 support" + help + Enable DRI3 support. + # Some Gallium driver needs libelf when built with LLVM support config BR2_PACKAGE_MESA3D_NEEDS_ELFUTILS bool @@ -65,6 +70,8 @@ config BR2_PACKAGE_MESA3D_DRI_DRIVER !BR2_PACKAGE_MESA3D_OPENGL_GLX && \ !BR2_PACKAGE_MESA3D_OPENGL_EGL && \ !BR2_PACKAGE_MESA3D_OSMESA_GALLIUM + select BR2_PACKAGE_MESA3D_DRI3 if \ + (BR2_PACKAGE_XORG7 && BR2_TOOLCHAIN_HAS_SYNC_4) select BR2_PACKAGE_XLIB_LIBXSHMFENCE if \ (BR2_PACKAGE_XORG7 && BR2_TOOLCHAIN_HAS_SYNC_4) @@ -359,6 +366,7 @@ config BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 # memfd.h depends on BR2_TOOLCHAIN_USES_GLIBC # ifunc, static_assert depends on BR2_PACKAGE_XORG7 # xorgproto + select BR2_PACKAGE_MESA3D_DRI3 select BR2_PACKAGE_MESA3D_VULKAN_DRIVER select BR2_PACKAGE_XORGPROTO select BR2_PACKAGE_XLIB_LIBXSHMFENCE diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 5c5f8a33f3..da6e55bf93 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -35,6 +35,12 @@ ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM),y) MESA3D_CONF_OPTS += -Db_asneeded=false endif +ifeq ($(BR2_PACKAGE_MESA3D_DRI3),y) +MESA3D_CONF_OPTS += -Ddri3=enabled +else +MESA3D_CONF_OPTS += -Ddri3=disabled +endif + ifeq ($(BR2_PACKAGE_MESA3D_LLVM),y) MESA3D_DEPENDENCIES += host-llvm llvm MESA3D_MESON_EXTRA_BINARIES += llvm-config='$(STAGING_DIR)/usr/bin/llvm-config' @@ -122,13 +128,10 @@ endif ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),) MESA3D_CONF_OPTS += \ - -Ddri-drivers= -Ddri3=disabled + -Ddri-drivers= else ifeq ($(BR2_PACKAGE_XLIB_LIBXSHMFENCE),y) MESA3D_DEPENDENCIES += xlib_libxshmfence -MESA3D_CONF_OPTS += -Ddri3=enabled -else -MESA3D_CONF_OPTS += -Ddri3=disabled endif MESA3D_CONF_OPTS += \ -Dshared-glapi=enabled \ @@ -142,7 +145,6 @@ MESA3D_CONF_OPTS += \ else MESA3D_DEPENDENCIES += xlib_libxshmfence MESA3D_CONF_OPTS += \ - -Ddri3=enabled \ -Dvulkan-drivers=$(subst $(space),$(comma),$(MESA3D_VULKAN_DRIVERS-y)) endif