* [ptxdist] [PATCH 1/2] libva: drop obsolete GLX support
@ 2022-02-25 16:31 Philipp Zabel
2022-02-25 16:31 ` [ptxdist] [PATCH 2/2] mesalib: enable VA support Philipp Zabel
2022-02-28 12:09 ` [ptxdist] [APPLIED] libva: drop obsolete GLX support Michael Olbrich
0 siblings, 2 replies; 4+ messages in thread
From: Philipp Zabel @ 2022-02-25 16:31 UTC (permalink / raw)
To: ptxdist
This was only required by gstreamer-vaapi1 < 1.16 [1]. Nothing requires
libva GLX support now. Removing it and with it the MESALIB dependencies
allows to enable VA support in Mesa without circular dependencies.
[1] 5384deb0679e ("gstreamer-vaapi1: fix dependency")
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
rules/libva.in | 10 +---------
rules/libva.make | 3 +--
2 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/rules/libva.in b/rules/libva.in
index 8dd2229030fe..b0ba96e5c698 100644
--- a/rules/libva.in
+++ b/rules/libva.in
@@ -4,12 +4,9 @@ menuconfig LIBVA
tristate
select HOST_MESON
select LIBDRM
- select XORG_LIB_X11 if LIBVA_X11 || LIBVA_GLX
+ select XORG_LIB_X11 if LIBVA_X11
select XORG_LIB_XEXT if LIBVA_X11
select XORG_LIB_XFIXES if LIBVA_X11
- select MESALIB if LIBVA_GLX
- select MESALIB_GLX if LIBVA_GLX
- select MESALIB_OPENGL if LIBVA_GLX
select WAYLAND if LIBVA_WAYLAND
prompt "libva "
help
@@ -21,11 +18,6 @@ config LIBVA_X11
bool
prompt "X11 API support"
-config LIBVA_GLX
- bool
- select LIBVA_X11
- prompt "GLX API support"
-
config LIBVA_WAYLAND
bool
prompt "Wayland API support"
diff --git a/rules/libva.make b/rules/libva.make
index 7649bbb0ba97..7a16a188d820 100644
--- a/rules/libva.make
+++ b/rules/libva.make
@@ -31,7 +31,6 @@ LIBVA_LICENSE_FILES := \
LIBVA_ENABLE-y := drm
LIBVA_ENABLE-$(PTXCONF_LIBVA_X11) += x11
-LIBVA_ENABLE-$(PTXCONF_LIBVA_GLX) += glx
LIBVA_ENABLE-$(PTXCONF_LIBVA_WAYLAND) += wayland
LIBVA_CONF_TOOL := meson
@@ -41,7 +40,7 @@ LIBVA_CONF_OPT := \
-Ddriverdir='' \
-Denable_docs=false \
-Denable_va_messaging=true \
- -Dwith_glx=$(call ptx/yesno, PTXCONF_LIBVA_GLX) \
+ -Dwith_glx=no \
-Dwith_wayland=$(call ptx/yesno, PTXCONF_LIBVA_WAYLAND) \
-Dwith_x11=$(call ptx/yesno, PTXCONF_LIBVA_X11)
--
2.30.2
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 4+ messages in thread
* [ptxdist] [PATCH 2/2] mesalib: enable VA support
2022-02-25 16:31 [ptxdist] [PATCH 1/2] libva: drop obsolete GLX support Philipp Zabel
@ 2022-02-25 16:31 ` Philipp Zabel
2022-02-28 7:01 ` Michael Olbrich
2022-02-28 12:09 ` [ptxdist] [APPLIED] libva: drop obsolete GLX support Michael Olbrich
1 sibling, 1 reply; 4+ messages in thread
From: Philipp Zabel @ 2022-02-25 16:31 UTC (permalink / raw)
To: ptxdist
Enable VA support for radeonsi, r600, and nouveau.
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
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
+ 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
+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), \
+ $(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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [ptxdist] [PATCH 2/2] mesalib: enable VA support
2022-02-25 16:31 ` [ptxdist] [PATCH 2/2] mesalib: enable VA support Philipp Zabel
@ 2022-02-28 7:01 ` Michael Olbrich
0 siblings, 0 replies; 4+ messages in thread
From: Michael Olbrich @ 2022-02-28 7:01 UTC (permalink / raw)
To: Philipp Zabel; +Cc: ptxdist
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 <p.zabel@pengutronix.de>
> ---
> 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
> 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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [ptxdist] [APPLIED] libva: drop obsolete GLX support
2022-02-25 16:31 [ptxdist] [PATCH 1/2] libva: drop obsolete GLX support Philipp Zabel
2022-02-25 16:31 ` [ptxdist] [PATCH 2/2] mesalib: enable VA support Philipp Zabel
@ 2022-02-28 12:09 ` Michael Olbrich
1 sibling, 0 replies; 4+ messages in thread
From: Michael Olbrich @ 2022-02-28 12:09 UTC (permalink / raw)
To: ptxdist; +Cc: Philipp Zabel
Thanks, applied as b8c3f15f77cc5011b623ed1deaabba6192abd467.
Michael
[sent from post-receive hook]
On Mon, 28 Feb 2022 13:09:50 +0100, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> This was only required by gstreamer-vaapi1 < 1.16 [1]. Nothing requires
> libva GLX support now. Removing it and with it the MESALIB dependencies
> allows to enable VA support in Mesa without circular dependencies.
>
> [1] 5384deb0679e ("gstreamer-vaapi1: fix dependency")
>
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20220225163132.2929166-1-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/libva.in b/rules/libva.in
> index 8dd2229030fe..b0ba96e5c698 100644
> --- a/rules/libva.in
> +++ b/rules/libva.in
> @@ -4,12 +4,9 @@ menuconfig LIBVA
> tristate
> select HOST_MESON
> select LIBDRM
> - select XORG_LIB_X11 if LIBVA_X11 || LIBVA_GLX
> + select XORG_LIB_X11 if LIBVA_X11
> select XORG_LIB_XEXT if LIBVA_X11
> select XORG_LIB_XFIXES if LIBVA_X11
> - select MESALIB if LIBVA_GLX
> - select MESALIB_GLX if LIBVA_GLX
> - select MESALIB_OPENGL if LIBVA_GLX
> select WAYLAND if LIBVA_WAYLAND
> prompt "libva "
> help
> @@ -21,11 +18,6 @@ config LIBVA_X11
> bool
> prompt "X11 API support"
>
> -config LIBVA_GLX
> - bool
> - select LIBVA_X11
> - prompt "GLX API support"
> -
> config LIBVA_WAYLAND
> bool
> prompt "Wayland API support"
> diff --git a/rules/libva.make b/rules/libva.make
> index 7649bbb0ba97..7a16a188d820 100644
> --- a/rules/libva.make
> +++ b/rules/libva.make
> @@ -31,7 +31,6 @@ LIBVA_LICENSE_FILES := \
>
> LIBVA_ENABLE-y := drm
> LIBVA_ENABLE-$(PTXCONF_LIBVA_X11) += x11
> -LIBVA_ENABLE-$(PTXCONF_LIBVA_GLX) += glx
> LIBVA_ENABLE-$(PTXCONF_LIBVA_WAYLAND) += wayland
>
> LIBVA_CONF_TOOL := meson
> @@ -41,7 +40,7 @@ LIBVA_CONF_OPT := \
> -Ddriverdir='' \
> -Denable_docs=false \
> -Denable_va_messaging=true \
> - -Dwith_glx=$(call ptx/yesno, PTXCONF_LIBVA_GLX) \
> + -Dwith_glx=no \
> -Dwith_wayland=$(call ptx/yesno, PTXCONF_LIBVA_WAYLAND) \
> -Dwith_x11=$(call ptx/yesno, PTXCONF_LIBVA_X11)
>
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-02-28 12:14 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-25 16:31 [ptxdist] [PATCH 1/2] libva: drop obsolete GLX support Philipp Zabel
2022-02-25 16:31 ` [ptxdist] [PATCH 2/2] mesalib: enable VA support Philipp Zabel
2022-02-28 7:01 ` Michael Olbrich
2022-02-28 12:09 ` [ptxdist] [APPLIED] libva: drop obsolete GLX support Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox