package/{mesa3d, mesa3d-headers}: bump version to 22.1.3
upgrade the mesa3d and mesa3d-headers to v22.1.3 and copy patch from IMG DDK 1.19 keep the 0002-Force-Mesa-to-use-the-PVR-driver-for-platform-device.patch to force the pvr driver Note that the new version mesa3d support gallium driver and no longer support dri driver Signed-off-by: Andy Hu <andy.hu@starfivetech.com> Signed-off-by: Windsome Zeng <Windsome.Zeng@starfivetech.com>
This commit is contained in:
Regular → Executable
+58
-90
@@ -24,19 +24,21 @@ config BR2_PACKAGE_MESA3D_NEEDS_ELFUTILS
|
||||
config BR2_PACKAGE_MESA3D_LLVM
|
||||
bool "llvm support"
|
||||
depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::shared_future
|
||||
depends on !BR2_STATIC_LIBS
|
||||
depends on BR2_USE_WCHAR # std::wstring
|
||||
depends on BR2_HOST_GCC_AT_LEAST_5 # host-llvm
|
||||
select BR2_PACKAGE_LLVM
|
||||
|
||||
comment "llvm support needs a toolchain w/ wchar, threads, C++, gcc >= 4.8, dynamic library"
|
||||
comment "llvm support needs a toolchain w/ wchar, threads, C++, gcc >= 5, dynamic library, host gcc >= 5"
|
||||
depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \
|
||||
!BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \
|
||||
|| BR2_STATIC_LIBS || !BR2_USE_WCHAR
|
||||
!BR2_TOOLCHAIN_GCC_AT_LEAST_5 \
|
||||
|| BR2_STATIC_LIBS || !BR2_USE_WCHAR \
|
||||
|| !BR2_HOST_GCC_AT_LEAST_5
|
||||
|
||||
comment "llvm support needs a toolchain not affected by GCC bug 64735"
|
||||
depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS
|
||||
@@ -54,21 +56,15 @@ config BR2_PACKAGE_MESA3D_OPENCL
|
||||
select BR2_PACKAGE_LIBCLC
|
||||
select BR2_PACKAGE_HAS_LIBOPENCL
|
||||
|
||||
# inform the .mk file of gallium, dri or vulkan driver selection
|
||||
# inform the .mk file of gallium, dri, dri3 or vulkan driver selection
|
||||
config BR2_PACKAGE_MESA3D_DRI3
|
||||
bool
|
||||
select BR2_PACKAGE_XLIB_LIBXSHMFENCE
|
||||
|
||||
config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER
|
||||
bool
|
||||
select BR2_PACKAGE_MESA3D_DRIVER
|
||||
|
||||
config BR2_PACKAGE_MESA3D_DRI_DRIVER
|
||||
bool
|
||||
select BR2_PACKAGE_MESA3D_DRIVER
|
||||
select BR2_PACKAGE_MESA3D_GBM if \
|
||||
!BR2_PACKAGE_MESA3D_OPENGL_GLX && \
|
||||
!BR2_PACKAGE_MESA3D_OPENGL_EGL
|
||||
select BR2_PACKAGE_XLIB_LIBXSHMFENCE if \
|
||||
(BR2_PACKAGE_XORG7 && BR2_TOOLCHAIN_HAS_SYNC_4 && \
|
||||
!BR2_RISCV_32)
|
||||
|
||||
config BR2_PACKAGE_MESA3D_VULKAN_DRIVER
|
||||
bool
|
||||
select BR2_PACKAGE_MESA3D_DRIVER
|
||||
@@ -97,8 +93,17 @@ config BR2_PACKAGE_MESA3D_NEEDS_X11
|
||||
|
||||
comment "Gallium drivers"
|
||||
|
||||
config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_CROCUS
|
||||
bool "Gallium crocus driver"
|
||||
depends on BR2_i386 || BR2_x86_64
|
||||
select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER
|
||||
help
|
||||
Mesa driver for gen4-7 Intel GPUs.
|
||||
|
||||
config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ETNAVIV
|
||||
bool "Gallium Etnaviv driver"
|
||||
depends on (BR2_TOOLCHAIN_HAS_SYNC_4 && !BR2_RISCV_32) || !BR2_PACKAGE_XORG7 # libxshmfence
|
||||
select BR2_PACKAGE_MESA3D_DRI3 if BR2_PACKAGE_XORG7
|
||||
select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER
|
||||
select BR2_PACKAGE_LIBDRM_ETNAVIV
|
||||
help
|
||||
@@ -112,6 +117,7 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_FREEDRENO
|
||||
# can't see is just spurious. However, that dependency is about
|
||||
# the toolchain having sync4 primitives, which is always a given
|
||||
# for arm/aarch64.
|
||||
select BR2_PACKAGE_MESA3D_DRI3 if BR2_PACKAGE_XORG7
|
||||
select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER
|
||||
select BR2_PACKAGE_LIBDRM_FREEDRENO
|
||||
help
|
||||
@@ -120,16 +126,11 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_FREEDRENO
|
||||
config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_I915
|
||||
bool "Gallium i915 driver"
|
||||
depends on BR2_i386 || BR2_x86_64
|
||||
depends on !BR2_PACKAGE_MESA3D_DRI_DRIVER_I915
|
||||
select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER
|
||||
select BR2_PACKAGE_LIBDRM_INTEL
|
||||
help
|
||||
Support for i915-based Intel GPUs.
|
||||
|
||||
comment "Gallium i915: Only one i915 provider can be built"
|
||||
depends on BR2_i386 || BR2_x86_64
|
||||
depends on BR2_PACKAGE_MESA3D_DRI_DRIVER_I915
|
||||
|
||||
config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS
|
||||
bool "Gallium iris driver"
|
||||
depends on BR2_i386 || BR2_x86_64
|
||||
@@ -139,6 +140,8 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS
|
||||
|
||||
config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_LIMA
|
||||
bool "Gallium lima driver"
|
||||
depends on (BR2_TOOLCHAIN_HAS_SYNC_4 && !BR2_RISCV_32) || !BR2_PACKAGE_XORG7 # libxshmfence
|
||||
select BR2_PACKAGE_MESA3D_DRI3 if BR2_PACKAGE_XORG7
|
||||
select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER
|
||||
help
|
||||
Mesa driver for ARM Mali Utgard GPUs.
|
||||
@@ -154,6 +157,8 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU
|
||||
|
||||
config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_PANFROST
|
||||
bool "Gallium panfrost driver"
|
||||
depends on (BR2_TOOLCHAIN_HAS_SYNC_4 && !BR2_RISCV_32) || !BR2_PACKAGE_XORG7 # libxshmfence
|
||||
select BR2_PACKAGE_MESA3D_DRI3 if BR2_PACKAGE_XORG7
|
||||
select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER
|
||||
help
|
||||
Mesa driver for ARM Mali Midgard and Bifrost GPUs.
|
||||
@@ -241,8 +246,10 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_TEGRA
|
||||
config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D
|
||||
bool "Gallium v3d driver"
|
||||
depends on (BR2_arm && BR2_ARM_CPU_HAS_NEON) || BR2_aarch64
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4 || !BR2_PACKAGE_XORG7 # libxshmfence
|
||||
select BR2_PACKAGE_MESA3D_DRI3 if BR2_PACKAGE_XORG7
|
||||
select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER
|
||||
select BR2_PACKAGE_LIBDRM_VC4
|
||||
select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4 # runtime
|
||||
select BR2_PACKAGE_MESA3D_OPENGL_EGL
|
||||
help
|
||||
Driver for Broadcom VC6 (rpi4) GPUs (needs vc4).
|
||||
@@ -254,7 +261,9 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D
|
||||
|
||||
config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4
|
||||
bool "Gallium vc4 driver"
|
||||
depends on BR2_arm || BR2_aarch64
|
||||
depends on (BR2_arm && BR2_ARM_CPU_HAS_NEON) || BR2_aarch64
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4 || !BR2_PACKAGE_XORG7 # libxshmfence
|
||||
select BR2_PACKAGE_MESA3D_DRI3 if BR2_PACKAGE_XORG7
|
||||
select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER
|
||||
select BR2_PACKAGE_LIBDRM_VC4
|
||||
select BR2_PACKAGE_MESA3D_OPENGL_EGL
|
||||
@@ -270,6 +279,14 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VIRGL
|
||||
virgl is the 3D acceleration backend for the virtio-gpu
|
||||
shipping with qemu.
|
||||
|
||||
config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_PVR
|
||||
bool "Gallium pvr driver"
|
||||
depends on BR2_PACKAGE_IMG_GPU_POWERVR
|
||||
select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER
|
||||
select BR2_PACKAGE_MESA3D_OPENGL_EGL
|
||||
help
|
||||
pvr is the 3D acceleration backend for Imagination PowerVR GPUs
|
||||
|
||||
config BR2_PACKAGE_MESA3D_VDPAU
|
||||
bool "Gallium VDPAU state tracker"
|
||||
depends on BR2_PACKAGE_XORG7
|
||||
@@ -308,76 +325,24 @@ comment "Gallium XvMC state tracker needs X.org and gallium drivers r600 or nouv
|
||||
!(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU \
|
||||
|| BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600)
|
||||
|
||||
comment "DRI drivers"
|
||||
|
||||
config BR2_PACKAGE_MESA3D_DRI_DRIVER_I915
|
||||
bool "DRI i915 driver"
|
||||
depends on BR2_i386 || BR2_x86_64
|
||||
select BR2_PACKAGE_MESA3D_DRI_DRIVER
|
||||
select BR2_PACKAGE_LIBDRM_INTEL
|
||||
help
|
||||
Support for i915-based Intel GPUs.
|
||||
|
||||
config BR2_PACKAGE_MESA3D_DRI_DRIVER_I965
|
||||
bool "DRI i965 driver"
|
||||
depends on BR2_i386 || BR2_x86_64
|
||||
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 # memfd.h
|
||||
select BR2_PACKAGE_MESA3D_DRI_DRIVER
|
||||
select BR2_PACKAGE_LIBDRM_INTEL
|
||||
help
|
||||
Support for i965-based Intel GPUs.
|
||||
|
||||
comment "DRI i965 driver needs a toolchain w/ headers >= 3.17"
|
||||
depends on BR2_i386 || BR2_x86_64
|
||||
depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17
|
||||
|
||||
config BR2_PACKAGE_MESA3D_DRI_DRIVER_NOUVEAU
|
||||
bool "DRI nouveau driver"
|
||||
select BR2_PACKAGE_MESA3D_DRI_DRIVER
|
||||
select BR2_PACKAGE_LIBDRM_NOUVEAU
|
||||
help
|
||||
Support for Nvidia-based GPUs.
|
||||
|
||||
config BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON
|
||||
bool "DRI radeon r100 driver"
|
||||
depends on BR2_i386 || BR2_x86_64
|
||||
# libdrm's radeon option depends on LIBDRM_HAS_ATOMIC. Propagating
|
||||
# that dependency here causes a circular dependency that Kconfig
|
||||
# can't see is just spurious. However, that dependency is about
|
||||
# the toolchain having sync4 primitives, which is always a given
|
||||
# for i386 and x86_64.
|
||||
select BR2_PACKAGE_MESA3D_DRI_DRIVER
|
||||
select BR2_PACKAGE_LIBDRM_RADEON
|
||||
help
|
||||
Legacy Radeon driver for R100 series GPUs.
|
||||
|
||||
config BR2_PACKAGE_MESA3D_DRI_DRIVER_PVR
|
||||
bool "DRI pvr driver"
|
||||
depends on BR2_PACKAGE_IMG_GPU_POWERVR
|
||||
select BR2_PACKAGE_MESA3D_DRI_DRIVER
|
||||
help
|
||||
Support for Imagination PowerVR GPUs.
|
||||
|
||||
comment "Vulkan drivers"
|
||||
|
||||
config BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL
|
||||
bool "Vulkan Intel driver"
|
||||
depends on BR2_i386 || BR2_x86_64
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libxshmfence
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4 || !BR2_PACKAGE_XORG7 # libxshmfence
|
||||
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 # memfd.h
|
||||
depends on BR2_TOOLCHAIN_USES_GLIBC # ifunc, static_assert
|
||||
depends on BR2_PACKAGE_XORG7 # xorgproto
|
||||
select BR2_PACKAGE_MESA3D_DRI3 if BR2_PACKAGE_XORG7
|
||||
select BR2_PACKAGE_MESA3D_VULKAN_DRIVER
|
||||
select BR2_PACKAGE_XORGPROTO
|
||||
select BR2_PACKAGE_XLIB_LIBXSHMFENCE
|
||||
help
|
||||
Vulkan driver for Intel hardware from Ivy Bridge onward.
|
||||
|
||||
comment "intel vulkan depends on X.org and needs a glibc toolchain w/ headers >= 3.17"
|
||||
comment "intel vulkan needs a glibc toolchain w/ headers >= 3.17"
|
||||
depends on BR2_i386 || BR2_x86_64
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4 || !BR2_PACKAGE_XORG7
|
||||
depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 || \
|
||||
!BR2_TOOLCHAIN_USES_GLIBC || !BR2_PACKAGE_XORG7
|
||||
!BR2_TOOLCHAIN_USES_GLIBC
|
||||
|
||||
comment "Off-screen Rendering"
|
||||
|
||||
@@ -393,22 +358,22 @@ comment "OpenGL API Support"
|
||||
|
||||
config BR2_PACKAGE_MESA3D_GBM
|
||||
bool "gbm"
|
||||
depends on BR2_PACKAGE_MESA3D_DRI_DRIVER \
|
||||
|| (BR2_PACKAGE_MESA3D_GALLIUM_DRIVER && BR2_PACKAGE_MESA3D_OPENGL_EGL)
|
||||
depends on BR2_PACKAGE_MESA3D_GALLIUM_DRIVER && \
|
||||
BR2_PACKAGE_MESA3D_OPENGL_EGL
|
||||
select BR2_PACKAGE_HAS_LIBGBM
|
||||
select BR2_PACKAGE_LIBGBM_HAS_FEATURE_FORMAT_MODIFIER_PLANE_COUNT
|
||||
select BR2_PACKAGE_LIBGBM_HAS_FEATURE_DMA_BUF
|
||||
help
|
||||
Enable Generic Buffer Management (gbm)
|
||||
|
||||
comment "gbm support needs a dri driver or a gallium driver w/ EGL support."
|
||||
depends on !BR2_PACKAGE_MESA3D_DRI_DRIVER \
|
||||
&& !(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER && BR2_PACKAGE_MESA3D_OPENGL_EGL)
|
||||
comment "gbm support needs a gallium driver w/ EGL support."
|
||||
depends on !(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER && BR2_PACKAGE_MESA3D_OPENGL_EGL)
|
||||
|
||||
config BR2_PACKAGE_MESA3D_OPENGL_GLX
|
||||
bool "OpenGL GLX"
|
||||
depends on BR2_PACKAGE_XORG7
|
||||
select BR2_PACKAGE_HAS_LIBGL
|
||||
select BR2_PACKAGE_HAS_LIBGL if !BR2_PACKAGE_LIBGLVND
|
||||
select BR2_PACKAGE_LIBGLVND_DISPATCH_GL if BR2_PACKAGE_LIBGLVND
|
||||
select BR2_PACKAGE_MESA3D_NEEDS_X11
|
||||
help
|
||||
Enable GLX graphic acceleration (OpenGL + X11).
|
||||
@@ -418,7 +383,9 @@ comment "OpenGL GLX support needs X11"
|
||||
|
||||
config BR2_PACKAGE_MESA3D_OPENGL_EGL
|
||||
bool "OpenGL EGL"
|
||||
select BR2_PACKAGE_HAS_LIBEGL
|
||||
depends on BR2_PACKAGE_MESA3D_GALLIUM_DRIVER
|
||||
select BR2_PACKAGE_HAS_LIBEGL if !BR2_PACKAGE_LIBGLVND
|
||||
select BR2_PACKAGE_LIBGLVND_DISPATCH_EGL if BR2_PACKAGE_LIBGLVND
|
||||
select BR2_PACKAGE_HAS_LIBEGL_WAYLAND
|
||||
select BR2_PACKAGE_MESA3D_GBM
|
||||
help
|
||||
@@ -427,7 +394,8 @@ config BR2_PACKAGE_MESA3D_OPENGL_EGL
|
||||
|
||||
config BR2_PACKAGE_MESA3D_OPENGL_ES
|
||||
bool "OpenGL ES"
|
||||
select BR2_PACKAGE_HAS_LIBGLES
|
||||
select BR2_PACKAGE_HAS_LIBGLES if !BR2_PACKAGE_LIBGLVND
|
||||
select BR2_PACKAGE_LIBGLVND_DISPATCH_GLES if BR2_PACKAGE_LIBGLVND
|
||||
help
|
||||
Use the Khronos OpenGL ES APIs. This is commonly used on
|
||||
embedded systems and represents a subset of the OpenGL API.
|
||||
@@ -438,13 +406,13 @@ config BR2_PACKAGE_PROVIDES_LIBGBM
|
||||
default "mesa3d" if BR2_PACKAGE_MESA3D_GBM
|
||||
|
||||
config BR2_PACKAGE_PROVIDES_LIBGL
|
||||
default "mesa3d" if BR2_PACKAGE_MESA3D_OPENGL_GLX
|
||||
default "mesa3d" if BR2_PACKAGE_MESA3D_OPENGL_GLX && !BR2_PACKAGE_LIBGLVND
|
||||
|
||||
config BR2_PACKAGE_PROVIDES_LIBEGL
|
||||
default "mesa3d" if BR2_PACKAGE_MESA3D_OPENGL_EGL
|
||||
default "mesa3d" if BR2_PACKAGE_MESA3D_OPENGL_EGL && !BR2_PACKAGE_LIBGLVND
|
||||
|
||||
config BR2_PACKAGE_PROVIDES_LIBGLES
|
||||
default "mesa3d" if BR2_PACKAGE_MESA3D_OPENGL_ES
|
||||
default "mesa3d" if BR2_PACKAGE_MESA3D_OPENGL_ES && !BR2_PACKAGE_LIBGLVND
|
||||
|
||||
config BR2_PACKAGE_PROVIDES_LIBOPENCL
|
||||
default "mesa3d" if BR2_PACKAGE_MESA3D_OPENCL
|
||||
|
||||
Reference in New Issue
Block a user