From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 28 Feb 2022 14:42:43 +0100 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nOgIV-00DHSP-1Z for lore@lore.pengutronix.de; Mon, 28 Feb 2022 14:42:43 +0100 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 1nOgIU-000570-4S; Mon, 28 Feb 2022 14:42:42 +0100 Received: from dude03.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::39]) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1nOgHu-00056s-Ef for ptxdist@pengutronix.de; Mon, 28 Feb 2022 14:42:06 +0100 From: Philipp Zabel To: ptxdist@pengutronix.de Date: Mon, 28 Feb 2022 14:42:03 +0100 Message-Id: <20220228134203.1956719-1-p.zabel@pengutronix.de> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Subject: [ptxdist] [PATCH v2] mesalib: enable VA support 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 Enable VA support for radeonsi, r600, and nouveau. Signed-off-by: Philipp Zabel --- Changes since v1: - Fix typo: MESALIB_DIR_NOUVEAU -> MESALIB_DRI_NOUVEAU - Do not build r600 and radeonsi VA drivers on ARM, update bugzilla link to gitlab - Check for missing VA drivers in targetinstall --- rules/mesalib.in | 6 ++++++ rules/mesalib.make | 23 +++++++++++++++++++++-- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/rules/mesalib.in b/rules/mesalib.in index 6737828c72eb..6b3410b40999 100644 --- a/rules/mesalib.in +++ b/rules/mesalib.in @@ -12,6 +12,7 @@ menuconfig MESALIB select GCCLIBS select GCCLIBS_CXX select LIBDRM + select LIBVA if MESALIB_VA select LIBDRM_INTEL if MESALIB_DRI_I915 || MESALIB_DRI_I965 select WAYLAND if MESALIB_EGL_WAYLAND select WAYLAND_PROTOCOLS if MESALIB_EGL_WAYLAND @@ -172,6 +173,11 @@ config MESALIB_GBM bool prompt "GBM" +config MESALIB_VA + bool + depends on MESALIB_DRI_RADEONSI || MESALIB_DRI_R600 || MESALIB_DRI_NOUVEAU + prompt "VA" + comment "Platforms" config MESALIB_EGL_X11 diff --git a/rules/mesalib.make b/rules/mesalib.make index 3dd45667fbdd..f5c0c99b0b4b 100644 --- a/rules/mesalib.make +++ b/rules/mesalib.make @@ -38,7 +38,7 @@ MESALIB_DRI_DRIVERS-$(PTXCONF_MESALIB_DRI_NOUVEAU_VIEUX)+= nouveau MESALIB_DRI_DRIVERS-$(PTXCONF_MESALIB_DRI_R200) += r200 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_ARM # broken: https://gitlab.freedesktop.org/mesa/mesa/-/issues/473 ifndef PTXCONF_ARCH_X86 # needs llvm MESALIB_GALLIUM_DRIVERS-$(PTXCONF_MESALIB_DRI_R300) += r300 endif @@ -127,6 +127,14 @@ MESALIB_LIBS-$(PTXCONF_MESALIB_GBM) += libgbm MESALIBS_EGL_PLATFORMS-$(PTXCONF_MESALIB_EGL_WAYLAND) += wayland MESALIBS_EGL_PLATFORMS-$(PTXCONF_MESALIB_EGL_X11) += x11 +ifdef PTXCONF_MESALIB_VA +ifndef PTXCONF_ARCH_ARM # broken: https://gitlab.freedesktop.org/mesa/mesa/-/issues/473 +MESALIB_DRI_VA_LIBS-$(PTXCONF_MESALIB_DRI_R600) += r600 +MESALIB_DRI_VA_LIBS-$(PTXCONF_MESALIB_DRI_RADEONSI) += radeonsi +endif +MESALIB_DRI_VA_LIBS-$(PTXCONF_MESALIB_DRI_NOUVEAU) += nouveau +endif + MESALIB_CONF_TOOL := meson MESALIB_CONF_OPT := \ $(CROSS_MESON_USR) \ @@ -152,7 +160,7 @@ MESALIB_CONF_OPT := \ -Dgallium-nine=false \ -Dgallium-omx=disabled \ -Dgallium-opencl=disabled \ - -Dgallium-va=disabled \ + -Dgallium-va=$(call ptx/endis, PTXCONF_MESALIB_VA)d \ -Dgallium-vdpau=disabled \ -Dgallium-xa=disabled \ -Dgallium-xvmc=disabled \ @@ -253,6 +261,17 @@ ifneq ($(strip $(MESALIB_DRI_GALLIUM_LIBS-y)),) $(call install_link, mesalib, gallium_dri.so, \ /usr/lib/dri/$(lib)_dri.so)$(ptx/nl)) endif +ifneq ($(strip $(MESALIB_DRI_VA_LIBS-y)),) + @$(call install_copy, mesalib, 0, 0, 0644, \ + $(MESALIB_PKGDIR)/usr/lib/dri/$(firstword $(MESALIB_DRI_VA_LIBS-y))_drv_video.so, \ + /usr/lib/dri/va_dri.so) + + @$(foreach lib, $(MESALIB_DRI_VA_LIBS-y), \ + test -f $(MESALIB_PKGDIR)/usr/lib/dri/$(lib)_drv_video.so || \ + ptxd_bailout "missing va driver $(lib)_drv_video.so"$(ptx/nl) \ + $(call install_link, mesalib, va_dri.so, \ + /usr/lib/dri/$(lib)_drv_video.so)$(ptx/nl)) +endif ifneq ($(strip $(MESALIB_VULKAN_LIBS-y)),) @$(foreach lib, $(MESALIB_VULKAN_LIBS-y), \ -- 2.30.2 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de