From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 11 Oct 2021 19:48:37 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1mZzPh-0006jC-Jx for lore@lore.pengutronix.de; Mon, 11 Oct 2021 19:48:37 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1mZzPh-0004zG-6C; Mon, 11 Oct 2021 19:48:37 +0200 Received: from mail-eopbgr20074.outbound.protection.outlook.com ([40.107.2.74] helo=EUR02-VE1-obe.outbound.protection.outlook.com) by metis.ext.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mZzP3-0004yw-3Q for ptxdist@pengutronix.de; Mon, 11 Oct 2021 19:47:58 +0200 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fOuaak68JT2EWzdwyRaBkSHqA24P/fYiz+d85LQ8DIwQbcmCkTzcMxkN+sj8WaUUwMZbQNwHbLCOOYslW6dXQixzm57r8H7eJKzbROi8Ywu54p4s7EkR9lFM4oGsXADPbiKj3wa79hxJDVg/vdNRpN/V5xb1RFQLzWTaa5n3iEWub7AjhzcGLoYUGLmJVdOWFKzbNmEgvsh8p4U4JUoHl5gTAX4He15sENnsQjJ8nkdaThX1qM9MpzF1A4UwdqOfuNJcdleFbpHzs2Bo2MVjE4kXsralU1axyQwBaoNW3OEzOcEtRZDmXRqRXguA7NlrLeK+SHnYqiig3Cn5m4pNDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=w3Is0dJvHmRvE9dO/3HKQA74IhpgZBbMP6ercFtYSh4=; b=O3yj4EfnVmSblg/yRvVpcu3DI4KydiAaydzATuEjUz3QEJ/u4wXjyB+PDwVcXf8XFxxj3EgtX8YNuMJ1+t3hJ2X+G9mulqEsOKI8tlBx0ULQCwsuIeR4CaJlTeE3h3zOajOIO0F7lcJf5NvrXdact0mgyCc7HwicdQ+8T6ylcu9XoZ2sB2MUdRj2JgMAhpL1GfO6EqcDn1aJAar3NnTRiRWznKAdEewri2gYfJJ5a/3eqiUJsSZATgRgIyxCJo67WNZPcXJQdtKw3JOdSaAOztxmQkRT/p1cr/OzxXPo4tX3HofTLULOo9recpLkKBqbxlqiUQeyfDtWfY8u1qiCog== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=t2data.com; dmarc=pass action=none header.from=t2data.com; dkim=pass header.d=t2data.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=t2datacom.onmicrosoft.com; s=selector1-t2datacom-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=w3Is0dJvHmRvE9dO/3HKQA74IhpgZBbMP6ercFtYSh4=; b=UZJS1a0EFpXVfWM8g6SUT6ykC4EJEiUhb4mkmn1NNGYxyFo84VvdwTBg0XRqUspNH6OrdHKXqNvV2z1CuWDRPjQbEh+t0jM5HRH67pyCH047TNbTZhIXWh5txO9uqsjeojsb/NUkEyuNDCCJr3KO3kQ5mGeXpo1+kZsdKAZfCmM= Authentication-Results: pengutronix.de; dkim=none (message not signed) header.d=none;pengutronix.de; dmarc=none action=none header.from=t2data.com; Received: from AS8P251MB0167.EURP251.PROD.OUTLOOK.COM (2603:10a6:20b:403::21) by AS8P251MB0263.EURP251.PROD.OUTLOOK.COM (2603:10a6:20b:349::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.19; Mon, 11 Oct 2021 17:47:55 +0000 Received: from AS8P251MB0167.EURP251.PROD.OUTLOOK.COM ([fe80::dd37:4003:79e5:4b70]) by AS8P251MB0167.EURP251.PROD.OUTLOOK.COM ([fe80::dd37:4003:79e5:4b70%7]) with mapi id 15.20.4587.026; Mon, 11 Oct 2021 17:47:55 +0000 From: Christian Melki To: ptxdist@pengutronix.de Date: Mon, 11 Oct 2021 19:47:44 +0200 Message-Id: <20211011174744.946882-1-christian.melki@t2data.com> X-Mailer: git-send-email 2.30.2 X-ClientProxiedBy: HE1PR05CA0186.eurprd05.prod.outlook.com (2603:10a6:3:f8::34) To AS8P251MB0167.EURP251.PROD.OUTLOOK.COM (2603:10a6:20b:403::21) MIME-Version: 1.0 Received: from plaid.hq.t2data.com (212.247.174.226) by HE1PR05CA0186.eurprd05.prod.outlook.com (2603:10a6:3:f8::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.18 via Frontend Transport; Mon, 11 Oct 2021 17:47:55 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f1aa86d9-c693-4f23-18ec-08d98cdf415d X-MS-TrafficTypeDiagnostic: AS8P251MB0263: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3968; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6y8JmQWswvUctSqZGXOUaRq74DLvOIofaZecpKPLRxleeJs7OHdAQdmmZ+ciuuDbYJEXIkXZtRT5iN7hrgPdmr915VsqZy6zR26I77Crg//khHmwXMNN4g3ppK7NZchm+XN1S0rw8A2r/y5tOJ4pxe9HS4SPkx0+oPguKF94Z/T5p/MdNx/K6uHLppuWNsRGx7Mm0GeZ8b3wGxC301qTqT0D6Q2sWZkExGQ8Z6r/y2pfER8tTHyFsbiK35e+If2FEpB0q/RNXvl6fw/2buUR23hnf/tKgiDt6Wn6hZStl0Y0pMIJ9U3LVAPuaX8HfMTOgehpzlgvz+SAY9SyU6s4sLtHFJ8ebFyyt939gXtM65ZUITJ62eC6QgCuqo0PmZNby+NWYnlRdRp9KepzOMnIMyvltMpbIHKhjGOWqLO96kRxyW8oyL0rrEEqNqfHs834kKfBCnKjhkzBeqcKEOGhRBmk/KPJvroqlvBxQFZ/IAhkRvte1JrosI8JqSb8ZJib7WZAkrSn/DATTJlKFQT6t03h7Sws6pDVRh6PgIkLHwB1sHBr+PaZ6JhdxJgvvAOnMWR3fS44VK+SvsSEsVbpkIGCcgaMtbgkfaXTIMNgcNIOtEZbDZ4vq9JLUF4NQ9LjTa0IK/jqGKljPbJXxVLGfZpmGgOQYb6Uh5NUxOCbdNoyTZgwmsplCraUOr+6JMz7w9p0zI2QyacHyQlpyXzx1A== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AS8P251MB0167.EURP251.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(42606007)(39830400003)(136003)(376002)(366004)(396003)(346002)(186003)(6666004)(966005)(66946007)(86362001)(66556008)(66476007)(508600001)(6486002)(8936002)(26005)(956004)(316002)(52116002)(7696005)(2616005)(8676002)(2906002)(44832011)(5660300002)(38100700002)(38350700002)(6916009)(1076003)(83380400001)(36756003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?wp387KmWhIClOnNXZCpb7A2QBea4eAy7Hcfxd4/E1KVca9JTRDgmabhh9QMS?= =?us-ascii?Q?pgura/DkMzecCP/rLgaF8ES3m2leqAOW7JV7vNRrSjoM7Tl9rO2V6sSGmfPG?= =?us-ascii?Q?rRai8k1ZGs9dm+4IHFwSEl0W3tNz5dzUO4AfUUDIX+ETOHfALlkjLaFsyhRg?= =?us-ascii?Q?ZUzIZgIR0bJiT5OK9VQylFwljO4tqK57S7x/64wV6X5Od0W3MV0tFkh1MjNN?= =?us-ascii?Q?rjqia24K5MYMupux7JGmi3YD5mHz3SiTXHn2SK0fwb/cN4SOBPH7AZ8sYLHq?= =?us-ascii?Q?qoxvR/KszEENlxx0XYC6+qqrx5RUv1GH9eBvOJx22BN4zWgckxXuQXaIsLwJ?= =?us-ascii?Q?xO1qIjn88dqoEpXIvXOof5zCkMfpl9BK4+gX82rvI1hzmTqgGbu+n7qFf1zh?= =?us-ascii?Q?j+g8tbLysuCmeFEsR8+/vxFPcovh618oZ7wga9sheqUmto3uh1KXDIiIZphC?= =?us-ascii?Q?EAzL/bUChTi9LpjXM+h06FLY2fsmjxQoZU174A55X+H3GI6qML1UBTIQk1Kr?= =?us-ascii?Q?1ygC7MOqfGfNQcKtnGgIfPRnB8VUdV3nHKgmxvr18sGo+I0yWf3zPEQeKzMc?= =?us-ascii?Q?obV5W6APh+HNzaVg2vpRblySd3UqdOzvoxFnGeFaKE1YmD4QALV1Sm5V9P2v?= =?us-ascii?Q?hwlrM+3esskemCX3uyfjB53+nEkbkyFT8pD8f/idP8TF93YOyVQZYh+4aIPv?= =?us-ascii?Q?wP5kj8d4gy056qFAoHg0FXhTUXcyFBxj3rrnhfLP0AEKjGCy3u6y2qUiM2fV?= =?us-ascii?Q?EXTRIApRQdVYM7Paz3pMCOcEq88VzBBa/FXDG3kUJBP8wU8BwDwttX4MBjKb?= =?us-ascii?Q?XaBwl6qBJ+3oe4qMJEjnceBgje6zkN84GCkF1uGVHf4P/aAnO3ajqMI4Aws6?= =?us-ascii?Q?Z9+5CKF4EGIsbUj353f16kONjD0jp9YXQ1EbzoRBuW5cymCJra4xjt05l5Qz?= =?us-ascii?Q?Ur0T8KaTYHDinZ5pd5v4XGoQ11At99Y9T6zo0z99u2SaUGSKZCOiqlvpZGCc?= =?us-ascii?Q?hl43hQADQjjkqRDwcwvqBZzvmBfTnhBurq0cD8rFcc0L7oFB1HmMDjs069p/?= =?us-ascii?Q?heKCPewuOQeRMGq2ZJGss4uvP97HMzZkcP3pUumTly7gpOvUTNH/n/IlyWZ1?= =?us-ascii?Q?vPh7W2Ld/TJgIl/PeDBlSsnYSIP+NeBlnrCsHuLAIeu/XVsnP+QF/XyVjg9d?= =?us-ascii?Q?bbOujvk19tdwI4Zafl/ds8DB3QwHDC2uSODmP6SLpjsYkmqovX+v2VU+3Rzo?= =?us-ascii?Q?0M2jgLcHUCFDnhsct47jYze4B2XqoZDCxS7KI27JUtH4ckbzAZPdcJAGmmfu?= =?us-ascii?Q?660yWsOP6nAstYQFff+wl/Uz?= X-OriginatorOrg: t2data.com X-MS-Exchange-CrossTenant-Network-Message-Id: f1aa86d9-c693-4f23-18ec-08d98cdf415d X-MS-Exchange-CrossTenant-AuthSource: AS8P251MB0167.EURP251.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Oct 2021 17:47:55.3156 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 27928da5-aacd-4ba1-9566-c748a6863e6c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: iTAhpcgPicSIzK8VpGkPKtGWjr1Z7Z5ufmqSOpi6ia9sSmesSkiybfogF9js1Pg8Tg4HtItDQbxbKPsA13P7kapOr59DhE9EEMYRTPoHpUU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8P251MB0263 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-2.8 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,MSGID_FROM_MTA_HEADER,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH] mesalib: Add VIRGL, SVGA and fix library paths. X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false Was missing VIRGL and SVGA from the gallium libs list. Used with QEMU amongst other things. Also fix the library paths used by various libs. Let them follow CROSS_LIB_DIR. Signed-off-by: Christian Melki --- rules/mesalib.in | 8 ++++++++ rules/mesalib.make | 31 ++++++++++++++++++------------- 2 files changed, 26 insertions(+), 13 deletions(-) diff --git a/rules/mesalib.in b/rules/mesalib.in index b9fd1d3c8..a2644408c 100644 --- a/rules/mesalib.in +++ b/rules/mesalib.in @@ -93,6 +93,14 @@ config MESALIB_DRI_KMSRO bool prompt "KMS renderonly" +config MESALIB_DRI_SVGA + bool + prompt "SVGA" + +config MESALIB_DRI_VIRGL + bool + prompt "VIRGL" + config MESALIB_DRI_FREEDRENO bool prompt "Freedreno" diff --git a/rules/mesalib.make b/rules/mesalib.make index 574d7bdf9..729d7d48d 100644 --- a/rules/mesalib.make +++ b/rules/mesalib.make @@ -38,6 +38,8 @@ MESALIB_DRI_DRIVERS-$(PTXCONF_MESALIB_DRI_NOUVEAU_VIEUX)+= nouveau MESALIB_DRI_DRIVERS-$(PTXCONF_MESALIB_DRI_R200) += r200 MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_KMSRO) += kmsro +MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_SVGA) += svga +MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_VIRGL) += virgl ifndef PTXCONF_ARCH_ARM # broken: https://bugs.freedesktop.org/show_bug.cgi?id=72064 ifndef PTXCONF_ARCH_X86 # needs llvm MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_R300) += r300 @@ -69,6 +71,8 @@ MESALIB_DRI_LIBS-y = \ MESALIB_DRI_GALLIUM_LIBS-y = \ $(subst kmsro, \ + kms_swrast \ + virgl \ armada-drm \ exynos \ hx8357d \ @@ -87,7 +91,8 @@ MESALIB_DRI_GALLIUM_LIBS-y = \ st7735r \ stm \ sun4i-drm \ - ,$(subst freedreno,kgsl,$(MESALIB_GALLIUM_DRIVERS-y))) + ,$(subst freedreno,kgsl \ + ,$(subst svga,vmwgfx, $(MESALIB_GALLIUM_DRIVERS-y)))) ifdef PTXCONF_ARCH_X86 MESALIB_VULKAN_DRIVERS-$(PTXCONF_MESALIB_VULKAN_AMD) += amd @@ -125,12 +130,12 @@ MESALIB_CONF_OPT := \ -Dbuild-aco-tests=false \ -Dbuild-tests=false \ -Dcustom-shader-replacement= \ - -Dd3d-drivers-path=/usr/lib/d3d \ + -Dd3d-drivers-path=/usr/$(CROSS_LIB_DIR)/d3d \ -Ddatasources=auto \ -Ddraw-use-llvm=true \ -Ddri-drivers=$(subst $(space),$(comma),$(MESALIB_DRI_DRIVERS-y)) \ - -Ddri-drivers-path=/usr/lib/dri \ - -Ddri-search-path=/usr/lib/dri \ + -Ddri-drivers-path=/usr/$(CROSS_LIB_DIR)/dri \ + -Ddri-search-path=/usr/$(CROSS_LIB_DIR)/dri \ -Ddri3=$(call ptx/endis, PTXCONF_MESALIB_DRI3)d \ -Degl=$(call ptx/endis, PTXCONF_MESALIB_EGL)d \ -Degl-lib-suffix= \ @@ -163,7 +168,7 @@ MESALIB_CONF_OPT := \ -Dlmsensors=$(call ptx/endis, PTXCONF_MESALIB_LMSENSORS)d \ -Dmicrosoft-clc=disabled \ -Dmoltenvk-dir= \ - -Domx-libs-path=/usr/lib/dri \ + -Domx-libs-path=/usr/$(CROSS_LIB_DIR)/dri \ -Dopencl-native=false \ -Dopencl-spirv=false \ -Dopengl=$(call ptx/truefalse, PTXCONF_MESALIB_OPENGL) \ @@ -187,14 +192,14 @@ MESALIB_CONF_OPT := \ -Dstatic-libclc=[] \ -Dswr-arches=[] \ -Dtools=[] \ - -Dva-libs-path=/usr/lib/dri \ + -Dva-libs-path=/usr/$(CROSS_LIB_DIR)/dri \ -Dvalgrind=disabled \ - -Dvdpau-libs-path=/usr/lib/vdpau \ + -Dvdpau-libs-path=/usr/$(CROSS_LIB_DIR)/vdpau \ -Dvulkan-drivers=$(subst $(space),$(comma),$(MESALIB_VULKAN_DRIVERS-y)) \ -Dvulkan-icd-dir=/etc/vulkan/icd.d \ -Dvulkan-layers=$(subst $(space),$(comma),$(MESALIB_VULKAN_LAYERS-y)) \ -Dxlib-lease=$(call ptx/endis, PTXCONF_MESALIB_EGL_X11)d \ - -Dxvmc-libs-path=/usr/lib \ + -Dxvmc-libs-path=/usr/$(CROSS_LIB_DIR) \ -Dzlib=enabled \ -Dzstd=$(call ptx/endis, PTXCONF_MESALIB_SHADER_CACHE)d @@ -230,22 +235,22 @@ $(STATEDIR)/mesalib.targetinstall: @$(foreach lib, $(MESALIB_DRI_LIBS-y), \ $(call install_copy, mesalib, 0, 0, 0644, -, \ - /usr/lib/dri/$(lib)_dri.so)$(ptx/nl)) + /usr/$(CROSS_LIB_DIR)/dri/$(lib)_dri.so)$(ptx/nl)) ifneq ($(strip $(MESALIB_DRI_GALLIUM_LIBS-y)),) @$(call install_copy, mesalib, 0, 0, 0644, \ - $(MESALIB_PKGDIR)/usr/lib/dri/$(firstword $(MESALIB_DRI_GALLIUM_LIBS-y))_dri.so, \ - /usr/lib/dri/gallium_dri.so) + $(MESALIB_PKGDIR)/usr/$(CROSS_LIB_DIR)/dri/$(firstword $(MESALIB_DRI_GALLIUM_LIBS-y))_dri.so, \ + /usr/$(CROSS_LIB_DIR)/dri/gallium_dri.so) @$(foreach lib, $(MESALIB_DRI_GALLIUM_LIBS-y), \ $(call install_link, mesalib, gallium_dri.so, \ - /usr/lib/dri/$(lib)_dri.so)$(ptx/nl)) + /usr/$(CROSS_LIB_DIR)/dri/$(lib)_dri.so)$(ptx/nl)) endif ifneq ($(strip $(MESALIB_VULKAN_LIBS-y)),) @$(foreach lib, $(MESALIB_VULKAN_LIBS-y), \ $(call install_copy, mesalib, 0, 0, 0644, -, \ - /usr/lib/libvulkan_$(lib).so)$(ptx/nl) \ + /usr/$(CROSS_LIB_DIR)/libvulkan_$(lib).so)$(ptx/nl) \ $(call install_glob, mesalib, 0, 0, -, \ /etc/vulkan/icd.d, */$(lib)_icd.*.json)$(ptx/nl)) endif -- 2.30.2 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de