From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 15 Oct 2021 15:35:46 +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 1mbNNC-0007kM-RK for lore@lore.pengutronix.de; Fri, 15 Oct 2021 15:35:46 +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 1mbNNC-0008QS-Hr; Fri, 15 Oct 2021 15:35:46 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mbNN6-0008Q0-UA; Fri, 15 Oct 2021 15:35:40 +0200 Received: from [2a0a:edc0:0:1101:1d::39] (helo=dude03.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1mbNN6-00014p-9q; Fri, 15 Oct 2021 15:35:40 +0200 Received: from mol by dude03.red.stw.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1mbNN6-009Xes-6e; Fri, 15 Oct 2021 15:35:40 +0200 Date: Fri, 15 Oct 2021 15:35:40 +0200 From: Michael Olbrich To: Christian Melki Message-ID: <20211015133540.GG2239952@pengutronix.de> Mail-Followup-To: Christian Melki , ptxdist@pengutronix.de References: <20211011174744.946882-1-christian.melki@t2data.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20211011174744.946882-1-christian.melki@t2data.com> X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-IRC: #ptxdist @freenode X-Accept-Language: de,en X-Accept-Content-Type: text/plain User-Agent: Mutt/1.10.1 (2018-07-13) Subject: Re: [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 Cc: 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 On Mon, Oct 11, 2021 at 07:47:44PM +0200, Christian Melki wrote: > Was missing VIRGL and SVGA from the gallium libs list. > Used with QEMU amongst other things. Please split out this part. > Also fix the library paths used by various libs. > Let them follow CROSS_LIB_DIR. This part will probably not be necessary in the end depending on the outcome of out other discussion. Michael > 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 > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de