From 2bf291149236a9b3adada330e83a67d2cfb9ccb3 Mon Sep 17 00:00:00 2001 From: xiaofan Date: Fri, 11 Aug 2023 17:44:14 +0800 Subject: [PATCH 1/3] Enable gallium driver vc4/v3d for arm platform Signed-off-by: xiaofan --- mesa.spec | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/mesa.spec b/mesa.spec index 5361677..a3e65d7 100644 --- a/mesa.spec +++ b/mesa.spec @@ -28,6 +28,11 @@ %define with_xa 1 %endif +%ifarch %{arm} aarch64 +%define with_vc4 1 +%define with_v3d 1 +%endif + %ifarch riscv64 %define with_xa 1 %define with_vmware 1 @@ -46,7 +51,7 @@ Name: mesa Summary: Mesa graphics libraries Version: 23.1.3 -Release: 2 +Release: 3 License: MIT URL: http://www.mesa3d.org @@ -315,7 +320,7 @@ export ASFLAGS="--generate-missing-build-notes=yes" -Ddri3=enabled \ -Dosmesa=true \ %if 0%{?with_hardware} - -Dgallium-drivers=swrast%{?with_iris:,iris},virgl,nouveau%{?with_vmware:,svga},radeonsi,r300,r600%{?with_freedreno:,freedreno}%{?with_etnaviv:,etnaviv}%{?with_tegra:,tegra}%{?with_vc4:,vc4}%{?with_kmsro:,kmsro}%{?with_crocus:,crocus} \ + -Dgallium-drivers=swrast%{?with_iris:,iris},virgl,nouveau%{?with_vmware:,svga},radeonsi,r300,r600%{?with_freedreno:,freedreno}%{?with_etnaviv:,etnaviv}%{?with_tegra:,tegra}%{?with_vc4:,vc4}%{?with_v3d:,v3d}%{?with_kmsro:,kmsro}%{?with_crocus:,crocus} \ %else -Dgallium-drivers=swrast,virgl \ %endif @@ -482,6 +487,9 @@ done %if 0%{?with_vc4} %{_libdir}/dri/vc4_dri.so %endif +%if 0%{?with_v3d} +%{_libdir}/dri/v3d_dri.so +%endif %if 0%{?with_freedreno} %{_libdir}/dri/kgsl_dri.so %{_libdir}/dri/msm_dri.so @@ -535,6 +543,9 @@ done %endif %changelog +* Fri Aug 11 2023 xiaofan - 23.1.3-3 +- Enable gallium driver vc4/v3d for arm platform + * Tue Aug 08 2023 Jingwiw - 23.1.3-2 - Add OrcJIT and add riscv architecture optimization - Optimize the mesa spec and add more backend -- Gitee From 189a3a07e0b64ca07584ba4e90c60e3148225d30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=AD=E5=B0=8F=E5=87=A1?= Date: Sat, 12 Aug 2023 01:00:54 +0800 Subject: [PATCH 2/3] Fix build error MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 谭小凡 --- mesa.spec | 31 +------------------------------ 1 file changed, 1 insertion(+), 30 deletions(-) diff --git a/mesa.spec b/mesa.spec index a3e65d7..de66947 100644 --- a/mesa.spec +++ b/mesa.spec @@ -476,36 +476,7 @@ done %files dri-drivers %dir %{_datadir}/drirc.d %{_datadir}/drirc.d/00-mesa-defaults.conf -%if %{with_hardware} -%{_libdir}/dri/r300_dri.so -%{_libdir}/dri/r600_dri.so -%{_libdir}/dri/radeonsi_dri.so -%ifarch %{ix86} x86_64 -%{_libdir}/dri/crocus_dri.so -%{_libdir}/dri/iris_dri.so -%endif -%if 0%{?with_vc4} -%{_libdir}/dri/vc4_dri.so -%endif -%if 0%{?with_v3d} -%{_libdir}/dri/v3d_dri.so -%endif -%if 0%{?with_freedreno} -%{_libdir}/dri/kgsl_dri.so -%{_libdir}/dri/msm_dri.so -%endif -%if 0%{?with_etnaviv} -%{_libdir}/dri/etnaviv_dri.so -%{_libdir}/dri/imx-drm_dri.so -%endif -%{_libdir}/dri/nouveau_dri.so -%if 0%{?with_vmware} -%{_libdir}/dri/vmwgfx_dri.so -%endif -%endif -%{_libdir}/dri/kms_swrast_dri.so -%{_libdir}/dri/swrast_dri.so -%{_libdir}/dri/virtio_gpu_dri.so +%{_libdir}/dri/*_dri.so %if %{with_hardware} %if 0%{?with_omx} -- Gitee From d84e60a1f82a4838708eb4cf9d3e8ce2b2c60047 Mon Sep 17 00:00:00 2001 From: xiaofan Date: Mon, 14 Aug 2023 19:17:35 +0800 Subject: [PATCH 3/3] Enable gallium driver kmsro explicitly to avoid use wildcard: '%{_libdir}/dri/*_dir.so' Signed-off-by: xiaofan --- mesa.spec | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 58 insertions(+), 1 deletion(-) diff --git a/mesa.spec b/mesa.spec index de66947..5d58dee 100644 --- a/mesa.spec +++ b/mesa.spec @@ -31,6 +31,7 @@ %ifarch %{arm} aarch64 %define with_vc4 1 %define with_v3d 1 +%define with_kmsro 1 %endif %ifarch riscv64 @@ -476,7 +477,63 @@ done %files dri-drivers %dir %{_datadir}/drirc.d %{_datadir}/drirc.d/00-mesa-defaults.conf -%{_libdir}/dri/*_dri.so +%if %{with_hardware} +%{_libdir}/dri/r300_dri.so +%{_libdir}/dri/r600_dri.so +%{_libdir}/dri/radeonsi_dri.so +%ifarch %{ix86} x86_64 +%{_libdir}/dri/crocus_dri.so +%{_libdir}/dri/iris_dri.so +%endif +%if 0%{?with_vc4} +%{_libdir}/dri/vc4_dri.so +%endif +%if 0%{?with_v3d} +%{_libdir}/dri/v3d_dri.so +%endif +%if 0%{?with_kmsro} +%{_libdir}/dri/armada-drm_dri.so +%{_libdir}/dri/exynos_dri.so +%{_libdir}/dri/hx8357d_dri.so +%{_libdir}/dri/ili9225_dri.so +%{_libdir}/dri/ili9341_dri.so +%{_libdir}/dri/imx-drm_dri.so +%{_libdir}/dri/imx-dcss_dri.so +%{_libdir}/dri/imx-lcdif_dri.so +%{_libdir}/dri/ingenic-drm_dri.so +%{_libdir}/dri/kirin_dri.so +%{_libdir}/dri/komeda_dri.so +%{_libdir}/dri/mali-dp_dri.so +%{_libdir}/dri/mcde_dri.so +%{_libdir}/dri/mediatek_dri.so +%{_libdir}/dri/meson_dri.so +%{_libdir}/dri/mi0283qt_dri.so +%{_libdir}/dri/mxsfb-drm_dri.so +%{_libdir}/dri/pl111_dri.so +%{_libdir}/dri/rcar-du_dri.so +%{_libdir}/dri/repaper_dri.so +%{_libdir}/dri/rockchip_dri.so +%{_libdir}/dri/st7586_dri.so +%{_libdir}/dri/st7735r_dri.so +%{_libdir}/dri/stm_dri.so +%{_libdir}/dri/sun4i-drm_dri.so +%endif +%if 0%{?with_freedreno} +%{_libdir}/dri/kgsl_dri.so +%{_libdir}/dri/msm_dri.so +%endif +%if 0%{?with_etnaviv} +%{_libdir}/dri/etnaviv_dri.so +%{_libdir}/dri/imx-drm_dri.so +%endif +%{_libdir}/dri/nouveau_dri.so +%if 0%{?with_vmware} +%{_libdir}/dri/vmwgfx_dri.so +%endif +%endif +%{_libdir}/dri/kms_swrast_dri.so +%{_libdir}/dri/swrast_dri.so +%{_libdir}/dri/virtio_gpu_dri.so %if %{with_hardware} %if 0%{?with_omx} -- Gitee