From 24a7da712b7053b849d4bb4dfe4f665bb27e013f Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Fri, 8 Aug 2025 07:54:59 -0700 Subject: [PATCH] Revert "fix: Update bazzite.patch and mesa.spec for 25.2.0 (#6008)" (#6018) (#6021) This reverts commit a25aa6cfefabbcea7f7f0921ceb777949e3f2299. (cherry picked from commit a7df4e89c55aac7fb142b12f0236b0f369d186e2) Co-authored-by: madomado --- anda/lib/mesa/bazzite.patch | 608 ++++++++++++++++++++++++++++++++---- anda/lib/mesa/mesa.spec | 75 ++++- 2 files changed, 617 insertions(+), 66 deletions(-) diff --git a/anda/lib/mesa/bazzite.patch b/anda/lib/mesa/bazzite.patch index a0d329361f..009479fd97 100644 --- a/anda/lib/mesa/bazzite.patch +++ b/anda/lib/mesa/bazzite.patch @@ -1,16 +1,256 @@ -From cc3cc28e7b1e76d3640be7a497271475fdcfc550 Mon Sep 17 00:00:00 2001 +From 27e5ca5e9f32a3dab5d9f22e53c34133a98fc1ef Mon Sep 17 00:00:00 2001 +From: Antheas Kapenekakis +Date: Sat, 15 Mar 2025 16:38:53 +0100 +Subject: [PATCH 01/11] [NA] Developer files, readme, etc + +--- + Containerfile | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++ + sync.sh | 94 ++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 211 insertions(+) + create mode 100644 Containerfile + create mode 100755 sync.sh + +diff --git a/Containerfile b/Containerfile +new file mode 100644 +index 00000000000..ba4ecf6c172 +--- /dev/null ++++ b/Containerfile +@@ -0,0 +1,117 @@ ++ARG FEDORA_VERSION=41 ++ ++FROM fedora:${FEDORA_VERSION} ++ ++# noarch ++RUN dnf5 install -y \ ++ meson \ ++ python3-mako \ ++ python3-ply \ ++ python3-pycparser \ ++ rust-paste-devel \ ++ rust-proc-macro2-devel \ ++ rust-quote-devel \ ++ cargo-rpm-macros \ ++ rust-syn+clone-impls-devel \ ++ rust-unicode-ident-devel \ ++ vulkan-headers \ ++ wayland-protocols-devel \ ++ xorg-x11-proto-devel \ ++ && dnf5 clean all ++ ++# x86_64 ++RUN dnf5 install -y \ ++ bindgen-cli \ ++ bison \ ++ cbindgen \ ++ clang-devel \ ++ elfutils-libelf-devel \ ++ expat-devel \ ++ flex \ ++ gcc \ ++ gettext \ ++ glslang \ ++ kernel-headers \ ++ libX11-devel \ ++ libXdamage-devel \ ++ libXext-devel \ ++ libXfixes-devel \ ++ libXrandr-devel \ ++ libXxf86vm-devel \ ++ libclc-devel \ ++ libdrm-devel \ ++ libglvnd-core-devel \ ++ libselinux-devel \ ++ libunwind-devel \ ++ libva-devel \ ++ libvdpau-devel \ ++ libxcb-devel \ ++ libxshmfence-devel \ ++ libzstd-devel \ ++ python3-devel \ ++ lm_sensors-devel \ ++ python3-pyyaml \ ++ valgrind-devel \ ++ spirv-llvm-translator-devel \ ++ spirv-tools-devel \ ++ vulkan-loader-devel \ ++ wayland-devel \ ++ zlib-ng-compat-devel ++ ++# x86 ++RUN dnf5 install -y \ ++ clang-devel.i686 \ ++ elfutils-libelf-devel.i686 \ ++ expat-devel.i686 \ ++ glslang.i686 \ ++ kernel-headers.i686 \ ++ libX11-devel.i686 \ ++ libXdamage-devel.i686 \ ++ libXext-devel.i686 \ ++ libXfixes-devel.i686 \ ++ libXrandr-devel.i686 \ ++ libXxf86vm-devel.i686 \ ++ libclc-devel.i686 \ ++ libdrm-devel.i686 \ ++ libglvnd-core-devel.i686 \ ++ libselinux-devel.i686 \ ++ libunwind-devel.i686 \ ++ libva-devel.i686 \ ++ libvdpau-devel.i686 \ ++ libxcb-devel.i686 \ ++ libxshmfence-devel.i686 \ ++ libzstd-devel.i686 \ ++ python3-devel.i686 \ ++ lm_sensors-devel.i686 \ ++ valgrind-devel.i686 \ ++ spirv-llvm-translator-devel.i686 \ ++ spirv-tools-devel.i686 \ ++ vulkan-loader-devel.i686 \ ++ wayland-devel.i686 \ ++ zlib-ng-compat-devel.i686 \ ++ pkgconf-pkg-config.i686 ++ ++# these do not have an i686 version ++# bindgen-cli.i686 \ ++# bison.i686 \ ++# cbindgen.i686 \ ++# flex.i686 \ ++# gcc.i686 \ ++# gettext.i686 \ ++# python3-pyyaml.i686 \ ++ ++RUN dnf install -y ccache ++ ++ARG UID=1000 ++ARG GID=1000 ++ ++RUN groupadd -g $GID -o builder && \ ++ useradd -m -u $UID -g $GID -o -s /bin/bash builder && \ ++ echo "builder ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/builder && \ ++ chmod 0440 /etc/sudoers.d/builder ++ ++USER builder ++ ++ENV PATH="/usr/lib64/ccache/:$PATH" ++ ++WORKDIR /workspace +\ No newline at end of file +diff --git a/sync.sh b/sync.sh +new file mode 100755 +index 00000000000..f0fa113f876 +--- /dev/null ++++ b/sync.sh +@@ -0,0 +1,94 @@ ++if [ -z "$1" ]; then ++ echo "Usage: $0 " ++ exit 1 ++fi ++ ++# https://gist.github.com/Venemo/a9483106565df3a83fc67a411191edbd ++ ++RHOST=$1 ++RSYNC="rsync -rv --exclude .git --exclude venv --exclude __pycache__ --links" ++DEVUSER=${DEVUSER:-bazzite} ++ ++# If RHOST=claw, set driver name to intel ++if [ "$RHOST" = "claw" ]; then ++ echo "Using Intel driver" ++ DRIVER_NAME=intel ++ VKICD_NAME=intel ++ GALLIUM_DRIVER=iris ++else ++ echo "Using AMD driver" ++ DRIVER_NAME=amd ++ VKICD_NAME=radeon ++ GALLIUM_DRIVER=radeonsi ++fi ++ ++set -e -x ++ ++sudo podman build . --tag mesa_builder \ ++ --build-arg UID=$(id -u) --build-arg GID=$(id -g) ++ ++PODMAN_RUN="sudo podman run --rm -v $(pwd):/workspace \ ++ --env CCACHE_DIR=/workspace/.cache \ ++ --env CCACHE_MAXSIZE=5G \ ++ --env CCACHE_COMPRESS=1 \ ++ -it mesa_builder" ++ ++$PODMAN_RUN rm -rf build64 build32 ++ ++$PODMAN_RUN meson setup build64 --libdir lib64 --prefix /workspace/.out \ ++ -Dgallium-drivers=swrast,zink,$GALLIUM_DRIVER -Dvulkan-drivers=$DRIVER_NAME \ ++ -Dgallium-nine=true -Dbuildtype=release \ ++ -Dvideo-codecs=h264dec,h264enc,h265dec,h265enc,vc1dec ++ ++# Cross-file for arch: lib32, fedora: ./gcc-i686 ++$PODMAN_RUN meson setup build32 --libdir lib --prefix /workspace/.out \ ++ -Dgallium-drivers=swrast,zink,$GALLIUM_DRIVER -Dvulkan-drivers=$DRIVER_NAME \ ++ -Dgallium-nine=true -Dbuildtype=release \ ++ -Dvideo-codecs=h264dec,h264enc,h265dec,h265enc,vc1dec ++ ++time $PODMAN_RUN ninja -C build64 install ++ ++time $PODMAN_RUN ninja -C build32 install ++ ++RUNCONFIG=$(cat << EOF ++ ++ ++MESA=/home/$DEVUSER/.out ++ ++export LD_LIBRARY_PATH=\$MESA/lib64:\$MESA/lib:\$LD_LIBRARY_PATH ++export LIBGL_DRIVERS_PATH=\$MESA/lib64/dri:\$MESA/lib/dri ++export EGL_DRIVERS_PATH=\$MESA/lib64/dri:\$MESA/lib/dri ++export VK_ICD_FILENAMES=\$MESA/share/vulkan/icd.d/${VKICD_NAME}_icd.x86_64.json:\$MESA/share/vulkan/icd.d/${VKICD_NAME}_icd.i686.json ++export LIBVA_DRIVERS_PATH=\$MESA/lib64/dri:\$MESA/lib/dri ++export VDPAU_DRIVER_PATH=\$MESA/lib64/vdpau ++export D3D_MODULE_PATH=\$MESA/lib64/d3d/d3dadapter9.so.1:\$MESA/lib/d3d/d3dadapter9.so.1 ++# export ENABLE_GAMESCOPE_WSI=0 ++ ++EOF ++) ++ ++ssh $RHOST /bin/bash << EOF ++ rm -rf .out ++ mkdir -p .out ++EOF ++ ++echo "$RUNCONFIG" > .out/runconfig ++ ++# Fixup vunkan_icd install dir ++sed -i "s|/workspace/.out|/home/$DEVUSER/.out|g" .out/share/vulkan/icd.d/*.json ++ ++$RSYNC .out/ $RHOST:.out/ ++ ++ssh $RHOST /bin/bash << EOF ++ sudo rpm-ostree usroverlay --hotfix ++ ++ # check if session does not have D3D_MODULE_PATH ++ if ! grep -q D3D_MODULE_PATH /usr/share/gamescope-session-plus/device-quirks; then ++ cat ~/.out/runconfig | sudo tee -a /usr/share/gamescope-session-plus/device-quirks ++ fi ++ ++ # sudo rsync -r -v ~/.out/* /usr/ ++ ++ bazzite-session-select gamescope ++ # sudo reboot ++EOF +-- +2.49.0 + + +From 2f02ad01e44eddb1d78e6e2a336bb21b7c3c93af Mon Sep 17 00:00:00 2001 From: Antheas Kapenekakis Date: Sat, 15 Mar 2025 16:39:08 +0100 -Subject: [PATCH 1/8] [BEGIN] SteamOS Changes +Subject: [PATCH 02/11] [BEGIN] SteamOS Changes -- -2.50.1 +2.49.0 -From 21b062a757a202dcb737d40442b6145c34bb1e48 Mon Sep 17 00:00:00 2001 +From d446cc1258a6c6fd042e9a3d651a799a033a2d8c Mon Sep 17 00:00:00 2001 From: Bas Nieuwenhuizen Date: Fri, 14 Jan 2022 15:58:45 +0100 -Subject: [PATCH 2/8] STEAMOS: radv: min image count override for FH5 +Subject: [PATCH 03/11] STEAMOS: radv: min image count override for FH5 Otherwise in combination with the vblank time reservation in gamescope the game could get stuck in low power states. @@ -19,10 +259,10 @@ gamescope the game could get stuck in low power states. 1 file changed, 4 insertions(+) diff --git a/src/util/00-radv-defaults.conf b/src/util/00-radv-defaults.conf -index b82e8d4da4d..c8d059571ad 100644 +index e0e5b34dc87..5e931f61760 100644 --- a/src/util/00-radv-defaults.conf +++ b/src/util/00-radv-defaults.conf -@@ -234,5 +234,9 @@ Application bugs worked around in this file: +@@ -238,5 +238,9 @@ Application bugs worked around in this file: @@ -33,14 +273,14 @@ index b82e8d4da4d..c8d059571ad 100644 -- -2.50.1 +2.49.0 -From e837814b4f33e48eaf6a79975cb738da39ed0fd2 Mon Sep 17 00:00:00 2001 +From 016b60d32de3cd99e10207e7f0fa2c6fce91476c Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Thu, 22 Feb 2024 22:32:45 +0100 -Subject: [PATCH 3/8] STEAMOS: Dynamic swapchain override for gamescope limiter - for DRI3 only +Subject: [PATCH 04/11] STEAMOS: Dynamic swapchain override for gamescope + limiter for DRI3 only The original patch (from Bas) contained WSI VK support too but it's been removed because the Gamescope WSI layer already handles that. @@ -52,7 +292,7 @@ Signed-off-by: Samuel Pitoiset 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/src/gallium/frontends/dri/loader_dri3_helper.c b/src/gallium/frontends/dri/loader_dri3_helper.c -index a795d45ce29..435ea2405a8 100644 +index 37970f4fa33..f200f2063a2 100644 --- a/src/gallium/frontends/dri/loader_dri3_helper.c +++ b/src/gallium/frontends/dri/loader_dri3_helper.c @@ -297,6 +297,30 @@ dri3_update_max_num_back(struct loader_dri3_drawable *draw) @@ -128,10 +368,10 @@ index a795d45ce29..435ea2405a8 100644 * successful MSC and adding in a swap interval for each outstanding swap * request. target_msc=divisor=remainder=0 means "Use glXSwapBuffers() diff --git a/src/gallium/frontends/dri/loader_dri3_helper.h b/src/gallium/frontends/dri/loader_dri3_helper.h -index 26f138d1b83..3f0f3f66fac 100644 +index 4da19d73090..819a0e548fc 100644 --- a/src/gallium/frontends/dri/loader_dri3_helper.h +++ b/src/gallium/frontends/dri/loader_dri3_helper.h -@@ -169,6 +169,7 @@ struct loader_dri3_drawable { +@@ -170,6 +170,7 @@ struct loader_dri3_drawable { bool block_on_depleted_buffers; bool queries_buffer_age; int swap_interval; @@ -140,31 +380,69 @@ index 26f138d1b83..3f0f3f66fac 100644 const struct loader_dri3_vtable *vtable; -- -2.50.1 +2.49.0 -From 354cf8783e49b082c97982f2e5be305ad6e4ab50 Mon Sep 17 00:00:00 2001 +From 23db9ff0bf721f2c9080955c8c5dcf1f187d7adc Mon Sep 17 00:00:00 2001 From: Antheas Kapenekakis Date: Sat, 15 Mar 2025 16:39:25 +0100 -Subject: [PATCH 4/8] [BEGIN] SteamOS Backports +Subject: [PATCH 05/11] [BEGIN] SteamOS Backports -- -2.50.1 +2.49.0 -From c5a4eab20075dfa2f2bdfb87e55ecec262ef00f6 Mon Sep 17 00:00:00 2001 +From 69160c86a0d01b1c8482277faca1f6f7fa24cfce Mon Sep 17 00:00:00 2001 From: Antheas Kapenekakis Date: Sat, 15 Mar 2025 16:39:33 +0100 -Subject: [PATCH 5/8] [BEGIN] Our Mesa backports +Subject: [PATCH 06/11] [BEGIN] Our Mesa backports -- -2.50.1 +2.49.0 -From 221b11df6d9cd7b66c8502fa51d8d72cfc377e5e Mon Sep 17 00:00:00 2001 +From 59e3d359a4f4f78112ee965bb790dec2208ea480 Mon Sep 17 00:00:00 2001 +From: Maarten Lankhorst +Date: Mon, 17 Feb 2025 14:55:29 -0800 +Subject: [PATCH 07/11] anv: Mark images with format modifiers set as scanout. + +We currently use the presence of struct WSI_IMAGE_CREATE_INFO_MESA.scanout to mark the BO as scanout, +but this only handles the linear case, and fails when drm format modifiers are used. + +Also handle the case of exportable BO with tiling set to VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT. +This fixes the gamescope handling of using vulkan allocated images for scanout. + +Link: https://gitlab.freedesktop.org/mesa/mesa/-/issues/12633 +Signed-off-by: Maarten Lankhorst +Signed-off-by: Matthew Schwartz + +Normalspeak: fixes battlemage iGPUs in gamescope +--- + src/intel/vulkan/anv_device.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c +index 0fb86e9d846..de37994d324 100644 +--- a/src/intel/vulkan/anv_device.c ++++ b/src/intel/vulkan/anv_device.c +@@ -1566,6 +1566,9 @@ VkResult anv_AllocateMemory( + dedicated_info->image != VK_NULL_HANDLE) { + ANV_FROM_HANDLE(anv_image, image, dedicated_info->image); + ++ if (image->vk.tiling == VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT) ++ alloc_flags |= ANV_BO_ALLOC_SCANOUT; ++ + /* Apply implicit sync to be compatible with clients relying on + * implicit fencing. This matches the behavior in iris i915_batch + * submit. An example client is VA-API (iHD), so only dedicated +-- +2.49.0 + + +From 8c17b9dd7ad7f565080bd3623cfb820efb729444 Mon Sep 17 00:00:00 2001 From: Antheas Kapenekakis Date: Mon, 24 Mar 2025 19:50:51 +0100 -Subject: [PATCH 6/8] Revert "winsys/amdgpu: use VM_ALWAYS_VALID for all VRAM +Subject: [PATCH 08/11] Revert "winsys/amdgpu: use VM_ALWAYS_VALID for all VRAM and GTT allocations" This reverts commit 8c91624614c1f939974fe0d2d1a3baf83335cecb. @@ -175,14 +453,14 @@ Messes with AutoVRAM, who would have thought? 1 file changed, 5 deletions(-) diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c b/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c -index d5646e9660b..a51348b44a8 100644 +index dfefc468bca..cc0719a1898 100644 --- a/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c +++ b/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c -@@ -624,11 +624,6 @@ static struct amdgpu_winsys_bo *amdgpu_create_bo(struct amdgpu_winsys *aws, +@@ -618,11 +618,6 @@ static struct amdgpu_winsys_bo *amdgpu_create_bo(struct amdgpu_winsys *aws, if (flags & RADEON_FLAG_GTT_WC) request.flags |= AMDGPU_GEM_CREATE_CPU_GTT_USWC; -- if (aws->info.has_vm_always_valid && +- if (aws->info.has_local_buffers && - initial_domain & (RADEON_DOMAIN_VRAM_GTT | RADEON_DOMAIN_DOORBELL) && - flags & RADEON_FLAG_NO_INTERPROCESS_SHARING) - request.flags |= AMDGPU_GEM_CREATE_VM_ALWAYS_VALID; @@ -191,22 +469,22 @@ index d5646e9660b..a51348b44a8 100644 aws->info.drm_minor >= 47) request.flags |= AMDGPU_GEM_CREATE_DISCARDABLE; -- -2.50.1 +2.49.0 -From 21c90507cdbb7c2ca23b5d59421b28ac8081051f Mon Sep 17 00:00:00 2001 +From 816dec380bba16f65d7c65ddf9960a0ff79a8923 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Sun, 18 May 2025 09:40:01 -0700 -Subject: [PATCH 7/8] [BEGIN] Proton-GE Patches +Subject: [PATCH 09/11] [BEGIN] Proton-GE Patches -- -2.50.1 +2.49.0 -From 942ac03422d32e31102e3bff506f28ab6aeca18f Mon Sep 17 00:00:00 2001 +From e768b0cf066c73e9c379d59d380462c15f050a03 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Sun, 18 May 2025 09:42:23 -0700 -Subject: [PATCH 8/8] radv: min image count patch for Wine Wayland/Path of +Subject: [PATCH 10/11] radv: min image count patch for Wine Wayland/Path of Exile 2 Credit to Glorious Eggroll. --- @@ -228,10 +506,10 @@ Subject: [PATCH 8/8] radv: min image count patch for Wine Wayland/Path of 15 files changed, 42 insertions(+), 22 deletions(-) diff --git a/src/amd/vulkan/radv_instance.c b/src/amd/vulkan/radv_instance.c -index 6bcf18847bd..2773003911b 100644 +index d03b311fa07..910d3989451 100644 --- a/src/amd/vulkan/radv_instance.c +++ b/src/amd/vulkan/radv_instance.c -@@ -151,7 +151,7 @@ static const struct debug_control trace_options[] = { +@@ -148,7 +148,7 @@ static const struct debug_control trace_options[] = { static const driOptionDescription radv_dri_options[] = { DRI_CONF_SECTION_PERFORMANCE DRI_CONF_ADAPTIVE_SYNC(true) @@ -241,7 +519,7 @@ index 6bcf18847bd..2773003911b 100644 DRI_CONF_VK_X11_ENSURE_MIN_IMAGE_COUNT(false) DRI_CONF_VK_KHR_PRESENT_WAIT(false) diff --git a/src/asahi/vulkan/hk_instance.c b/src/asahi/vulkan/hk_instance.c -index 69e315ff979..b0361133793 100644 +index 4be7a763da7..f1171053e0b 100644 --- a/src/asahi/vulkan/hk_instance.c +++ b/src/asahi/vulkan/hk_instance.c @@ -80,7 +80,7 @@ hk_EnumerateInstanceExtensionProperties(const char *pLayerName, @@ -254,10 +532,10 @@ index 69e315ff979..b0361133793 100644 DRI_CONF_VK_X11_ENSURE_MIN_IMAGE_COUNT(false) DRI_CONF_VK_KHR_PRESENT_WAIT(false) diff --git a/src/freedreno/vulkan/tu_device.cc b/src/freedreno/vulkan/tu_device.cc -index 2c72aff780d..f9d95c63bbe 100644 +index dd79caf6927..a86a2e31017 100644 --- a/src/freedreno/vulkan/tu_device.cc +++ b/src/freedreno/vulkan/tu_device.cc -@@ -1671,7 +1671,7 @@ tu_destroy_physical_device(struct vk_physical_device *device) +@@ -1623,7 +1623,7 @@ tu_destroy_physical_device(struct vk_physical_device *device) static const driOptionDescription tu_dri_options[] = { DRI_CONF_SECTION_PERFORMANCE @@ -267,7 +545,7 @@ index 2c72aff780d..f9d95c63bbe 100644 DRI_CONF_VK_X11_STRICT_IMAGE_COUNT(false) DRI_CONF_VK_X11_ENSURE_MIN_IMAGE_COUNT(false) diff --git a/src/intel/vulkan/anv_instance.c b/src/intel/vulkan/anv_instance.c -index 268a5f3425b..0ab889654ae 100644 +index d478c2d52cd..e4ee0aa51ca 100644 --- a/src/intel/vulkan/anv_instance.c +++ b/src/intel/vulkan/anv_instance.c @@ -10,7 +10,7 @@ @@ -280,7 +558,7 @@ index 268a5f3425b..0ab889654ae 100644 DRI_CONF_VK_KHR_PRESENT_WAIT(false) DRI_CONF_VK_XWAYLAND_WAIT_READY(false) diff --git a/src/intel/vulkan_hasvk/anv_device.c b/src/intel/vulkan_hasvk/anv_device.c -index 81f08e50e5d..7e9d43df7ce 100644 +index fd4f4c73a33..3cba9ac23ef 100644 --- a/src/intel/vulkan_hasvk/anv_device.c +++ b/src/intel/vulkan_hasvk/anv_device.c @@ -65,7 +65,7 @@ @@ -293,10 +571,10 @@ index 81f08e50e5d..7e9d43df7ce 100644 DRI_CONF_VK_KHR_PRESENT_WAIT(false) DRI_CONF_VK_XWAYLAND_WAIT_READY(true) diff --git a/src/nouveau/vulkan/nvk_instance.c b/src/nouveau/vulkan/nvk_instance.c -index 37e7abe1584..29da7e3a0b3 100644 +index 8c7d9050063..3966dab52c5 100644 --- a/src/nouveau/vulkan/nvk_instance.c +++ b/src/nouveau/vulkan/nvk_instance.c -@@ -98,7 +98,7 @@ nvk_init_debug_flags(struct nvk_instance *instance) +@@ -103,7 +103,7 @@ nvk_init_debug_flags(struct nvk_instance *instance) static const driOptionDescription nvk_dri_options[] = { DRI_CONF_SECTION_PERFORMANCE DRI_CONF_ADAPTIVE_SYNC(true) @@ -306,7 +584,7 @@ index 37e7abe1584..29da7e3a0b3 100644 DRI_CONF_VK_X11_ENSURE_MIN_IMAGE_COUNT(false) DRI_CONF_VK_KHR_PRESENT_WAIT(false) diff --git a/src/panfrost/vulkan/panvk_instance.c b/src/panfrost/vulkan/panvk_instance.c -index 31abc8f4369..8c8f7a8ca0c 100644 +index f6cbe8de4b7..7d3e3c71acf 100644 --- a/src/panfrost/vulkan/panvk_instance.c +++ b/src/panfrost/vulkan/panvk_instance.c @@ -151,7 +151,7 @@ panvk_kmod_free(const struct pan_kmod_allocator *allocator, void *data) @@ -319,10 +597,10 @@ index 31abc8f4369..8c8f7a8ca0c 100644 DRI_CONF_VK_X11_ENSURE_MIN_IMAGE_COUNT(false) DRI_CONF_VK_KHR_PRESENT_WAIT(false) diff --git a/src/util/00-mesa-defaults.conf b/src/util/00-mesa-defaults.conf -index d42526732fa..eaab8afc3e9 100644 +index 5f6034061c2..ca7511877ee 100644 --- a/src/util/00-mesa-defaults.conf +++ b/src/util/00-mesa-defaults.conf -@@ -634,24 +634,24 @@ TODO: document the other workarounds. +@@ -625,24 +625,24 @@ TODO: document the other workarounds. -@@ -712,10 +712,12 @@ TODO: document the other workarounds. +@@ -703,10 +703,12 @@ TODO: document the other workarounds.