On Fri, Feb 25, 2022 at 05:31:32PM +0100, Philipp Zabel wrote: > Enable VA support for radeonsi, r600, and nouveau. > > Signed-off-by: Philipp Zabel <[email protected]> > --- > rules/mesalib.in | 6 ++++++ > rules/mesalib.make | 17 ++++++++++++++++- > 2 files changed, 22 insertions(+), 1 deletion(-) > > diff --git a/rules/mesalib.in b/rules/mesalib.in > index 6737828c72eb..5b7803d1a3d5 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_DIR_NOUVEAU
s/DIR/DRI/ > + prompt "VA" > + > comment "Platforms" > > config MESALIB_EGL_X11 > diff --git a/rules/mesalib.make b/rules/mesalib.make > index 3dd45667fbdd..ed349b7939b0 100644 > --- a/rules/mesalib.make > +++ b/rules/mesalib.make > @@ -127,6 +127,12 @@ 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 > +MESALIB_DRI_VA_LIBS-$(PTXCONF_MESALIB_DRI_R600) += r600 > +MESALIB_DRI_VA_LIBS-$(PTXCONF_MESALIB_DRI_RADEONSI) += radeonsi The gallium drivers for those are only built on x86. I think they failed to build on ARM. I have no idea if that is still necessary. Either way, the logic here and for the gallium drivers must match. > +MESALIB_DRI_VA_LIBS-$(PTXCONF_MESALIB_DRI_NOUVEAU) += nouveau > +endif > + > MESALIB_CONF_TOOL := meson > MESALIB_CONF_OPT := \ > $(CROSS_MESON_USR) \ > @@ -152,7 +158,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 +259,15 @@ 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), \ Please add a check if the driver is actually built. Like we have for the gallium drivers. Michael > + $(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 > [email protected] > To unsubscribe, send a mail with subject "unsubscribe" to > [email protected] > -- 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 [email protected] To unsubscribe, send a mail with subject "unsubscribe" to [email protected]
