* [Buildroot] [PATCH 1/6] package/libdrm: add host variant
@ 2024-09-22 19:37 Bernd Kuhls
2024-09-22 19:37 ` [Buildroot] [PATCH 2/6] package/llvm-project/libclc: " Bernd Kuhls
` (4 more replies)
0 siblings, 5 replies; 13+ messages in thread
From: Bernd Kuhls @ 2024-09-22 19:37 UTC (permalink / raw)
To: buildroot
Cc: Eric Le Bihan, Romain Naour, Daniel Lang, Yann E . MORIN,
Valentin Korenblit
Needed for mesa3d bump to 24.1.0.
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
package/libdrm/libdrm.mk | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk
index fcf7f17e78..021a575474 100644
--- a/package/libdrm/libdrm.mk
+++ b/package/libdrm/libdrm.mk
@@ -116,4 +116,25 @@ else
LIBDRM_CONF_OPTS += -Dtests=false
endif
+HOST_LIBDRM_CONF_OPTS = \
+ -Damdgpu=disabled \
+ -Dcairo-tests=disabled \
+ -Detnaviv=disabled \
+ -Dexynos=disabled \
+ -Dfreedreno=disabled \
+ -Dfreedreno-kgsl=false \
+ -Dinstall-test-programs=false \
+ -Dintel=disabled \
+ -Dman-pages=disabled \
+ -Dnouveau=disabled \
+ -Domap=disabled \
+ -Dradeon=disabled \
+ -Dtegra=disabled \
+ -Dvc4=disabled \
+ -Dvmwgfx=disabled \
+ -Dtests=false \
+ -Dudev=false \
+ -Dvalgrind=disabled
+
$(eval $(meson-package))
+$(eval $(host-meson-package))
--
2.39.5
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 13+ messages in thread* [Buildroot] [PATCH 2/6] package/llvm-project/libclc: add host variant 2024-09-22 19:37 [Buildroot] [PATCH 1/6] package/libdrm: add host variant Bernd Kuhls @ 2024-09-22 19:37 ` Bernd Kuhls 2024-09-22 19:37 ` [Buildroot] [PATCH 3/6] package/spirv-llvm-translator: add target variant to provide LLVMSPIRVLib Bernd Kuhls ` (3 subsequent siblings) 4 siblings, 0 replies; 13+ messages in thread From: Bernd Kuhls @ 2024-09-22 19:37 UTC (permalink / raw) To: buildroot Cc: Eric Le Bihan, Romain Naour, Daniel Lang, Yann E . MORIN, Valentin Korenblit Needed for mesa3d bump to 24.1.0. Signed-off-by: Bernd Kuhls <bernd@kuhls.net> --- package/llvm-project/libclc/libclc.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/llvm-project/libclc/libclc.mk b/package/llvm-project/libclc/libclc.mk index 9f303d6d2f..cfa978a8ac 100644 --- a/package/llvm-project/libclc/libclc.mk +++ b/package/llvm-project/libclc/libclc.mk @@ -11,6 +11,7 @@ LIBCLC_LICENSE = Apache-2.0 with exceptions or MIT LIBCLC_LICENSE_FILES = LICENSE.TXT LIBCLC_DEPENDENCIES = host-clang host-llvm host-spirv-llvm-translator +HOST_LIBCLC_DEPENDENCIES = host-clang host-llvm host-spirv-llvm-translator LIBCLC_INSTALL_STAGING = YES # CMAKE_*_COMPILER_FORCED=ON skips testing the tools and assumes @@ -39,4 +40,8 @@ LIBCLC_CONF_OPTS = \ -DCMAKE_CXX_COMPILER="$(CMAKE_HOST_CXX_COMPILER)" \ -DLLVM_CONFIG="$(HOST_DIR)/bin/llvm-config" +HOST_LIBCLC_CONF_OPTS = \ + -DLIBCLC_TARGETS_TO_BUILD=spirv64-mesa3d- + $(eval $(cmake-package)) +$(eval $(host-cmake-package)) -- 2.39.5 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [Buildroot] [PATCH 3/6] package/spirv-llvm-translator: add target variant to provide LLVMSPIRVLib 2024-09-22 19:37 [Buildroot] [PATCH 1/6] package/libdrm: add host variant Bernd Kuhls 2024-09-22 19:37 ` [Buildroot] [PATCH 2/6] package/llvm-project/libclc: " Bernd Kuhls @ 2024-09-22 19:37 ` Bernd Kuhls 2024-09-22 19:37 ` [Buildroot] [PATCH 4/6] package/spirv-tools: add host variant Bernd Kuhls ` (2 subsequent siblings) 4 siblings, 0 replies; 13+ messages in thread From: Bernd Kuhls @ 2024-09-22 19:37 UTC (permalink / raw) To: buildroot Cc: Eric Le Bihan, Sebastian Weyer, Daniel Lang, Romain Naour, Antoine Coutant, Romain Naour, Yann E . MORIN, Valentin Korenblit From: Romain Naour <romain.naour@smile.fr> This target version is needed for Rusticl which is an LLVM based OpenCL framework[1]. Rusticl allow programs to compile OpenCL C/C++ code at runtime with Clang. Clang generates LLVM IR which is translated into SPIR-V by spirv-llvm-translator. Finally, mesa can use its internal tools to manage SPIR-V. [1]: https://docs.mesa3d.org/rusticl.html Signed-off-by: Romain Naour <romain.naour@smile.fr> Signed-off-by: Sebastian Weyer <sebastian.weyer@smile.fr> Signed-off-by: Antoine Coutant <antoine.coutant@smile.fr> Signed-off-by: Bernd Kuhls <bernd@kuhls.net> --- package/Config.in | 1 + package/spirv-llvm-translator/Config.in | 22 +++++++++++++++++++ .../spirv-llvm-translator.mk | 10 +++++++++ 3 files changed, 33 insertions(+) create mode 100644 package/spirv-llvm-translator/Config.in diff --git a/package/Config.in b/package/Config.in index 2200f16520..10f7d4dced 100644 --- a/package/Config.in +++ b/package/Config.in @@ -336,6 +336,7 @@ comment "Graphic applications" source "package/pngquant/Config.in" source "package/qt5cinex/Config.in" source "package/rrdtool/Config.in" + source "package/spirv-llvm-translator/Config.in" source "package/spirv-tools/Config.in" source "package/stellarium/Config.in" source "package/sway/Config.in" diff --git a/package/spirv-llvm-translator/Config.in b/package/spirv-llvm-translator/Config.in new file mode 100644 index 0000000000..73ca787d8a --- /dev/null +++ b/package/spirv-llvm-translator/Config.in @@ -0,0 +1,22 @@ +config BR2_PACKAGE_SPIRV_LLVM_TRANSLATOR + bool "spirv-translator" + depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_INSTALL_LIBSTDCPP + depends on !BR2_STATIC_LIBS + depends on BR2_HOST_GCC_AT_LEAST_7 # host-llvm + select BR2_PACKAGE_LLVM + select BR2_PACKAGE_SPIRV_HEADERS + select BR2_PACKAGE_ZLIB + help + LLVM/SPIR-V Bi-Directional Translator is a library and tool + for translation between LLVM IR and SPIR-V. + + https://github.com/khronosGroup/SPIRV-LLVM-Translator + +comment "spirv-translator needs a toolchain w/ threads, C++, gcc >= 7, dynamic library, host gcc >= 7" + depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_7 \ + || BR2_STATIC_LIBS || !BR2_HOST_GCC_AT_LEAST_7 diff --git a/package/spirv-llvm-translator/spirv-llvm-translator.mk b/package/spirv-llvm-translator/spirv-llvm-translator.mk index 523890a986..ffc8a63b89 100644 --- a/package/spirv-llvm-translator/spirv-llvm-translator.mk +++ b/package/spirv-llvm-translator/spirv-llvm-translator.mk @@ -19,4 +19,14 @@ HOST_SPIRV_LLVM_TRANSLATOR_CONF_OPTS = \ -DLLVM_EXTERNAL_PROJECTS="SPIRV-Headers" \ -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=$(HOST_DIR)/include +SPIRV_LLVM_TRANSLATOR_INSTALL_STAGING = YES +SPIRV_LLVM_TRANSLATOR_DEPENDENCIES = host-clang host-llvm llvm spirv-headers +SPIRV_LLVM_TRANSLATOR_CONF_OPTS = \ + -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=$(STAGING_DIR)/usr \ + -DLLVM_BUILD_TOOLS=ON \ + -DLLVM_DIR=$(STAGING_DIR)/lib/cmake/llvm \ + -DLLVM_SPIRV_BUILD_EXTERNAL=YES \ + -DLLVM_SPIRV_INCLUDE_TESTS=OFF + +$(eval $(cmake-package)) $(eval $(host-cmake-package)) -- 2.39.5 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [Buildroot] [PATCH 4/6] package/spirv-tools: add host variant 2024-09-22 19:37 [Buildroot] [PATCH 1/6] package/libdrm: add host variant Bernd Kuhls 2024-09-22 19:37 ` [Buildroot] [PATCH 2/6] package/llvm-project/libclc: " Bernd Kuhls 2024-09-22 19:37 ` [Buildroot] [PATCH 3/6] package/spirv-llvm-translator: add target variant to provide LLVMSPIRVLib Bernd Kuhls @ 2024-09-22 19:37 ` Bernd Kuhls 2024-09-22 19:37 ` [Buildroot] [PATCH v2 5/6] package/{mesa3d, mesa3d-headers}: bump version to 24.2.3 Bernd Kuhls 2024-09-22 19:37 ` [Buildroot] [PATCH 6/6] package/mesa3d: add option to enable VIRTIO vulkan driver Bernd Kuhls 4 siblings, 0 replies; 13+ messages in thread From: Bernd Kuhls @ 2024-09-22 19:37 UTC (permalink / raw) To: buildroot Cc: Eric Le Bihan, Romain Naour, Daniel Lang, Yann E . MORIN, Valentin Korenblit Needed for mesa3d bump to 24.1.0. Signed-off-by: Bernd Kuhls <bernd@kuhls.net> --- package/spirv-tools/spirv-tools.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/spirv-tools/spirv-tools.mk b/package/spirv-tools/spirv-tools.mk index e863911b03..51b1c9f22a 100644 --- a/package/spirv-tools/spirv-tools.mk +++ b/package/spirv-tools/spirv-tools.mk @@ -10,6 +10,7 @@ SPIRV_TOOLS_SITE = $(call github,KhronosGroup,SPIRV-Tools,sdk-$(SPIRV_TOOLS_VERS SPIRV_TOOLS_LICENSE = Apache-2.0 SPIRV_TOOLS_LICENSE_FILES = LICENSE SPIRV_TOOLS_DEPENDENCIES = spirv-headers +HOST_SPIRV_TOOLS_DEPENDENCIES = host-spirv-headers SPIRV_TOOLS_INSTALL_STAGING = YES SPIRV_TOOLS_CONF_OPTS = \ @@ -18,4 +19,11 @@ SPIRV_TOOLS_CONF_OPTS = \ -DSPIRV_SKIP_TESTS=ON \ -DSPIRV_WERROR=OFF +HOST_SPIRV_TOOLS_CONF_OPTS = \ + -DSPIRV-Headers_SOURCE_DIR=$(HOST_DIR) \ + -DSPIRV_TOOLS_BUILD_STATIC=OFF \ + -DSPIRV_SKIP_TESTS=ON \ + -DSPIRV_WERROR=OFF + $(eval $(cmake-package)) +$(eval $(host-cmake-package)) -- 2.39.5 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [Buildroot] [PATCH v2 5/6] package/{mesa3d, mesa3d-headers}: bump version to 24.2.3 2024-09-22 19:37 [Buildroot] [PATCH 1/6] package/libdrm: add host variant Bernd Kuhls ` (2 preceding siblings ...) 2024-09-22 19:37 ` [Buildroot] [PATCH 4/6] package/spirv-tools: add host variant Bernd Kuhls @ 2024-09-22 19:37 ` Bernd Kuhls 2024-09-23 7:07 ` Andy Yan 2024-09-22 19:37 ` [Buildroot] [PATCH 6/6] package/mesa3d: add option to enable VIRTIO vulkan driver Bernd Kuhls 4 siblings, 1 reply; 13+ messages in thread From: Bernd Kuhls @ 2024-09-22 19:37 UTC (permalink / raw) To: buildroot Cc: Eric Le Bihan, Romain Naour, Daniel Lang, Yann E . MORIN, Valentin Korenblit Release notes: https://lists.freedesktop.org/archives/mesa-announce/2024-May/000762.html https://lists.freedesktop.org/archives/mesa-announce/2024-June/000763.html https://lists.freedesktop.org/archives/mesa-announce/2024-June/000765.html https://lists.freedesktop.org/archives/mesa-announce/2024-July/000766.html https://lists.freedesktop.org/archives/mesa-announce/2024-July/000767.html https://lists.freedesktop.org/archives/mesa-announce/2024-July/000771.html https://lists.freedesktop.org/archives/mesa-announce/2024-August/000773.html https://lists.freedesktop.org/archives/mesa-announce/2024-August/000776.html https://lists.freedesktop.org/archives/mesa-announce/2024-September/000778.html https://lists.freedesktop.org/archives/mesa-announce/2024-September/000779.html ------------------------------------------------------------------------ Changes needed for the bump to 24.1.x: Added dependency to llvm & Co. for iris driver due to upstream commit: https://cgit.freedesktop.org/mesa/mesa/commit/meson.build?h=24.1&id=a512c2a8b572c5da360873320dbbd343c6223cd6 Added host version of mesa tool intel_clc needed for target build of the iris driver. Added dependency to host-python-pycparser for etnaviv driver due to upstream commit: https://cgit.freedesktop.org/mesa/mesa/commit/src/etnaviv/hwdb/meson.build?h=24.1&id=2192e620bb0c68b75ff45165d0b117c7ecb77268 Added dependency to host-python-ply for intel vulkan driver due to upstream commit: https://cgit.freedesktop.org/mesa/mesa/commit/src/intel/vulkan/grl/meson.build?h=24.1&id=dc1aedef2bd054884685ad971a3ef5be07ecd101 Although this dependency exists since mesa3d 22.3 it is only needed when intel-clc is enabled, this dependency is added with this patch so no need to backport this dependency to older buildroot trees. Update configure parameter of glvnd option due to upstream commit: https://cgit.freedesktop.org/mesa/mesa/commit/meson.build?h=24.1&id=4f25b84b2460524d375424a81b42faa4d99c8e60 ------------------------------------------------------------------------ Changes needed for the bump to 24.2.x: Added dependency to host-python-pyyaml to host and target build, needed due to upstream commit https://gitlab.freedesktop.org/mesa/mesa/-/commit/a3813327575e8875c8c3ed24b5f45a0b7ba64446 Rebased patch 0002 due to upstream commit: https://cgit.freedesktop.org/mesa/mesa/commit/src/gallium/drivers/vc4/meson.build?h=24.2&id=da70827656757cd070faac7aff5ca057f1e7fb8a Signed-off-by: Bernd Kuhls <bernd@kuhls.net> --- v2: bump to 24.2.3, added dependency to host-python-pyyaml for target package (Andy) package/mesa3d-headers/mesa3d-headers.mk | 2 +- ...tion-to-disable-optional-neon-suppor.patch | 14 ++--- package/mesa3d/Config.in | 11 +++- package/mesa3d/mesa3d.hash | 6 +-- package/mesa3d/mesa3d.mk | 52 +++++++++++++++---- 5 files changed, 64 insertions(+), 21 deletions(-) diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index 33c60b285f..2d6824c61c 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -12,7 +12,7 @@ endif # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 24.0.9 +MESA3D_HEADERS_VERSION = 24.2.3 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://archive.mesa3d.org MESA3D_HEADERS_DL_SUBDIR = mesa3d diff --git a/package/mesa3d/0002-vc4-add-meson-option-to-disable-optional-neon-suppor.patch b/package/mesa3d/0002-vc4-add-meson-option-to-disable-optional-neon-suppor.patch index f3919478a6..cda792b9db 100644 --- a/package/mesa3d/0002-vc4-add-meson-option-to-disable-optional-neon-suppor.patch +++ b/package/mesa3d/0002-vc4-add-meson-option-to-disable-optional-neon-suppor.patch @@ -9,8 +9,8 @@ to force disabling it at compile time. Upstream: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4114 Signed-off-by: Peter Seiderer <ps.report@gmx.net> -Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> -[rebased for 20.2.0, 20.3.0, 21.1.0, 23.1.0 & 23.2.0] +Signed-off-by: Bernd Kuhls <bernd@kuhls.net> +[rebased for 20.2.0, 20.3.0, 21.1.0, 23.1.0, 23.2.0 & 24.2.1] Signed-off-by: Peter Seiderer <ps.report@gmx.net> [fix syntax error after previous rebases] --- @@ -23,7 +23,7 @@ diff --git a/meson_options.txt b/meson_options.txt index 8e0bf2a..1cf0e07 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -124,6 +124,13 @@ option( +@@ -148,6 +148,13 @@ option( description : 'enable gallium va frontend.', ) @@ -41,8 +41,8 @@ diff --git a/src/gallium/drivers/vc4/meson.build b/src/gallium/drivers/vc4/meson index 84da951..7f950de 100644 --- a/src/gallium/drivers/vc4/meson.build +++ b/src/gallium/drivers/vc4/meson.build -@@ -84,7 +84,7 @@ files_libvc4 = files( - vc4_c_args = [] +@@ -72,7 +72,7 @@ files_libvc4 = files( + ] libvc4_neon = [] -if host_machine.cpu_family() == 'arm' @@ -50,9 +50,9 @@ index 84da951..7f950de 100644 libvc4_neon = static_library( 'vc4_neon', 'vc4_tiling_lt_neon.c', -@@ -93,7 +93,7 @@ if host_machine.cpu_family() == 'arm' - ], +@@ -82,7 +82,7 @@ if host_machine.cpu_family() == 'arm' c_args : '-mfpu=neon', + dependencies : vc4_deps, ) - vc4_c_args += '-DUSE_ARM_ASM' + vc4_c_args += '-DVC4_TILING_LT_NEON' diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index 7761b0a650..3586451bc6 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -50,7 +50,8 @@ config BR2_PACKAGE_MESA3D_OPENCL bool "OpenCL support" depends on BR2_PACKAGE_MESA3D_LLVM depends on BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600 || \ - BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI + BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI || \ + BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS select BR2_PACKAGE_LLVM_RTTI select BR2_PACKAGE_CLANG select BR2_PACKAGE_LIBCLC @@ -129,10 +130,18 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_I915 config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS bool "Gallium iris driver" depends on BR2_i386 || BR2_x86_64 + depends on BR2_PACKAGE_MESA3D_LLVM select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + select BR2_PACKAGE_MESA3D_OPENCL + select BR2_PACKAGE_SPIRV_LLVM_TRANSLATOR + select BR2_PACKAGE_SPIRV_TOOLS help Mesa driver for iris-based Intel GPUs. +comment "iris driver needs llvm" + depends on BR2_i386 || BR2_x86_64 + depends on !BR2_PACKAGE_MESA3D_LLVM + config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_LIMA bool "Gallium lima driver" depends on BR2_TOOLCHAIN_HAS_SYNC_4 || !BR2_PACKAGE_XORG7 # libxshmfence diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index d506d398b8..50385460f8 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2024-June/000764.html -sha256 51aa686ca4060e38711a9e8f60c8f1efaa516baf411946ed7f2c265cd582ca4c mesa-24.0.9.tar.xz -sha512 de2ee6c9df1fc106ee10befe0a76be1e9cfe83d65dbdb83bad6d8d7cfaa085232fb115293a1a790b37b50b1fe14bd58aafbcfe5a15e953b5901a7105d57569a5 mesa-24.0.9.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2024-September/000779.html +sha256 4ea18b1155a4544a09f7361848974768f6f73c19d88f63de2ec650be313b2d0c mesa-24.2.3.tar.xz +sha512 7a1ace23568d1907b778a2859f97c8988a414ba74e02e1fb5af6f95f768e1b1a2dfdaf412b0d655678ed915d28273953fd1236ebcd87553a1880f1a7f3ea4d44 mesa-24.2.3.tar.xz # License sha256 a00275a53178e2645fb65be99a785c110513446a5071ff2c698ed260ad917d75 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index ce460c4475..ad530fc214 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 24.0.9 +MESA3D_VERSION = 24.2.3 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos @@ -21,12 +21,17 @@ MESA3D_DEPENDENCIES = \ host-bison \ host-flex \ host-python-mako \ + host-python-pyyaml \ expat \ libdrm \ zlib MESA3D_CONF_OPTS = \ -Dgallium-omx=disabled \ + -Dgallium-opencl=disabled \ + -Dgallium-rusticl=false \ + -Dmicrosoft-clc=disabled \ + -Dopencl-spirv=false \ -Dpower8=disabled ifeq ($(BR2_PACKAGE_MESA3D_DRIVER)$(BR2_PACKAGE_XORG7),yy) @@ -50,14 +55,9 @@ else MESA3D_CONF_OPTS += -Dllvm=disabled endif -# Disable opencl-icd: OpenCL lib will be named libOpenCL instead of -# libMesaOpenCL and CL headers are installed ifeq ($(BR2_PACKAGE_MESA3D_OPENCL),y) MESA3D_PROVIDES += libopencl MESA3D_DEPENDENCIES += clang libclc -MESA3D_CONF_OPTS += -Dgallium-opencl=standalone -else -MESA3D_CONF_OPTS += -Dgallium-opencl=disabled endif ifeq ($(BR2_PACKAGE_MESA3D_NEEDS_ELFUTILS),y) @@ -126,6 +126,19 @@ MESA3D_CONF_OPTS += \ -Dgallium-extra-hud=true endif +ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ETNAVIV),y) +MESA3D_DEPENDENCIES += host-python-pycparser +endif + +ifeq ($(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL),y) +MESA3D_DEPENDENCIES += host-python-ply +endif + +ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS),y) +MESA3D_CONF_OPTS += -Dintel-clc=system +MESA3D_DEPENDENCIES += host-mesa3d spirv-llvm-translator spirv-tools +endif + ifeq ($(BR2_PACKAGE_MESA3D_VULKAN_DRIVER),) MESA3D_CONF_OPTS += \ -Dvulkan-drivers= @@ -251,12 +264,33 @@ endif ifeq ($(BR2_PACKAGE_LIBGLVND),y) ifneq ($(BR2_PACKAGE_MESA3D_OPENGL_GLX)$(BR2_PACKAGE_MESA3D_OPENGL_EGL),) MESA3D_DEPENDENCIES += libglvnd -MESA3D_CONF_OPTS += -Dglvnd=true +MESA3D_CONF_OPTS += -Dglvnd=enabled else -MESA3D_CONF_OPTS += -Dglvnd=false +MESA3D_CONF_OPTS += -Dglvnd=disabled endif else -MESA3D_CONF_OPTS += -Dglvnd=false +MESA3D_CONF_OPTS += -Dglvnd=disabled endif +HOST_MESA3D_CONF_OPTS = \ + -Dglvnd=disabled \ + -Dgallium-drivers=iris \ + -Dgallium-vdpau=disabled \ + -Dplatforms= \ + -Ddri3=disabled \ + -Dglx=disabled \ + -Dvulkan-drivers="" + +HOST_MESA3D_DEPENDENCIES = \ + host-libclc \ + host-libdrm \ + host-python-mako \ + host-python-pyyaml \ + host-spirv-tools + +define HOST_MESA3D_INSTALL_CMDS + $(INSTALL) -D -m 0755 $(@D)/build/src/intel/compiler/intel_clc $(HOST_DIR)/bin/intel_clc +endef + $(eval $(meson-package)) +$(eval $(host-meson-package)) -- 2.39.5 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [Buildroot] [PATCH v2 5/6] package/{mesa3d, mesa3d-headers}: bump version to 24.2.3 2024-09-22 19:37 ` [Buildroot] [PATCH v2 5/6] package/{mesa3d, mesa3d-headers}: bump version to 24.2.3 Bernd Kuhls @ 2024-09-23 7:07 ` Andy Yan 2024-10-13 9:36 ` Andy Yan 0 siblings, 1 reply; 13+ messages in thread From: Andy Yan @ 2024-09-23 7:07 UTC (permalink / raw) To: Bernd Kuhls Cc: Eric Le Bihan, Daniel Lang, buildroot, Romain Naour, Yann E . MORIN, Valentin Korenblit Hi Bernd, At 2024-09-23 03:37:50, "Bernd Kuhls" <bernd@kuhls.net> wrote: >Release notes: >https://lists.freedesktop.org/archives/mesa-announce/2024-May/000762.html >https://lists.freedesktop.org/archives/mesa-announce/2024-June/000763.html >https://lists.freedesktop.org/archives/mesa-announce/2024-June/000765.html >https://lists.freedesktop.org/archives/mesa-announce/2024-July/000766.html >https://lists.freedesktop.org/archives/mesa-announce/2024-July/000767.html >https://lists.freedesktop.org/archives/mesa-announce/2024-July/000771.html >https://lists.freedesktop.org/archives/mesa-announce/2024-August/000773.html >https://lists.freedesktop.org/archives/mesa-announce/2024-August/000776.html >https://lists.freedesktop.org/archives/mesa-announce/2024-September/000778.html >https://lists.freedesktop.org/archives/mesa-announce/2024-September/000779.html >------------------------------------------------------------------------ >Changes needed for the bump to 24.1.x: > >Added dependency to llvm & Co. for iris driver due to upstream commit: >https://cgit.freedesktop.org/mesa/mesa/commit/meson.build?h=24.1&id=a512c2a8b572c5da360873320dbbd343c6223cd6 > >Added host version of mesa tool intel_clc needed for target build of the >iris driver. > >Added dependency to host-python-pycparser for etnaviv driver due to >upstream commit: >https://cgit.freedesktop.org/mesa/mesa/commit/src/etnaviv/hwdb/meson.build?h=24.1&id=2192e620bb0c68b75ff45165d0b117c7ecb77268 > >Added dependency to host-python-ply for intel vulkan driver due to >upstream commit: >https://cgit.freedesktop.org/mesa/mesa/commit/src/intel/vulkan/grl/meson.build?h=24.1&id=dc1aedef2bd054884685ad971a3ef5be07ecd101 > >Although this dependency exists since mesa3d 22.3 it is only needed when >intel-clc is enabled, this dependency is added with this patch so no need >to backport this dependency to older buildroot trees. > >Update configure parameter of glvnd option due to upstream commit: >https://cgit.freedesktop.org/mesa/mesa/commit/meson.build?h=24.1&id=4f25b84b2460524d375424a81b42faa4d99c8e60 >------------------------------------------------------------------------ >Changes needed for the bump to 24.2.x: > >Added dependency to host-python-pyyaml to host and target build, needed >due to upstream commit >https://gitlab.freedesktop.org/mesa/mesa/-/commit/a3813327575e8875c8c3ed24b5f45a0b7ba64446 > >Rebased patch 0002 due to upstream commit: >https://cgit.freedesktop.org/mesa/mesa/commit/src/gallium/drivers/vc4/meson.build?h=24.2&id=da70827656757cd070faac7aff5ca057f1e7fb8a > >Signed-off-by: Bernd Kuhls <bernd@kuhls.net> Tested-by: Andy Yan <andyshrk@163.com> Thanks >--- >v2: bump to 24.2.3, added dependency to host-python-pyyaml for target > package (Andy) > > package/mesa3d-headers/mesa3d-headers.mk | 2 +- > ...tion-to-disable-optional-neon-suppor.patch | 14 ++--- > package/mesa3d/Config.in | 11 +++- > package/mesa3d/mesa3d.hash | 6 +-- > package/mesa3d/mesa3d.mk | 52 +++++++++++++++---- > 5 files changed, 64 insertions(+), 21 deletions(-) > >diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk >index 33c60b285f..2d6824c61c 100644 >--- a/package/mesa3d-headers/mesa3d-headers.mk >+++ b/package/mesa3d-headers/mesa3d-headers.mk >@@ -12,7 +12,7 @@ endif > > # Not possible to directly refer to mesa3d variables, because of > # first/second expansion trickery... >-MESA3D_HEADERS_VERSION = 24.0.9 >+MESA3D_HEADERS_VERSION = 24.2.3 > MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz > MESA3D_HEADERS_SITE = https://archive.mesa3d.org > MESA3D_HEADERS_DL_SUBDIR = mesa3d >diff --git a/package/mesa3d/0002-vc4-add-meson-option-to-disable-optional-neon-suppor.patch b/package/mesa3d/0002-vc4-add-meson-option-to-disable-optional-neon-suppor.patch >index f3919478a6..cda792b9db 100644 >--- a/package/mesa3d/0002-vc4-add-meson-option-to-disable-optional-neon-suppor.patch >+++ b/package/mesa3d/0002-vc4-add-meson-option-to-disable-optional-neon-suppor.patch >@@ -9,8 +9,8 @@ to force disabling it at compile time. > > Upstream: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4114 > Signed-off-by: Peter Seiderer <ps.report@gmx.net> >-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> >-[rebased for 20.2.0, 20.3.0, 21.1.0, 23.1.0 & 23.2.0] >+Signed-off-by: Bernd Kuhls <bernd@kuhls.net> >+[rebased for 20.2.0, 20.3.0, 21.1.0, 23.1.0, 23.2.0 & 24.2.1] > Signed-off-by: Peter Seiderer <ps.report@gmx.net> > [fix syntax error after previous rebases] > --- >@@ -23,7 +23,7 @@ diff --git a/meson_options.txt b/meson_options.txt > index 8e0bf2a..1cf0e07 100644 > --- a/meson_options.txt > +++ b/meson_options.txt >-@@ -124,6 +124,13 @@ option( >+@@ -148,6 +148,13 @@ option( > description : 'enable gallium va frontend.', > ) > >@@ -41,8 +41,8 @@ diff --git a/src/gallium/drivers/vc4/meson.build b/src/gallium/drivers/vc4/meson > index 84da951..7f950de 100644 > --- a/src/gallium/drivers/vc4/meson.build > +++ b/src/gallium/drivers/vc4/meson.build >-@@ -84,7 +84,7 @@ files_libvc4 = files( >- vc4_c_args = [] >+@@ -72,7 +72,7 @@ files_libvc4 = files( >+ ] > > libvc4_neon = [] > -if host_machine.cpu_family() == 'arm' >@@ -50,9 +50,9 @@ index 84da951..7f950de 100644 > libvc4_neon = static_library( > 'vc4_neon', > 'vc4_tiling_lt_neon.c', >-@@ -93,7 +93,7 @@ if host_machine.cpu_family() == 'arm' >- ], >+@@ -82,7 +82,7 @@ if host_machine.cpu_family() == 'arm' > c_args : '-mfpu=neon', >+ dependencies : vc4_deps, > ) > - vc4_c_args += '-DUSE_ARM_ASM' > + vc4_c_args += '-DVC4_TILING_LT_NEON' >diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in >index 7761b0a650..3586451bc6 100644 >--- a/package/mesa3d/Config.in >+++ b/package/mesa3d/Config.in >@@ -50,7 +50,8 @@ config BR2_PACKAGE_MESA3D_OPENCL > bool "OpenCL support" > depends on BR2_PACKAGE_MESA3D_LLVM > depends on BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600 || \ >- BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI >+ BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI || \ >+ BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS > select BR2_PACKAGE_LLVM_RTTI > select BR2_PACKAGE_CLANG > select BR2_PACKAGE_LIBCLC >@@ -129,10 +130,18 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_I915 > config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS > bool "Gallium iris driver" > depends on BR2_i386 || BR2_x86_64 >+ depends on BR2_PACKAGE_MESA3D_LLVM > select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER >+ select BR2_PACKAGE_MESA3D_OPENCL >+ select BR2_PACKAGE_SPIRV_LLVM_TRANSLATOR >+ select BR2_PACKAGE_SPIRV_TOOLS > help > Mesa driver for iris-based Intel GPUs. > >+comment "iris driver needs llvm" >+ depends on BR2_i386 || BR2_x86_64 >+ depends on !BR2_PACKAGE_MESA3D_LLVM >+ > config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_LIMA > bool "Gallium lima driver" > depends on BR2_TOOLCHAIN_HAS_SYNC_4 || !BR2_PACKAGE_XORG7 # libxshmfence >diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash >index d506d398b8..50385460f8 100644 >--- a/package/mesa3d/mesa3d.hash >+++ b/package/mesa3d/mesa3d.hash >@@ -1,5 +1,5 @@ >-# From https://lists.freedesktop.org/archives/mesa-announce/2024-June/000764.html >-sha256 51aa686ca4060e38711a9e8f60c8f1efaa516baf411946ed7f2c265cd582ca4c mesa-24.0.9.tar.xz >-sha512 de2ee6c9df1fc106ee10befe0a76be1e9cfe83d65dbdb83bad6d8d7cfaa085232fb115293a1a790b37b50b1fe14bd58aafbcfe5a15e953b5901a7105d57569a5 mesa-24.0.9.tar.xz >+# From https://lists.freedesktop.org/archives/mesa-announce/2024-September/000779.html >+sha256 4ea18b1155a4544a09f7361848974768f6f73c19d88f63de2ec650be313b2d0c mesa-24.2.3.tar.xz >+sha512 7a1ace23568d1907b778a2859f97c8988a414ba74e02e1fb5af6f95f768e1b1a2dfdaf412b0d655678ed915d28273953fd1236ebcd87553a1880f1a7f3ea4d44 mesa-24.2.3.tar.xz > # License > sha256 a00275a53178e2645fb65be99a785c110513446a5071ff2c698ed260ad917d75 docs/license.rst >diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk >index ce460c4475..ad530fc214 100644 >--- a/package/mesa3d/mesa3d.mk >+++ b/package/mesa3d/mesa3d.mk >@@ -5,7 +5,7 @@ > ################################################################################ > > # When updating the version, please also update mesa3d-headers >-MESA3D_VERSION = 24.0.9 >+MESA3D_VERSION = 24.2.3 > MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz > MESA3D_SITE = https://archive.mesa3d.org > MESA3D_LICENSE = MIT, SGI, Khronos >@@ -21,12 +21,17 @@ MESA3D_DEPENDENCIES = \ > host-bison \ > host-flex \ > host-python-mako \ >+ host-python-pyyaml \ > expat \ > libdrm \ > zlib > > MESA3D_CONF_OPTS = \ > -Dgallium-omx=disabled \ >+ -Dgallium-opencl=disabled \ >+ -Dgallium-rusticl=false \ >+ -Dmicrosoft-clc=disabled \ >+ -Dopencl-spirv=false \ > -Dpower8=disabled > > ifeq ($(BR2_PACKAGE_MESA3D_DRIVER)$(BR2_PACKAGE_XORG7),yy) >@@ -50,14 +55,9 @@ else > MESA3D_CONF_OPTS += -Dllvm=disabled > endif > >-# Disable opencl-icd: OpenCL lib will be named libOpenCL instead of >-# libMesaOpenCL and CL headers are installed > ifeq ($(BR2_PACKAGE_MESA3D_OPENCL),y) > MESA3D_PROVIDES += libopencl > MESA3D_DEPENDENCIES += clang libclc >-MESA3D_CONF_OPTS += -Dgallium-opencl=standalone >-else >-MESA3D_CONF_OPTS += -Dgallium-opencl=disabled > endif > > ifeq ($(BR2_PACKAGE_MESA3D_NEEDS_ELFUTILS),y) >@@ -126,6 +126,19 @@ MESA3D_CONF_OPTS += \ > -Dgallium-extra-hud=true > endif > >+ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ETNAVIV),y) >+MESA3D_DEPENDENCIES += host-python-pycparser >+endif >+ >+ifeq ($(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL),y) >+MESA3D_DEPENDENCIES += host-python-ply >+endif >+ >+ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS),y) >+MESA3D_CONF_OPTS += -Dintel-clc=system >+MESA3D_DEPENDENCIES += host-mesa3d spirv-llvm-translator spirv-tools >+endif >+ > ifeq ($(BR2_PACKAGE_MESA3D_VULKAN_DRIVER),) > MESA3D_CONF_OPTS += \ > -Dvulkan-drivers= >@@ -251,12 +264,33 @@ endif > ifeq ($(BR2_PACKAGE_LIBGLVND),y) > ifneq ($(BR2_PACKAGE_MESA3D_OPENGL_GLX)$(BR2_PACKAGE_MESA3D_OPENGL_EGL),) > MESA3D_DEPENDENCIES += libglvnd >-MESA3D_CONF_OPTS += -Dglvnd=true >+MESA3D_CONF_OPTS += -Dglvnd=enabled > else >-MESA3D_CONF_OPTS += -Dglvnd=false >+MESA3D_CONF_OPTS += -Dglvnd=disabled > endif > else >-MESA3D_CONF_OPTS += -Dglvnd=false >+MESA3D_CONF_OPTS += -Dglvnd=disabled > endif > >+HOST_MESA3D_CONF_OPTS = \ >+ -Dglvnd=disabled \ >+ -Dgallium-drivers=iris \ >+ -Dgallium-vdpau=disabled \ >+ -Dplatforms= \ >+ -Ddri3=disabled \ >+ -Dglx=disabled \ >+ -Dvulkan-drivers="" >+ >+HOST_MESA3D_DEPENDENCIES = \ >+ host-libclc \ >+ host-libdrm \ >+ host-python-mako \ >+ host-python-pyyaml \ >+ host-spirv-tools >+ >+define HOST_MESA3D_INSTALL_CMDS >+ $(INSTALL) -D -m 0755 $(@D)/build/src/intel/compiler/intel_clc $(HOST_DIR)/bin/intel_clc >+endef >+ > $(eval $(meson-package)) >+$(eval $(host-meson-package)) >-- >2.39.5 > >_______________________________________________ >buildroot mailing list >buildroot@buildroot.org >https://lists.buildroot.org/mailman/listinfo/buildroot _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [Buildroot] [PATCH v2 5/6] package/{mesa3d, mesa3d-headers}: bump version to 24.2.3 2024-09-23 7:07 ` Andy Yan @ 2024-10-13 9:36 ` Andy Yan 2024-12-02 16:14 ` Alex Bennée [not found] ` <87frn6dptr.fsf__47548.8251003966$1733156129$gmane$org@draig.linaro.org> 0 siblings, 2 replies; 13+ messages in thread From: Andy Yan @ 2024-10-13 9:36 UTC (permalink / raw) To: Bernd Kuhls Cc: Eric Le Bihan, Daniel Lang, buildroot, Romain Naour, Yann E . MORIN, Valentin Korenblit Hello， Can we get this series merged？ At 2024-09-23 15:07:49, "Andy Yan" <andyshrk@163.com> wrote: > >Hi Bernd, > >At 2024-09-23 03:37:50, "Bernd Kuhls" <bernd@kuhls.net> wrote: >>Release notes: >>https://lists.freedesktop.org/archives/mesa-announce/2024-May/000762.html >>https://lists.freedesktop.org/archives/mesa-announce/2024-June/000763.html >>https://lists.freedesktop.org/archives/mesa-announce/2024-June/000765.html >>https://lists.freedesktop.org/archives/mesa-announce/2024-July/000766.html >>https://lists.freedesktop.org/archives/mesa-announce/2024-July/000767.html >>https://lists.freedesktop.org/archives/mesa-announce/2024-July/000771.html >>https://lists.freedesktop.org/archives/mesa-announce/2024-August/000773.html >>https://lists.freedesktop.org/archives/mesa-announce/2024-August/000776.html >>https://lists.freedesktop.org/archives/mesa-announce/2024-September/000778.html >>https://lists.freedesktop.org/archives/mesa-announce/2024-September/000779.html >>------------------------------------------------------------------------ >>Changes needed for the bump to 24.1.x: >> >>Added dependency to llvm & Co. for iris driver due to upstream commit: >>https://cgit.freedesktop.org/mesa/mesa/commit/meson.build?h=24.1&id=a512c2a8b572c5da360873320dbbd343c6223cd6 >> >>Added host version of mesa tool intel_clc needed for target build of the >>iris driver. >> >>Added dependency to host-python-pycparser for etnaviv driver due to >>upstream commit: >>https://cgit.freedesktop.org/mesa/mesa/commit/src/etnaviv/hwdb/meson.build?h=24.1&id=2192e620bb0c68b75ff45165d0b117c7ecb77268 >> >>Added dependency to host-python-ply for intel vulkan driver due to >>upstream commit: >>https://cgit.freedesktop.org/mesa/mesa/commit/src/intel/vulkan/grl/meson.build?h=24.1&id=dc1aedef2bd054884685ad971a3ef5be07ecd101 >> >>Although this dependency exists since mesa3d 22.3 it is only needed when >>intel-clc is enabled, this dependency is added with this patch so no need >>to backport this dependency to older buildroot trees. >> >>Update configure parameter of glvnd option due to upstream commit: >>https://cgit.freedesktop.org/mesa/mesa/commit/meson.build?h=24.1&id=4f25b84b2460524d375424a81b42faa4d99c8e60 >>------------------------------------------------------------------------ >>Changes needed for the bump to 24.2.x: >> >>Added dependency to host-python-pyyaml to host and target build, needed >>due to upstream commit >>https://gitlab.freedesktop.org/mesa/mesa/-/commit/a3813327575e8875c8c3ed24b5f45a0b7ba64446 >> >>Rebased patch 0002 due to upstream commit: >>https://cgit.freedesktop.org/mesa/mesa/commit/src/gallium/drivers/vc4/meson.build?h=24.2&id=da70827656757cd070faac7aff5ca057f1e7fb8a >> >>Signed-off-by: Bernd Kuhls <bernd@kuhls.net> > > > > Tested-by: Andy Yan <andyshrk@163.com> > >Thanks > >>--- >>v2: bump to 24.2.3, added dependency to host-python-pyyaml for target >> package (Andy) >> >> package/mesa3d-headers/mesa3d-headers.mk | 2 +- >> ...tion-to-disable-optional-neon-suppor.patch | 14 ++--- >> package/mesa3d/Config.in | 11 +++- >> package/mesa3d/mesa3d.hash | 6 +-- >> package/mesa3d/mesa3d.mk | 52 +++++++++++++++---- >> 5 files changed, 64 insertions(+), 21 deletions(-) >> >>diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk >>index 33c60b285f..2d6824c61c 100644 >>--- a/package/mesa3d-headers/mesa3d-headers.mk >>+++ b/package/mesa3d-headers/mesa3d-headers.mk >>@@ -12,7 +12,7 @@ endif >> >> # Not possible to directly refer to mesa3d variables, because of >> # first/second expansion trickery... >>-MESA3D_HEADERS_VERSION = 24.0.9 >>+MESA3D_HEADERS_VERSION = 24.2.3 >> MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz >> MESA3D_HEADERS_SITE = https://archive.mesa3d.org >> MESA3D_HEADERS_DL_SUBDIR = mesa3d >>diff --git a/package/mesa3d/0002-vc4-add-meson-option-to-disable-optional-neon-suppor.patch b/package/mesa3d/0002-vc4-add-meson-option-to-disable-optional-neon-suppor.patch >>index f3919478a6..cda792b9db 100644 >>--- a/package/mesa3d/0002-vc4-add-meson-option-to-disable-optional-neon-suppor.patch >>+++ b/package/mesa3d/0002-vc4-add-meson-option-to-disable-optional-neon-suppor.patch >>@@ -9,8 +9,8 @@ to force disabling it at compile time. >> >> Upstream: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4114 >> Signed-off-by: Peter Seiderer <ps.report@gmx.net> >>-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> >>-[rebased for 20.2.0, 20.3.0, 21.1.0, 23.1.0 & 23.2.0] >>+Signed-off-by: Bernd Kuhls <bernd@kuhls.net> >>+[rebased for 20.2.0, 20.3.0, 21.1.0, 23.1.0, 23.2.0 & 24.2.1] >> Signed-off-by: Peter Seiderer <ps.report@gmx.net> >> [fix syntax error after previous rebases] >> --- >>@@ -23,7 +23,7 @@ diff --git a/meson_options.txt b/meson_options.txt >> index 8e0bf2a..1cf0e07 100644 >> --- a/meson_options.txt >> +++ b/meson_options.txt >>-@@ -124,6 +124,13 @@ option( >>+@@ -148,6 +148,13 @@ option( >> description : 'enable gallium va frontend.', >> ) >> >>@@ -41,8 +41,8 @@ diff --git a/src/gallium/drivers/vc4/meson.build b/src/gallium/drivers/vc4/meson >> index 84da951..7f950de 100644 >> --- a/src/gallium/drivers/vc4/meson.build >> +++ b/src/gallium/drivers/vc4/meson.build >>-@@ -84,7 +84,7 @@ files_libvc4 = files( >>- vc4_c_args = [] >>+@@ -72,7 +72,7 @@ files_libvc4 = files( >>+ ] >> >> libvc4_neon = [] >> -if host_machine.cpu_family() == 'arm' >>@@ -50,9 +50,9 @@ index 84da951..7f950de 100644 >> libvc4_neon = static_library( >> 'vc4_neon', >> 'vc4_tiling_lt_neon.c', >>-@@ -93,7 +93,7 @@ if host_machine.cpu_family() == 'arm' >>- ], >>+@@ -82,7 +82,7 @@ if host_machine.cpu_family() == 'arm' >> c_args : '-mfpu=neon', >>+ dependencies : vc4_deps, >> ) >> - vc4_c_args += '-DUSE_ARM_ASM' >> + vc4_c_args += '-DVC4_TILING_LT_NEON' >>diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in >>index 7761b0a650..3586451bc6 100644 >>--- a/package/mesa3d/Config.in >>+++ b/package/mesa3d/Config.in >>@@ -50,7 +50,8 @@ config BR2_PACKAGE_MESA3D_OPENCL >> bool "OpenCL support" >> depends on BR2_PACKAGE_MESA3D_LLVM >> depends on BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600 || \ >>- BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI >>+ BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI || \ >>+ BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS >> select BR2_PACKAGE_LLVM_RTTI >> select BR2_PACKAGE_CLANG >> select BR2_PACKAGE_LIBCLC >>@@ -129,10 +130,18 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_I915 >> config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS >> bool "Gallium iris driver" >> depends on BR2_i386 || BR2_x86_64 >>+ depends on BR2_PACKAGE_MESA3D_LLVM >> select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER >>+ select BR2_PACKAGE_MESA3D_OPENCL >>+ select BR2_PACKAGE_SPIRV_LLVM_TRANSLATOR >>+ select BR2_PACKAGE_SPIRV_TOOLS >> help >> Mesa driver for iris-based Intel GPUs. >> >>+comment "iris driver needs llvm" >>+ depends on BR2_i386 || BR2_x86_64 >>+ depends on !BR2_PACKAGE_MESA3D_LLVM >>+ >> config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_LIMA >> bool "Gallium lima driver" >> depends on BR2_TOOLCHAIN_HAS_SYNC_4 || !BR2_PACKAGE_XORG7 # libxshmfence >>diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash >>index d506d398b8..50385460f8 100644 >>--- a/package/mesa3d/mesa3d.hash >>+++ b/package/mesa3d/mesa3d.hash >>@@ -1,5 +1,5 @@ >>-# From https://lists.freedesktop.org/archives/mesa-announce/2024-June/000764.html >>-sha256 51aa686ca4060e38711a9e8f60c8f1efaa516baf411946ed7f2c265cd582ca4c mesa-24.0.9.tar.xz >>-sha512 de2ee6c9df1fc106ee10befe0a76be1e9cfe83d65dbdb83bad6d8d7cfaa085232fb115293a1a790b37b50b1fe14bd58aafbcfe5a15e953b5901a7105d57569a5 mesa-24.0.9.tar.xz >>+# From https://lists.freedesktop.org/archives/mesa-announce/2024-September/000779.html >>+sha256 4ea18b1155a4544a09f7361848974768f6f73c19d88f63de2ec650be313b2d0c mesa-24.2.3.tar.xz >>+sha512 7a1ace23568d1907b778a2859f97c8988a414ba74e02e1fb5af6f95f768e1b1a2dfdaf412b0d655678ed915d28273953fd1236ebcd87553a1880f1a7f3ea4d44 mesa-24.2.3.tar.xz >> # License >> sha256 a00275a53178e2645fb65be99a785c110513446a5071ff2c698ed260ad917d75 docs/license.rst >>diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk >>index ce460c4475..ad530fc214 100644 >>--- a/package/mesa3d/mesa3d.mk >>+++ b/package/mesa3d/mesa3d.mk >>@@ -5,7 +5,7 @@ >> ################################################################################ >> >> # When updating the version, please also update mesa3d-headers >>-MESA3D_VERSION = 24.0.9 >>+MESA3D_VERSION = 24.2.3 >> MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz >> MESA3D_SITE = https://archive.mesa3d.org >> MESA3D_LICENSE = MIT, SGI, Khronos >>@@ -21,12 +21,17 @@ MESA3D_DEPENDENCIES = \ >> host-bison \ >> host-flex \ >> host-python-mako \ >>+ host-python-pyyaml \ >> expat \ >> libdrm \ >> zlib >> >> MESA3D_CONF_OPTS = \ >> -Dgallium-omx=disabled \ >>+ -Dgallium-opencl=disabled \ >>+ -Dgallium-rusticl=false \ >>+ -Dmicrosoft-clc=disabled \ >>+ -Dopencl-spirv=false \ >> -Dpower8=disabled >> >> ifeq ($(BR2_PACKAGE_MESA3D_DRIVER)$(BR2_PACKAGE_XORG7),yy) >>@@ -50,14 +55,9 @@ else >> MESA3D_CONF_OPTS += -Dllvm=disabled >> endif >> >>-# Disable opencl-icd: OpenCL lib will be named libOpenCL instead of >>-# libMesaOpenCL and CL headers are installed >> ifeq ($(BR2_PACKAGE_MESA3D_OPENCL),y) >> MESA3D_PROVIDES += libopencl >> MESA3D_DEPENDENCIES += clang libclc >>-MESA3D_CONF_OPTS += -Dgallium-opencl=standalone >>-else >>-MESA3D_CONF_OPTS += -Dgallium-opencl=disabled >> endif >> >> ifeq ($(BR2_PACKAGE_MESA3D_NEEDS_ELFUTILS),y) >>@@ -126,6 +126,19 @@ MESA3D_CONF_OPTS += \ >> -Dgallium-extra-hud=true >> endif >> >>+ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ETNAVIV),y) >>+MESA3D_DEPENDENCIES += host-python-pycparser >>+endif >>+ >>+ifeq ($(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL),y) >>+MESA3D_DEPENDENCIES += host-python-ply >>+endif >>+ >>+ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS),y) >>+MESA3D_CONF_OPTS += -Dintel-clc=system >>+MESA3D_DEPENDENCIES += host-mesa3d spirv-llvm-translator spirv-tools >>+endif >>+ >> ifeq ($(BR2_PACKAGE_MESA3D_VULKAN_DRIVER),) >> MESA3D_CONF_OPTS += \ >> -Dvulkan-drivers= >>@@ -251,12 +264,33 @@ endif >> ifeq ($(BR2_PACKAGE_LIBGLVND),y) >> ifneq ($(BR2_PACKAGE_MESA3D_OPENGL_GLX)$(BR2_PACKAGE_MESA3D_OPENGL_EGL),) >> MESA3D_DEPENDENCIES += libglvnd >>-MESA3D_CONF_OPTS += -Dglvnd=true >>+MESA3D_CONF_OPTS += -Dglvnd=enabled >> else >>-MESA3D_CONF_OPTS += -Dglvnd=false >>+MESA3D_CONF_OPTS += -Dglvnd=disabled >> endif >> else >>-MESA3D_CONF_OPTS += -Dglvnd=false >>+MESA3D_CONF_OPTS += -Dglvnd=disabled >> endif >> >>+HOST_MESA3D_CONF_OPTS = \ >>+ -Dglvnd=disabled \ >>+ -Dgallium-drivers=iris \ >>+ -Dgallium-vdpau=disabled \ >>+ -Dplatforms= \ >>+ -Ddri3=disabled \ >>+ -Dglx=disabled \ >>+ -Dvulkan-drivers="" >>+ >>+HOST_MESA3D_DEPENDENCIES = \ >>+ host-libclc \ >>+ host-libdrm \ >>+ host-python-mako \ >>+ host-python-pyyaml \ >>+ host-spirv-tools >>+ >>+define HOST_MESA3D_INSTALL_CMDS >>+ $(INSTALL) -D -m 0755 $(@D)/build/src/intel/compiler/intel_clc $(HOST_DIR)/bin/intel_clc >>+endef >>+ >> $(eval $(meson-package)) >>+$(eval $(host-meson-package)) >>-- >>2.39.5 >> >>_______________________________________________ >>buildroot mailing list >>buildroot@buildroot.org >>https://lists.buildroot.org/mailman/listinfo/buildroot >_______________________________________________ >buildroot mailing list >buildroot@buildroot.org >https://lists.buildroot.org/mailman/listinfo/buildroot _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [Buildroot] [PATCH v2 5/6] package/{mesa3d, mesa3d-headers}: bump version to 24.2.3 2024-10-13 9:36 ` Andy Yan @ 2024-12-02 16:14 ` Alex Bennée [not found] ` <87frn6dptr.fsf__47548.8251003966$1733156129$gmane$org@draig.linaro.org> 1 sibling, 0 replies; 13+ messages in thread From: Alex Bennée @ 2024-12-02 16:14 UTC (permalink / raw) To: Andy Yan Cc: Bernd Kuhls, Eric Le Bihan, Daniel Lang, buildroot, Romain Naour, Yann E . MORIN, Valentin Korenblit "Andy Yan" <andyshrk@163.com> writes: > Hello， > Can we get this series merged？ I've got a branch with Bernd's patches + the enabling of VirtIO Venus and adding vkmark to the build. If Bernd's ok with it I can post it to the list today. -- Alex Bennée Virtualisation Tech Lead @ Linaro _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 13+ messages in thread
[parent not found: <87frn6dptr.fsf__47548.8251003966$1733156129$gmane$org@draig.linaro.org>]
* Re: [Buildroot] [PATCH v2 5/6] package/{mesa3d, mesa3d-headers}: bump version to 24.2.3 [not found] ` <87frn6dptr.fsf__47548.8251003966$1733156129$gmane$org@draig.linaro.org> @ 2024-12-02 17:44 ` Bernd Kuhls 2024-12-02 18:03 ` Alex Bennée 0 siblings, 1 reply; 13+ messages in thread From: Bernd Kuhls @ 2024-12-02 17:44 UTC (permalink / raw) To: buildroot Am Mon, 02 Dec 2024 16:14:56 +0000 schrieb Alex Bennée: > "Andy Yan" <andyshrk@163.com> writes: > >> Hello， >> Can we get this series merged？ > > I've got a branch with Bernd's patches + the enabling of VirtIO Venus > and adding vkmark to the build. If Bernd's ok with it I can post it to > the list today. Hi Andy, I sent a new patch series bumping mesa3d to 24.3.0 a couple of minutes ago: https://patchwork.ozlabs.org/project/buildroot/list/?series=434934 Run-time test with my Intel-based system and gbm/egl works, did not build- test it with x11/wayland however. Please add your patches to this most up- to-date patch series, thanks. Regards, Bernd _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [Buildroot] [PATCH v2 5/6] package/{mesa3d, mesa3d-headers}: bump version to 24.2.3 2024-12-02 17:44 ` Bernd Kuhls @ 2024-12-02 18:03 ` Alex Bennée 2024-12-02 18:18 ` Bernd Kuhls 2024-12-03 9:18 ` Andy Yan 0 siblings, 2 replies; 13+ messages in thread From: Alex Bennée @ 2024-12-02 18:03 UTC (permalink / raw) To: Bernd Kuhls; +Cc: buildroot Bernd Kuhls <bernd@kuhls.net> writes: > Am Mon, 02 Dec 2024 16:14:56 +0000 schrieb Alex Bennée: > >> "Andy Yan" <andyshrk@163.com> writes: >> >>> Hello， >>> Can we get this series merged？ >> >> I've got a branch with Bernd's patches + the enabling of VirtIO Venus >> and adding vkmark to the build. If Bernd's ok with it I can post it to >> the list today. > > Hi Andy, > > I sent a new patch series bumping mesa3d to 24.3.0 a couple of minutes > ago: https://patchwork.ozlabs.org/project/buildroot/list/?series=434934 > > Run-time test with my Intel-based system and gbm/egl works, did not build- > test it with x11/wayland however. Please add your patches to this most up- > to-date patch series, thanks. I have updates to the VirtIO patches and enabling vkmark. Should I post those separately or combine and re-post with your latest series? > > Regards, Bernd > > _______________________________________________ > buildroot mailing list > buildroot@buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot -- Alex Bennée Virtualisation Tech Lead @ Linaro _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [Buildroot] [PATCH v2 5/6] package/{mesa3d, mesa3d-headers}: bump version to 24.2.3 2024-12-02 18:03 ` Alex Bennée @ 2024-12-02 18:18 ` Bernd Kuhls 2024-12-03 9:18 ` Andy Yan 1 sibling, 0 replies; 13+ messages in thread From: Bernd Kuhls @ 2024-12-02 18:18 UTC (permalink / raw) To: buildroot; +Cc: buildroot Am Mon, 02 Dec 2024 18:03:17 +0000 schrieb Alex Bennée: > I have updates to the VirtIO patches and enabling vkmark. Should I post > those separately or combine and re-post with your latest series? Hi Andy, please combine and re-post with my latest series, I will then mark my series as "Superseded" in patchworks. This avoids having the buildroot maintainers to pick up scattered patches ;) Regards, Bernd _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [Buildroot] [PATCH v2 5/6] package/{mesa3d, mesa3d-headers}: bump version to 24.2.3 2024-12-02 18:03 ` Alex Bennée 2024-12-02 18:18 ` Bernd Kuhls @ 2024-12-03 9:18 ` Andy Yan 1 sibling, 0 replies; 13+ messages in thread From: Andy Yan @ 2024-12-03 9:18 UTC (permalink / raw) To: Alex Bennée; +Cc: Bernd Kuhls, buildroot Hi All, 在 2024-12-03 02:03:17，"Alex Bennée" <alex.bennee@linaro.org> 写道： >Bernd Kuhls <bernd@kuhls.net> writes: > >> Am Mon, 02 Dec 2024 16:14:56 +0000 schrieb Alex Bennée: >> >>> "Andy Yan" <andyshrk@163.com> writes: >>> >>>> Hello， >>>> Can we get this series merged？ >>> >>> I've got a branch with Bernd's patches + the enabling of VirtIO Venus >>> and adding vkmark to the build. If Bernd's ok with it I can post it to >>> the list today. >> >> Hi Andy, >> >> I sent a new patch series bumping mesa3d to 24.3.0 a couple of minutes >> ago: https://patchwork.ozlabs.org/project/buildroot/list/?series=434934 >> >> Run-time test with my Intel-based system and gbm/egl works, did not build- >> test it with x11/wayland however. Please add your patches to this most up- >> to-date patch series, thanks. I guess this refers to Alex's patch。Actually, I don't have the relevant patch here, but I am indeed looking forward to this series of patches being merged sooner. Because mesa 24.1.0 is the first version which can support Arm Mali 10th generation GPU valhal。 > >I have updates to the VirtIO patches and enabling vkmark. Should I post >those separately or combine and re-post with your latest series? > >> >> Regards, Bernd >> >> _______________________________________________ >> buildroot mailing list >> buildroot@buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot > >-- >Alex Bennée >Virtualisation Tech Lead @ Linaro >_______________________________________________ >buildroot mailing list >buildroot@buildroot.org >https://lists.buildroot.org/mailman/listinfo/buildroot _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 13+ messages in thread
* [Buildroot] [PATCH 6/6] package/mesa3d: add option to enable VIRTIO vulkan driver 2024-09-22 19:37 [Buildroot] [PATCH 1/6] package/libdrm: add host variant Bernd Kuhls ` (3 preceding siblings ...) 2024-09-22 19:37 ` [Buildroot] [PATCH v2 5/6] package/{mesa3d, mesa3d-headers}: bump version to 24.2.3 Bernd Kuhls @ 2024-09-22 19:37 ` Bernd Kuhls 4 siblings, 0 replies; 13+ messages in thread From: Bernd Kuhls @ 2024-09-22 19:37 UTC (permalink / raw) To: buildroot Cc: Eric Le Bihan, Daniel Lang, Romain Naour, Yann E . MORIN, Valentin Korenblit From: Alex Bennée <alex.bennee@linaro.org> The support for Venus in MESA has been stable since 23.2 so add an option to enable it. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Signed-off-by: Bernd Kuhls <bernd@kuhls.net> --- package/mesa3d/Config.in | 6 ++++++ package/mesa3d/mesa3d.mk | 1 + 2 files changed, 7 insertions(+) diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index 3586451bc6..dfd323eb56 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -323,6 +323,12 @@ config BR2_PACKAGE_MESA3D_VULKAN_DRIVER_SWRAST help Vulkan swrast driver. +config BR2_PACKAGE_MESA3D_VULKAN_DRIVER_VIRTIO + bool "Vulkan VirtIO driver (Venus)" + select BR2_PACKAGE_MESA3D_VULKAN_DRIVER + help + Vulkan VirtIO (venus) driver. + comment "Off-screen Rendering" config BR2_PACKAGE_MESA3D_OSMESA_GALLIUM diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index ad530fc214..5dffd06116 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -114,6 +114,7 @@ MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VIRGL) += virgl MESA3D_VULKAN_DRIVERS-$(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_BROADCOM) += broadcom MESA3D_VULKAN_DRIVERS-$(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL) += intel MESA3D_VULKAN_DRIVERS-$(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_SWRAST) += swrast +MESA3D_VULKAN_DRIVERS-$(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_VIRTIO) += virtio ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER),) MESA3D_CONF_OPTS += \ -- 2.39.5 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 13+ messages in thread
end of thread, other threads:[~2024-12-03 9:19 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-09-22 19:37 [Buildroot] [PATCH 1/6] package/libdrm: add host variant Bernd Kuhls
2024-09-22 19:37 ` [Buildroot] [PATCH 2/6] package/llvm-project/libclc: " Bernd Kuhls
2024-09-22 19:37 ` [Buildroot] [PATCH 3/6] package/spirv-llvm-translator: add target variant to provide LLVMSPIRVLib Bernd Kuhls
2024-09-22 19:37 ` [Buildroot] [PATCH 4/6] package/spirv-tools: add host variant Bernd Kuhls
2024-09-22 19:37 ` [Buildroot] [PATCH v2 5/6] package/{mesa3d, mesa3d-headers}: bump version to 24.2.3 Bernd Kuhls
2024-09-23 7:07 ` Andy Yan
2024-10-13 9:36 ` Andy Yan
2024-12-02 16:14 ` Alex Bennée
[not found] ` <87frn6dptr.fsf__47548.8251003966$1733156129$gmane$org@draig.linaro.org>
2024-12-02 17:44 ` Bernd Kuhls
2024-12-02 18:03 ` Alex Bennée
2024-12-02 18:18 ` Bernd Kuhls
2024-12-03 9:18 ` Andy Yan
2024-09-22 19:37 ` [Buildroot] [PATCH 6/6] package/mesa3d: add option to enable VIRTIO vulkan driver Bernd Kuhls
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox