diff --git a/spec_files/mesa/old/26105.patch b/spec_files/mesa/old/26105.patch
new file mode 100644
index 00000000..6af0603d
--- /dev/null
+++ b/spec_files/mesa/old/26105.patch
@@ -0,0 +1,204 @@
+diff --git a/src/amd/compiler/aco_instruction_selection.cpp b/src/amd/compiler/aco_instruction_selection.cpp
+index 561f3cc02e0..ebc54a900e3 100644
+--- a/src/amd/compiler/aco_instruction_selection.cpp
++++ b/src/amd/compiler/aco_instruction_selection.cpp
+@@ -12526,7 +12526,8 @@ select_rt_prolog(Program* program, ac_shader_config* config,
+     */
+    PhysReg out_uniform_shader_addr = get_arg_reg(out_args, out_args->rt.uniform_shader_addr);
+    PhysReg out_launch_size_x = get_arg_reg(out_args, out_args->rt.launch_size);
+-   PhysReg out_launch_size_z = out_launch_size_x.advance(8);
++   PhysReg out_launch_size_y = out_launch_size_x.advance(4);
++   PhysReg out_launch_size_z = out_launch_size_y.advance(4);
+    PhysReg out_launch_ids[3];
+    for (unsigned i = 0; i < 3; i++)
+       out_launch_ids[i] = get_arg_reg(out_args, out_args->rt.launch_id).advance(i * 4);
+@@ -12534,9 +12535,13 @@ select_rt_prolog(Program* program, ac_shader_config* config,
+    PhysReg out_record_ptr = get_arg_reg(out_args, out_args->rt.shader_record);
+ 
+    /* Temporaries: */
+-   num_sgprs = align(num_sgprs, 2) + 4;
+-   PhysReg tmp_raygen_sbt = PhysReg{num_sgprs - 4};
+-   PhysReg tmp_ring_offsets = PhysReg{num_sgprs - 2};
++   num_sgprs = align(num_sgprs, 2);
++   PhysReg tmp_raygen_sbt = PhysReg{num_sgprs};
++   num_sgprs += 2;
++   PhysReg tmp_ring_offsets = PhysReg{num_sgprs};
++   num_sgprs += 2;
++
++   PhysReg tmp_invocation_idx = PhysReg{256 + num_vgprs++};
+ 
+    /* Confirm some assumptions about register aliasing */
+    assert(in_ring_offsets == out_uniform_shader_addr);
+@@ -12610,6 +12615,36 @@ select_rt_prolog(Program* program, ac_shader_config* config,
+    bld.vop1(aco_opcode::v_mov_b32, Definition(out_record_ptr.advance(4), v1),
+             Operand(tmp_raygen_sbt.advance(4), s1));
+ 
++   /* For 1D dispatches converted into 2D ones, we need to fix up the launch IDs.
++    * Calculating the 1D launch ID is: id = local_invocation_index + (wg_id.x * wg_size).
++    * in_wg_id_x now holds wg_id.x * wg_size.
++    */
++   bld.sop2(aco_opcode::s_lshl_b32, Definition(in_wg_id_x, s1), Definition(scc, s1),
++            Operand(in_wg_id_x, s1), Operand::c32(program->workgroup_size == 32 ? 5 : 6));
++
++   /* Calculate and add local_invocation_index */
++   bld.vop3(aco_opcode::v_mbcnt_lo_u32_b32, Definition(tmp_invocation_idx, v1), Operand::c32(-1u),
++            Operand(in_wg_id_x, s1));
++   if (program->wave_size == 64) {
++      if (program->gfx_level <= GFX7)
++         bld.vop2(aco_opcode::v_mbcnt_hi_u32_b32, Definition(tmp_invocation_idx, v1),
++                  Operand::c32(-1u), Operand(tmp_invocation_idx, v1));
++      else
++         bld.vop3(aco_opcode::v_mbcnt_hi_u32_b32_e64, Definition(tmp_invocation_idx, v1),
++                  Operand::c32(-1u), Operand(tmp_invocation_idx, v1));
++   }
++
++   /* Make fixup operations a no-op if this is not a converted 2D dispatch. */
++   bld.sopc(aco_opcode::s_cmp_lg_u32, Definition(scc, s1),
++            Operand::c32(ACO_RT_CONVERTED_2D_LAUNCH_SIZE), Operand(out_launch_size_y, s1));
++   bld.sop2(Builder::s_cselect, Definition(vcc, bld.lm),
++            Operand::c32_or_c64(-1u, program->wave_size == 64),
++            Operand::c32_or_c64(0, program->wave_size == 64), Operand(scc, s1));
++   bld.vop2(aco_opcode::v_cndmask_b32, Definition(out_launch_ids[0], v1),
++            Operand(tmp_invocation_idx, v1), Operand(out_launch_ids[0], v1), Operand(vcc, bld.lm));
++   bld.vop2(aco_opcode::v_cndmask_b32, Definition(out_launch_ids[1], v1), Operand::zero(),
++            Operand(out_launch_ids[1], v1), Operand(vcc, bld.lm));
++
+    /* jump to raygen */
+    bld.sop1(aco_opcode::s_setpc_b64, Operand(out_uniform_shader_addr, s2));
+ 
+diff --git a/src/amd/compiler/aco_interface.h b/src/amd/compiler/aco_interface.h
+index 8f35e18b5b0..9d2c1dbb2af 100644
+--- a/src/amd/compiler/aco_interface.h
++++ b/src/amd/compiler/aco_interface.h
+@@ -32,6 +32,9 @@
+ extern "C" {
+ #endif
+ 
++/* Special launch size to indicate this dispatch is a 1D dispatch converted into a 2D one */
++#define ACO_RT_CONVERTED_2D_LAUNCH_SIZE -1u
++
+ typedef struct nir_shader nir_shader;
+ struct ac_shader_config;
+ struct aco_shader_info;
+diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c
+index cdede679552..c7dd4b216d4 100644
+--- a/src/amd/vulkan/radv_cmd_buffer.c
++++ b/src/amd/vulkan/radv_cmd_buffer.c
+@@ -42,6 +42,8 @@
+ #include "ac_debug.h"
+ #include "ac_shader_args.h"
+ 
++#include "aco_interface.h"
++
+ #include "util/fast_idiv_by_const.h"
+ 
+ enum {
+@@ -10003,7 +10005,26 @@ enum radv_rt_mode {
+ };
+ 
+ static void
+-radv_trace_rays(struct radv_cmd_buffer *cmd_buffer, const VkTraceRaysIndirectCommand2KHR *tables, uint64_t indirect_va,
++radv_upload_trace_rays_params(struct radv_cmd_buffer *cmd_buffer, VkTraceRaysIndirectCommand2KHR *tables,
++                              enum radv_rt_mode mode, uint64_t *launch_size_va, uint64_t *sbt_va)
++{
++   uint32_t upload_size = mode == radv_rt_mode_direct ? sizeof(VkTraceRaysIndirectCommand2KHR)
++                                                      : offsetof(VkTraceRaysIndirectCommand2KHR, width);
++
++   uint32_t offset;
++   if (!radv_cmd_buffer_upload_data(cmd_buffer, upload_size, tables, &offset))
++      return;
++
++   uint64_t upload_va = radv_buffer_get_va(cmd_buffer->upload.upload_bo) + offset;
++
++   if (mode == radv_rt_mode_direct)
++      *launch_size_va = upload_va + offsetof(VkTraceRaysIndirectCommand2KHR, width);
++   if (sbt_va)
++      *sbt_va = upload_va;
++}
++
++static void
++radv_trace_rays(struct radv_cmd_buffer *cmd_buffer, VkTraceRaysIndirectCommand2KHR *tables, uint64_t indirect_va,
+                 enum radv_rt_mode mode)
+ {
+    if (cmd_buffer->device->instance->debug_flags & RADV_DEBUG_NO_RT)
+@@ -10024,34 +10045,43 @@ radv_trace_rays(struct radv_cmd_buffer *cmd_buffer, const VkTraceRaysIndirectCom
+    cmd_buffer->compute_scratch_size_per_wave_needed =
+       MAX2(cmd_buffer->compute_scratch_size_per_wave_needed, scratch_bytes_per_wave);
+ 
++   /* Since the workgroup size is 8x4 (or 8x8), 1D dispatches can only fill 8 threads per wave at most. To increase
++    * occupancy, it's beneficial to convert to a 2D dispatch in these cases. */
++   if (tables && tables->height == 1 && tables->width >= cmd_buffer->state.rt_prolog->info.cs.block_size[0])
++      tables->height = ACO_RT_CONVERTED_2D_LAUNCH_SIZE;
++
+    struct radv_dispatch_info info = {0};
+    info.unaligned = true;
+ 
+-   uint64_t launch_size_va;
+-   uint64_t sbt_va;
++   uint64_t launch_size_va = 0;
++   uint64_t sbt_va = 0;
+ 
+    if (mode != radv_rt_mode_indirect2) {
+-      uint32_t upload_size = mode == radv_rt_mode_direct ? sizeof(VkTraceRaysIndirectCommand2KHR)
+-                                                         : offsetof(VkTraceRaysIndirectCommand2KHR, width);
+-
+-      uint32_t offset;
+-      if (!radv_cmd_buffer_upload_data(cmd_buffer, upload_size, tables, &offset))
+-         return;
+-
+-      uint64_t upload_va = radv_buffer_get_va(cmd_buffer->upload.upload_bo) + offset;
+-
+-      launch_size_va =
+-         (mode == radv_rt_mode_direct) ? upload_va + offsetof(VkTraceRaysIndirectCommand2KHR, width) : indirect_va;
+-      sbt_va = upload_va;
++      launch_size_va = indirect_va;
++      radv_upload_trace_rays_params(cmd_buffer, tables, mode, &launch_size_va, &sbt_va);
+    } else {
+       launch_size_va = indirect_va + offsetof(VkTraceRaysIndirectCommand2KHR, width);
+       sbt_va = indirect_va;
+    }
+ 
++   uint32_t remaining_ray_count = 0;
++
+    if (mode == radv_rt_mode_direct) {
+       info.blocks[0] = tables->width;
+       info.blocks[1] = tables->height;
+       info.blocks[2] = tables->depth;
++
++      if (tables->height == ACO_RT_CONVERTED_2D_LAUNCH_SIZE) {
++         /* We need the ray count for the 2D dispatch to be a multiple of the y block size for the division to work, and
++          * a multiple of the x block size because the invocation offset must be a multiple of the block size when
++          * dispatching the remaining rays. Fortunately, the x block size is itself a multiple of the y block size, so
++          * we only need to ensure that the ray count is a multiple of the x block size. */
++         remaining_ray_count = tables->width % rt_prolog->info.cs.block_size[0];
++
++         uint32_t ray_count = tables->width - remaining_ray_count;
++         info.blocks[0] = ray_count / rt_prolog->info.cs.block_size[1];
++         info.blocks[1] = rt_prolog->info.cs.block_size[1];
++      }
+    } else
+       info.va = launch_size_va;
+ 
+@@ -10085,6 +10115,22 @@ radv_trace_rays(struct radv_cmd_buffer *cmd_buffer, const VkTraceRaysIndirectCom
+    assert(cmd_buffer->cs->cdw <= cdw_max);
+ 
+    radv_dispatch(cmd_buffer, &info, pipeline, rt_prolog, VK_PIPELINE_BIND_POINT_RAY_TRACING_KHR);
++
++   if (remaining_ray_count) {
++      info.blocks[0] = remaining_ray_count;
++      info.blocks[1] = 1;
++      info.offsets[0] = tables->width - remaining_ray_count;
++
++      /* Reset the ray launch size so the prolog doesn't think this is a converted dispatch */
++      tables->height = 1;
++      radv_upload_trace_rays_params(cmd_buffer, tables, mode, &launch_size_va, NULL);
++      if (size_loc->sgpr_idx != -1) {
++         radv_emit_shader_pointer(cmd_buffer->device, cmd_buffer->cs, base_reg + size_loc->sgpr_idx * 4, launch_size_va,
++                                  true);
++      }
++
++      radv_dispatch(cmd_buffer, &info, pipeline, rt_prolog, VK_PIPELINE_BIND_POINT_RAY_TRACING_KHR);
++   }
+ }
+ 
+ VKAPI_ATTR void VKAPI_CALL
diff --git a/spec_files/mesa/old/Mesa-MLAA-License-Clarification-Email.txt b/spec_files/mesa/old/Mesa-MLAA-License-Clarification-Email.txt
new file mode 100644
index 00000000..30bdf2e9
--- /dev/null
+++ b/spec_files/mesa/old/Mesa-MLAA-License-Clarification-Email.txt
@@ -0,0 +1,117 @@
+
+Subject: RE: Question about Mesa MLAA license
+From: Jorge Jimenez <iryoku@gmail.com>
+Date: 01/08/2013 12:50 PM
+To: Tom Callaway <tcallawa@redhat.com>
+CC: "jorge@iryoku.com" <jorge@iryoku.com>
+
+Yes to both questions.
+ 
+Thanks,
+Jorge
+ 
+From: Tom Callaway <tcallawa@redhat.com>
+Sent: January 8, 2013 6:49 PM
+To: Jorge Jimenez <iryoku@gmail.com>
+CC: jorge@iryoku.com
+Subject: Re: Question about Mesa MLAA license
+ 
+On 01/08/2013 12:39 PM, Jorge Jimenez wrote:
+> Hi Tom,
+>
+> What we meant with that is that we made an exception for clause 2.
+> Instead of clause 2, in the case of the Mesa project, you have to name
+> the technique Jimenez's MLAA in the config options of Mesa. We did that
+> just to allow them to solve license issues. This exception should be for
+> the Mesa project, and any project using Mesa, like Fedora.
+>
+> We want to widespread usage of our MLAA, so we want to avoid any kind of
+> license complications. Hope current one is good for Fedora, if not
+> please tell, and we'll see what we can do!
+
+Okay, a few more questions:
+
+* If Fedora decides to simply reproduce the quoted statement:
+"Uses Jimenez's MLAA. Copyright (C) 2010 by Jorge Jimenez, Belen Masia,
+Jose I. Echevarria, Fernando Navarro and Diego Gutierrez."
+
+Specifically, if this is done as part of documentation included with
+Mesa, is that sufficient to meet clause 2 even if the Mesa config option
+is not set as described in your exception?
+
+* Currently, the Mesa config option for MLAA says: "Morphological
+anti-aliasing based on Jimenez\' MLAA. 0 to disable, 8 for default
+quality". Is this in compliance with your exception?
+
+Thanks again,
+
+~tom
+
+==
+Fedora Project
+
+Subject: RE: Question about Mesa MLAA license
+From: Jorge Jimenez <iryoku@gmail.com>
+Date: 01/08/2013 12:39 PM
+To: "jorge@iryoku.com" <jorge@iryoku.com>, Tom Callaway <tcallawa@redhat.com>
+
+Hi Tom,
+ 
+What we meant with that is that we made an exception for clause 2. 
+Instead of clause 2, in the case of the Mesa project, you have to name 
+the technique Jimenez's MLAA in the config options of Mesa. We did that 
+just to allow them to solve license issues. This exception should be for 
+the Mesa project, and any project using Mesa, like Fedora.
+ 
+We want to widespread usage of our MLAA, so we want to avoid any kind of 
+license complications. Hope current one is good for Fedora, if not 
+please tell, and we'll see what we can do!
+ 
+Cheers,
+Jorge
+ 
+From: Tom Callaway <tcallawa@redhat.com>
+Sent: January 8, 2013 6:30 PM
+To: jorge@iryoku.com
+Subject: Question about Mesa MLAA license
+ 
+Jorge,
+
+Thanks for all of your fantastic graphics work! I have been auditing
+Fedora (a popular distribution of Linux) for license compliance and I
+came across your MLAA code in Mesa.
+
+The license says:
+
+ *    2. Redistributions in binary form must reproduce the following
+statement:
+ *
+ *       "Uses Jimenez's MLAA. Copyright (C) 2010 by Jorge Jimenez, Belen Masia,
+ *        Jose I. Echevarria, Fernando Navarro and Diego Gutierrez."
+ *
+ *       Only for use in the Mesa project, this point 2 is filled by naming the
+ *       technique Jimenez's MLAA in the Mesa config options.
+
+That wording is unclear. When you say "Only for use in the Mesa
+project...", it seems like you could either be saying:
+
+- This code may only be used as part of Mesa.
+
+OR
+
+- In Mesa, you can comply with clause 2 by simply selecting "Jimenez's
+MLAA" in the Mesa config options.
+
+*****
+
+If the first item is true, then we may have to remove the MLAA code from
+Fedora's copy of Mesa. However, looking at the license on your SMAA
+code, I do not believe it to be the case. Please let me know either way!
+
+Thanks in advance,
+
+Tom Callaway
+Fedora Legal
+
+==
+Fedora Project
diff --git a/spec_files/mesa/old/gnome-shell-glthread-disable.patch b/spec_files/mesa/old/gnome-shell-glthread-disable.patch
new file mode 100644
index 00000000..b2caeb8d
--- /dev/null
+++ b/spec_files/mesa/old/gnome-shell-glthread-disable.patch
@@ -0,0 +1,11 @@
+diff -up mesa-22.3.0-rc4/src/util/00-mesa-defaults.conf.dma mesa-22.3.0-rc4/src/util/00-mesa-defaults.conf
+--- mesa-22.3.0-rc4/src/util/00-mesa-defaults.conf.dma	2022-11-25 10:32:32.175879868 +1000
++++ mesa-22.3.0-rc4/src/util/00-mesa-defaults.conf	2022-11-25 10:32:43.743067470 +1000
+@@ -653,6 +653,7 @@ TODO: document the other workarounds.
+         <application name="gnome-shell" executable="gnome-shell">
+             <option name="adaptive_sync" value="false" />
+             <option name="v3d_nonmsaa_texture_size_limit" value="true" />
++            <option name="mesa_glthread" value="false"/>
+         </application>
+         <application name="Desktop — Plasma" executable="plasmashell">
+             <option name="adaptive_sync" value="false" />
diff --git a/spec_files/mesa/old/mesa-meson-c99.patch b/spec_files/mesa/old/mesa-meson-c99.patch
new file mode 100644
index 00000000..6cbb0536
--- /dev/null
+++ b/spec_files/mesa/old/mesa-meson-c99.patch
@@ -0,0 +1,42 @@
+meson: C type error in strtod_l/strtof_l probe
+
+Future compilers will fail compilation due to the C type error:
+
+…/testfile.c: In function 'main':
+…/testfile.c:12:30: error: passing argument 2 of 'strtod_l' from incompatible pointer type
+   12 |       double d = strtod_l(s, end, loc);
+      |                              ^~~
+      |                              |
+      |                              char *
+/usr/include/stdlib.h:416:43: note: expected 'char ** restrict' but argument is of type 'char *'
+  416 |                         char **__restrict __endptr, locale_t __loc)
+      |                         ~~~~~~~~~~~~~~~~~~^~~~~~~~
+…/testfile.c:13:29: error: passing argument 2 of 'strtof_l' from incompatible pointer type
+   13 |       float f = strtof_l(s, end, loc);
+      |                             ^~~
+      |                             |
+      |                             char *
+/usr/include/stdlib.h:420:42: note: expected 'char ** restrict' but argument is of type 'char *'
+  420 |                        char **__restrict __endptr, locale_t __loc)
+      |                        ~~~~~~~~~~~~~~~~~~^~~~~~~~
+
+This means that the probe no longer tests is objective and always
+fails.
+
+Submitted upstream: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26927>
+
+diff --git a/meson.build b/meson.build
+index 35cc5f1cd5fd9079..1a5d2ba492be0b31 100644
+--- a/meson.build
++++ b/meson.build
+@@ -1425,8 +1425,8 @@ if cc.links('''
+       locale_t loc = newlocale(LC_CTYPE_MASK, "C", NULL);
+       const char *s = "1.0";
+       char *end;
+-      double d = strtod_l(s, end, loc);
+-      float f = strtof_l(s, end, loc);
++      double d = strtod_l(s, &end, loc);
++      float f = strtof_l(s, &end, loc);
+       freelocale(loc);
+       return 0;
+     }''',
diff --git a/spec_files/mesa/old/mesa.spec b/spec_files/mesa/old/mesa.spec
new file mode 100644
index 00000000..5d3971e3
--- /dev/null
+++ b/spec_files/mesa/old/mesa.spec
@@ -0,0 +1,691 @@
+%ifnarch s390x
+%global with_hardware 1
+%global with_vulkan_hw 1
+%global with_vdpau 1
+%global with_va 1
+%if !0%{?rhel}
+%global with_nine 1
+%global with_omx 1
+%global with_opencl 1
+%endif
+%global base_vulkan ,amd,nouveau-experimental
+%endif
+
+%ifarch %{ix86} x86_64
+%global with_crocus 1
+%global with_i915   1
+%if !0%{?rhel}
+%global with_intel_clc 1
+%endif
+%global with_iris   1
+%global with_xa     1
+%global intel_platform_vulkan ,intel,intel_hasvk
+%endif
+
+%ifarch aarch64 x86_64 %{ix86}
+%if !0%{?rhel}
+%global with_lima      1
+%global with_vc4       1
+%endif
+%global with_etnaviv   1
+%global with_freedreno 1
+%global with_kmsro     1
+%global with_panfrost  1
+%global with_tegra     1
+%global with_v3d       1
+%global with_xa        1
+%global extra_platform_vulkan ,broadcom,freedreno,panfrost
+%endif
+
+%ifnarch s390x
+%if !0%{?rhel}
+%global with_r300 1
+%global with_r600 1
+%endif
+%global with_radeonsi 1
+%global with_vmware 1
+%endif
+
+%if !0%{?rhel}
+%global with_libunwind 1
+%global with_lmsensors 1
+%endif
+
+%ifarch %{valgrind_arches}
+%bcond_without valgrind
+%else
+%bcond_with valgrind
+%endif
+
+%global vulkan_drivers swrast%{?base_vulkan}%{?intel_platform_vulkan}%{?extra_platform_vulkan}
+
+Name:           mesa
+Summary:        Mesa graphics libraries
+%global ver 23.3.3
+Version:        %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)}
+Release:        100.bazzite.{{{ git_dir_version }}}
+License:        MIT AND BSD-3-Clause AND SGI-B-2.0
+URL:            http://www.mesa3d.org
+
+Source0:        https://archive.mesa3d.org/mesa-%{ver}.tar.xz
+# src/gallium/auxiliary/postprocess/pp_mlaa* have an ... interestingly worded license.
+# Source1 contains email correspondence clarifying the license terms.
+# Fedora opts to ignore the optional part of clause 2 and treat that code as 2 clause BSD.
+Source1:        Mesa-MLAA-License-Clarification-Email.txt
+
+Patch10:        gnome-shell-glthread-disable.patch
+Patch11:        zink-fix-resizable-bar-detection-logic.patch
+Patch12:        mesa-meson-c99.patch
+
+# https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26105/
+Patch30:        26105.patch
+
+# https://gitlab.com/evlaV/mesa/
+Patch40:        valve.patch
+
+BuildRequires:  meson >= 1.2.0
+BuildRequires:  gcc
+BuildRequires:  gcc-c++
+BuildRequires:  gettext
+%if 0%{?with_hardware}
+BuildRequires:  kernel-headers
+%endif
+# We only check for the minimum version of pkgconfig(libdrm) needed so that the
+# SRPMs for each arch still have the same build dependencies. See:
+# https://bugzilla.redhat.com/show_bug.cgi?id=1859515
+BuildRequires:  pkgconfig(libdrm) >= 2.4.97
+%if 0%{?with_libunwind}
+BuildRequires:  pkgconfig(libunwind)
+%endif
+BuildRequires:  pkgconfig(expat)
+BuildRequires:  pkgconfig(zlib) >= 1.2.3
+BuildRequires:  pkgconfig(libzstd)
+BuildRequires:  pkgconfig(libselinux)
+BuildRequires:  pkgconfig(wayland-scanner)
+BuildRequires:  pkgconfig(wayland-protocols) >= 1.8
+BuildRequires:  pkgconfig(wayland-client) >= 1.11
+BuildRequires:  pkgconfig(wayland-server) >= 1.11
+BuildRequires:  pkgconfig(wayland-egl-backend) >= 3
+BuildRequires:  pkgconfig(x11)
+BuildRequires:  pkgconfig(xext)
+BuildRequires:  pkgconfig(xdamage) >= 1.1
+BuildRequires:  pkgconfig(xfixes)
+BuildRequires:  pkgconfig(xcb-glx) >= 1.8.1
+BuildRequires:  pkgconfig(xxf86vm)
+BuildRequires:  pkgconfig(xcb)
+BuildRequires:  pkgconfig(x11-xcb)
+BuildRequires:  pkgconfig(xcb-dri2) >= 1.8
+BuildRequires:  pkgconfig(xcb-dri3)
+BuildRequires:  pkgconfig(xcb-present)
+BuildRequires:  pkgconfig(xcb-sync)
+BuildRequires:  pkgconfig(xshmfence) >= 1.1
+BuildRequires:  pkgconfig(dri2proto) >= 2.8
+BuildRequires:  pkgconfig(glproto) >= 1.4.14
+BuildRequires:  pkgconfig(xcb-xfixes)
+BuildRequires:  pkgconfig(xcb-randr)
+BuildRequires:  pkgconfig(xrandr) >= 1.3
+BuildRequires:  bison
+BuildRequires:  flex
+%if 0%{?with_lmsensors}
+BuildRequires:  lm_sensors-devel
+%endif
+%if 0%{?with_vdpau}
+BuildRequires:  pkgconfig(vdpau) >= 1.1
+%endif
+%if 0%{?with_va}
+BuildRequires:  pkgconfig(libva) >= 0.38.0
+%endif
+%if 0%{?with_omx}
+BuildRequires:  pkgconfig(libomxil-bellagio)
+%endif
+BuildRequires:  pkgconfig(libelf)
+BuildRequires:  pkgconfig(libglvnd) >= 1.3.2
+BuildRequires:  llvm-devel >= 7.0.0
+%if 0%{?with_opencl}
+BuildRequires:  clang-devel
+BuildRequires:  bindgen
+BuildRequires:  rust-packaging
+BuildRequires:  pkgconfig(libclc)
+BuildRequires:  pkgconfig(SPIRV-Tools)
+BuildRequires:  pkgconfig(LLVMSPIRVLib)
+%endif
+%if %{with valgrind}
+BuildRequires:  pkgconfig(valgrind)
+%endif
+BuildRequires:  python3-devel
+BuildRequires:  python3-mako
+%if 0%{?with_intel_clc}
+BuildRequires:  python3-ply
+%endif
+BuildRequires:  vulkan-headers
+BuildRequires:  glslang
+%if 0%{?with_vulkan_hw}
+BuildRequires:  pkgconfig(vulkan)
+%endif
+
+%description
+%{summary}.
+
+%package filesystem
+Summary:        Mesa driver filesystem
+Provides:       mesa-dri-filesystem = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description filesystem
+%{summary}.
+
+%package libGL
+Summary:        Mesa libGL runtime libraries
+Requires:       %{name}-libglapi%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       libglvnd-glx%{?_isa} >= 1:1.3.2
+Recommends:     %{name}-dri-drivers%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description libGL
+%{summary}.
+
+%package libGL-devel
+Summary:        Mesa libGL development package
+Requires:       %{name}-libGL%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       libglvnd-devel%{?_isa} >= 1:1.3.2
+Provides:       libGL-devel
+Provides:       libGL-devel%{?_isa}
+Recommends:     gl-manpages
+
+%description libGL-devel
+%{summary}.
+
+%package libEGL
+Summary:        Mesa libEGL runtime libraries
+Requires:       libglvnd-egl%{?_isa} >= 1:1.3.2
+Requires:       %{name}-libgbm%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}-libglapi%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+Recommends:     %{name}-dri-drivers%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description libEGL
+%{summary}.
+
+%package libEGL-devel
+Summary:        Mesa libEGL development package
+Requires:       %{name}-libEGL%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       libglvnd-devel%{?_isa} >= 1:1.3.2
+Requires:       %{name}-khr-devel%{?_isa}
+Provides:       libEGL-devel
+Provides:       libEGL-devel%{?_isa}
+
+%description libEGL-devel
+%{summary}.
+
+%package dri-drivers
+Summary:        Mesa-based DRI drivers
+Requires:       %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       %{name}-libglapi%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+%if 0%{?with_va}
+Recommends:     %{name}-va-drivers%{?_isa}
+%endif
+
+%description dri-drivers
+%{summary}.
+
+%if 0%{?with_omx}
+%package omx-drivers
+Summary:        Mesa-based OMX drivers
+Requires:       %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description omx-drivers
+%{summary}.
+%endif
+
+%if 0%{?with_va}
+%package        va-drivers
+Summary:        Mesa-based VA-API video acceleration drivers
+Requires:       %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      %{name}-vaapi-drivers < 22.2.0-5
+
+%description va-drivers
+%{summary}.
+%endif
+
+%if 0%{?with_vdpau}
+%package        vdpau-drivers
+Summary:        Mesa-based VDPAU drivers
+Requires:       %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description vdpau-drivers
+%{summary}.
+%endif
+
+%package libOSMesa
+Summary:        Mesa offscreen rendering libraries
+Requires:       %{name}-libglapi%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       libOSMesa
+Provides:       libOSMesa%{?_isa}
+
+%description libOSMesa
+%{summary}.
+
+%package libOSMesa-devel
+Summary:        Mesa offscreen rendering development package
+Requires:       %{name}-libOSMesa%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description libOSMesa-devel
+%{summary}.
+
+%package libgbm
+Summary:        Mesa gbm runtime library
+Provides:       libgbm
+Provides:       libgbm%{?_isa}
+Recommends:     %{name}-dri-drivers%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+# If mesa-dri-drivers are installed, they must match in version. This is here to prevent using
+# older mesa-dri-drivers together with a newer mesa-libgbm and its dependants.
+# See https://bugzilla.redhat.com/show_bug.cgi?id=2193135 .
+Requires:       (%{name}-dri-drivers%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} if %{name}-dri-drivers%{?_isa})
+
+%description libgbm
+%{summary}.
+
+%package libgbm-devel
+Summary:        Mesa libgbm development package
+Requires:       %{name}-libgbm%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       libgbm-devel
+Provides:       libgbm-devel%{?_isa}
+
+%description libgbm-devel
+%{summary}.
+
+%if 0%{?with_xa}
+%package libxatracker
+Summary:        Mesa XA state tracker
+Provides:       libxatracker
+Provides:       libxatracker%{?_isa}
+
+%description libxatracker
+%{summary}.
+
+%package libxatracker-devel
+Summary:        Mesa XA state tracker development package
+Requires:       %{name}-libxatracker%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:       libxatracker-devel
+Provides:       libxatracker-devel%{?_isa}
+
+%description libxatracker-devel
+%{summary}.
+%endif
+
+%package libglapi
+Summary:        Mesa shared glapi
+Provides:       libglapi
+Provides:       libglapi%{?_isa}
+# If mesa-dri-drivers are installed, they must match in version. This is here to prevent using
+# older mesa-dri-drivers together with a newer mesa-libglapi or its dependants.
+# See https://bugzilla.redhat.com/show_bug.cgi?id=2193135 .
+Requires:       (%{name}-dri-drivers%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} if %{name}-dri-drivers%{?_isa})
+
+%description libglapi
+%{summary}.
+
+%if 0%{?with_opencl}
+%package libOpenCL
+Summary:        Mesa OpenCL runtime library
+Requires:       ocl-icd%{?_isa}
+Requires:       libclc%{?_isa}
+Requires:       %{name}-libgbm%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       opencl-filesystem
+
+%description libOpenCL
+%{summary}.
+
+%package libOpenCL-devel
+Summary:        Mesa OpenCL development package
+Requires:       %{name}-libOpenCL%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description libOpenCL-devel
+%{summary}.
+%endif
+
+%if 0%{?with_nine}
+%package libd3d
+Summary:        Mesa Direct3D9 state tracker
+
+%description libd3d
+%{summary}.
+
+%package libd3d-devel
+Summary:        Mesa Direct3D9 state tracker development package
+Requires:       %{name}-libd3d%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description libd3d-devel
+%{summary}.
+%endif
+
+%package vulkan-drivers
+Summary:        Mesa Vulkan drivers
+Requires:       vulkan%{_isa}
+Obsoletes:      mesa-vulkan-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description vulkan-drivers
+The drivers with support for the Vulkan API.
+
+%prep
+%autosetup -n %{name}-%{ver} -p1
+cp %{SOURCE1} docs/
+
+%build
+# ensure standard Rust compiler flags are set
+export RUSTFLAGS="%build_rustflags"
+
+# We've gotten a report that enabling LTO for mesa breaks some games. See
+# https://bugzilla.redhat.com/show_bug.cgi?id=1862771 for details.
+# Disable LTO for now
+%define _lto_cflags %{nil}
+
+%meson \
+  -Dplatforms=x11,wayland \
+  -Ddri3=enabled \
+  -Dosmesa=true \
+%if 0%{?with_hardware}
+  -Dgallium-drivers=swrast,virgl,nouveau%{?with_r300:,r300}%{?with_crocus:,crocus}%{?with_i915:,i915}%{?with_iris:,iris}%{?with_vmware:,svga}%{?with_radeonsi:,radeonsi}%{?with_r600:,r600}%{?with_freedreno:,freedreno}%{?with_etnaviv:,etnaviv}%{?with_tegra:,tegra}%{?with_vc4:,vc4}%{?with_v3d:,v3d}%{?with_kmsro:,kmsro}%{?with_lima:,lima}%{?with_panfrost:,panfrost}%{?with_vulkan_hw:,zink} \
+%else
+  -Dgallium-drivers=swrast,virgl \
+%endif
+  -Dgallium-vdpau=%{?with_vdpau:enabled}%{!?with_vdpau:disabled} \
+  -Dgallium-omx=%{?with_omx:bellagio}%{!?with_omx:disabled} \
+  -Dgallium-va=%{?with_va:enabled}%{!?with_va:disabled} \
+  -Dgallium-xa=%{?with_xa:enabled}%{!?with_xa:disabled} \
+  -Dgallium-nine=%{?with_nine:true}%{!?with_nine:false} \
+  -Dgallium-opencl=%{?with_opencl:icd}%{!?with_opencl:disabled} \
+%if 0%{?with_opencl}
+  -Dgallium-rusticl=true \
+%endif
+  -Dvulkan-drivers=%{?vulkan_drivers} \
+  -Dvulkan-layers=device-select \
+  -Dshared-glapi=enabled \
+  -Dgles1=enabled \
+  -Dgles2=enabled \
+  -Dopengl=true \
+  -Dgbm=enabled \
+  -Dglx=dri \
+  -Degl=enabled \
+  -Dglvnd=true \
+%if 0%{?with_intel_clc}
+  -Dintel-clc=enabled \
+%endif
+  -Dmicrosoft-clc=disabled \
+  -Dllvm=enabled \
+  -Dshared-llvm=enabled \
+  -Dvalgrind=%{?with_valgrind:enabled}%{!?with_valgrind:disabled} \
+  -Dxlib-lease=enabled \
+  -Dbuild-tests=false \
+  -Dselinux=true \
+%if !0%{?with_libunwind}
+  -Dlibunwind=disabled \
+%endif
+%if !0%{?with_lmsensors}
+  -Dlmsensors=disabled \
+%endif
+  -Dandroid-libbacktrace=disabled \
+%ifarch %{ix86}
+  -Dglx-read-only-text=true
+%endif
+  %{nil}
+%meson_build
+
+%install
+%meson_install
+
+# libvdpau opens the versioned name, don't bother including the unversioned
+rm -vf %{buildroot}%{_libdir}/vdpau/*.so
+# likewise glvnd
+rm -vf %{buildroot}%{_libdir}/libGLX_mesa.so
+rm -vf %{buildroot}%{_libdir}/libEGL_mesa.so
+# XXX can we just not build this
+rm -vf %{buildroot}%{_libdir}/libGLES*
+
+# glvnd needs a default provider for indirect rendering where it cannot
+# determine the vendor
+ln -s %{_libdir}/libGLX_mesa.so.0 %{buildroot}%{_libdir}/libGLX_system.so.0
+
+# this keeps breaking, check it early.  note that the exit from eu-ftr is odd.
+pushd %{buildroot}%{_libdir}
+for i in libOSMesa*.so libGL.so ; do
+    eu-findtextrel $i && exit 1
+done
+popd
+
+%ifarch %{ix86}
+rm -Rf %{buildroot}%{_datadir}/drirc.d/00-radv-defaults.conf
+rm -Rf %{buildroot}%{_datadir}/drirc.d/00-mesa-defaults.conf
+%endif
+
+%files filesystem
+%doc docs/Mesa-MLAA-License-Clarification-Email.txt
+%dir %{_libdir}/dri
+%if 0%{?with_hardware}
+%if 0%{?with_vdpau}
+%dir %{_libdir}/vdpau
+%endif
+%endif
+
+%files libGL
+%{_libdir}/libGLX_mesa.so.0*
+%{_libdir}/libGLX_system.so.0*
+%files libGL-devel
+%dir %{_includedir}/GL/internal
+%{_includedir}/GL/internal/dri_interface.h
+%{_libdir}/pkgconfig/dri.pc
+%{_libdir}/libglapi.so
+
+%files libEGL
+%{_datadir}/glvnd/egl_vendor.d/50_mesa.json
+%{_libdir}/libEGL_mesa.so.0*
+%files libEGL-devel
+%dir %{_includedir}/EGL
+%{_includedir}/EGL/eglext_angle.h
+%{_includedir}/EGL/eglmesaext.h
+
+%files libglapi
+%{_libdir}/libglapi.so.0
+%{_libdir}/libglapi.so.0.*
+
+%files libOSMesa
+%{_libdir}/libOSMesa.so.8*
+%files libOSMesa-devel
+%dir %{_includedir}/GL
+%{_includedir}/GL/osmesa.h
+%{_libdir}/libOSMesa.so
+%{_libdir}/pkgconfig/osmesa.pc
+
+%files libgbm
+%{_libdir}/libgbm.so.1
+%{_libdir}/libgbm.so.1.*
+%files libgbm-devel
+%{_libdir}/libgbm.so
+%{_includedir}/gbm.h
+%{_libdir}/pkgconfig/gbm.pc
+
+%if 0%{?with_xa}
+%files libxatracker
+%if 0%{?with_hardware}
+%{_libdir}/libxatracker.so.2
+%{_libdir}/libxatracker.so.2.*
+%endif
+
+%files libxatracker-devel
+%if 0%{?with_hardware}
+%{_libdir}/libxatracker.so
+%{_includedir}/xa_tracker.h
+%{_includedir}/xa_composite.h
+%{_includedir}/xa_context.h
+%{_libdir}/pkgconfig/xatracker.pc
+%endif
+%endif
+
+%if 0%{?with_opencl}
+%files libOpenCL
+%{_libdir}/libMesaOpenCL.so.*
+%{_libdir}/libRusticlOpenCL.so.*
+%{_sysconfdir}/OpenCL/vendors/mesa.icd
+%{_sysconfdir}/OpenCL/vendors/rusticl.icd
+%files libOpenCL-devel
+%{_libdir}/libMesaOpenCL.so
+%{_libdir}/libRusticlOpenCL.so
+%endif
+
+%if 0%{?with_nine}
+%files libd3d
+%dir %{_libdir}/d3d/
+%{_libdir}/d3d/*.so.*
+
+%files libd3d-devel
+%{_libdir}/pkgconfig/d3d.pc
+%{_includedir}/d3dadapter/
+%{_libdir}/d3d/*.so
+%endif
+
+%files dri-drivers
+%dir %{_datadir}/drirc.d
+%ifarch aarch64 x86_64
+%{_datadir}/drirc.d/00-mesa-defaults.conf
+%endif
+%{_libdir}/dri/kms_swrast_dri.so
+%{_libdir}/dri/swrast_dri.so
+%{_libdir}/dri/virtio_gpu_dri.so
+
+%if 0%{?with_hardware}
+%if 0%{?with_r300}
+%{_libdir}/dri/r300_dri.so
+%endif
+%if 0%{?with_radeonsi}
+%if 0%{?with_r600}
+%{_libdir}/dri/r600_dri.so
+%endif
+%{_libdir}/dri/radeonsi_dri.so
+%endif
+%ifarch %{ix86} x86_64
+%{_libdir}/dri/crocus_dri.so
+%{_libdir}/dri/i915_dri.so
+%{_libdir}/dri/iris_dri.so
+%endif
+%ifarch aarch64 x86_64 %{ix86}
+%{_libdir}/dri/ingenic-drm_dri.so
+%{_libdir}/dri/imx-drm_dri.so
+%{_libdir}/dri/imx-lcdif_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/mxsfb-drm_dri.so
+%{_libdir}/dri/rcar-du_dri.so
+%{_libdir}/dri/stm_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
+%endif
+%if 0%{?with_tegra}
+%{_libdir}/dri/tegra_dri.so
+%endif
+%if 0%{?with_lima}
+%{_libdir}/dri/lima_dri.so
+%endif
+%if 0%{?with_panfrost}
+%{_libdir}/dri/panfrost_dri.so
+%endif
+%{_libdir}/dri/nouveau_dri.so
+%if 0%{?with_vmware}
+%{_libdir}/dri/vmwgfx_dri.so
+%endif
+%endif
+%if 0%{?with_opencl}
+%dir %{_libdir}/gallium-pipe
+%{_libdir}/gallium-pipe/*.so
+%endif
+%if 0%{?with_kmsro}
+%{_libdir}/dri/armada-drm_dri.so
+%{_libdir}/dri/exynos_dri.so
+%{_libdir}/dri/hdlcd_dri.so
+%{_libdir}/dri/hx8357d_dri.so
+%{_libdir}/dri/ili9225_dri.so
+%{_libdir}/dri/ili9341_dri.so
+%{_libdir}/dri/imx-dcss_dri.so
+%{_libdir}/dri/mediatek_dri.so
+%{_libdir}/dri/meson_dri.so
+%{_libdir}/dri/mi0283qt_dri.so
+%{_libdir}/dri/pl111_dri.so
+%{_libdir}/dri/repaper_dri.so
+%{_libdir}/dri/rockchip_dri.so
+%{_libdir}/dri/st7586_dri.so
+%{_libdir}/dri/st7735r_dri.so
+%{_libdir}/dri/sun4i-drm_dri.so
+%endif
+%if 0%{?with_vulkan_hw}
+%{_libdir}/dri/zink_dri.so
+%endif
+
+%if 0%{?with_omx}
+%files omx-drivers
+%{_libdir}/bellagio/libomx_mesa.so
+%endif
+
+%if 0%{?with_va}
+%files va-drivers
+%{_libdir}/dri/nouveau_drv_video.so
+%if 0%{?with_r600}
+%{_libdir}/dri/r600_drv_video.so
+%endif
+%if 0%{?with_radeonsi}
+%{_libdir}/dri/radeonsi_drv_video.so
+%endif
+%{_libdir}/dri/virtio_gpu_drv_video.so
+%endif
+
+%if 0%{?with_vdpau}
+%files vdpau-drivers
+%{_libdir}/vdpau/libvdpau_nouveau.so.1*
+%if 0%{?with_r600}
+%{_libdir}/vdpau/libvdpau_r600.so.1*
+%endif
+%if 0%{?with_radeonsi}
+%{_libdir}/vdpau/libvdpau_radeonsi.so.1*
+%endif
+%{_libdir}/vdpau/libvdpau_virtio_gpu.so.1*
+%endif
+
+%files vulkan-drivers
+%{_libdir}/libvulkan_lvp.so
+%{_datadir}/vulkan/icd.d/lvp_icd.*.json
+%{_libdir}/libVkLayer_MESA_device_select.so
+%{_datadir}/vulkan/implicit_layer.d/VkLayer_MESA_device_select.json
+%if 0%{?with_vulkan_hw}
+%{_libdir}/libvulkan_radeon.so
+%ifarch aarch64 x86_64
+%{_datadir}/drirc.d/00-radv-defaults.conf
+%endif
+%{_datadir}/vulkan/icd.d/radeon_icd.*.json
+%{_libdir}/libvulkan_nouveau.so
+%{_datadir}/vulkan/icd.d/nouveau_icd.*.json
+%ifarch %{ix86} x86_64
+%{_libdir}/libvulkan_intel.so
+%{_datadir}/vulkan/icd.d/intel_icd.*.json
+%{_libdir}/libvulkan_intel_hasvk.so
+%{_datadir}/vulkan/icd.d/intel_hasvk_icd.*.json
+%endif
+%ifarch aarch64 x86_64 %{ix86}
+%{_libdir}/libvulkan_broadcom.so
+%{_datadir}/vulkan/icd.d/broadcom_icd.*.json
+%{_libdir}/libvulkan_freedreno.so
+%{_datadir}/vulkan/icd.d/freedreno_icd.*.json
+%{_libdir}/libvulkan_panfrost.so
+%{_datadir}/vulkan/icd.d/panfrost_icd.*.json
+%endif
+%endif
+
+%changelog
+%autochangelog
diff --git a/spec_files/mesa/old/valve.patch b/spec_files/mesa/old/valve.patch
new file mode 100644
index 00000000..627f45c2
--- /dev/null
+++ b/spec_files/mesa/old/valve.patch
@@ -0,0 +1,1670 @@
+From 39b7df3a64e9cfe9c649cd7cda896cef57ae2270 Mon Sep 17 00:00:00 2001
+From: Derek Foreman <derek.foreman@collabora.com>
+Date: Wed, 20 Sep 2023 10:40:33 -0500
+Subject: [PATCH 1/7] vulkan/wsi/wayland: refactor wayland dispatch code
+
+We currently have two similar but different bits of code to dispatch
+wayland event queues. Pull out as much common code as possible.
+
+Signed-off-by: Derek Foreman <derek.foreman@collabora.com>
+---
+ src/vulkan/wsi/wsi_common_wayland.c | 399 +++++++++++++++-------------
+ 1 file changed, 208 insertions(+), 191 deletions(-)
+
+diff --git a/src/vulkan/wsi/wsi_common_wayland.c b/src/vulkan/wsi/wsi_common_wayland.c
+index 22e26bacbc5..d8ae6e36626 100644
+--- a/src/vulkan/wsi/wsi_common_wayland.c
++++ b/src/vulkan/wsi/wsi_common_wayland.c
+@@ -96,6 +96,11 @@ struct wsi_wl_display {
+    struct wl_display *wl_display;
+    /* Actually a proxy wrapper around the event queue */
+    struct wl_display *wl_display_wrapper;
++
++   pthread_mutex_t wl_fd_lock;
++   pthread_cond_t wl_fd_reader_finished;
++   bool wl_fd_read_in_progress;
++
+    struct wl_event_queue *queue;
+ 
+    struct wl_shm *wl_shm;
+@@ -157,6 +162,8 @@ struct wsi_wl_surface {
+ struct wsi_wl_swapchain {
+    struct wsi_swapchain base;
+ 
++   struct wl_event_queue *queue;
++
+    struct wsi_wl_surface *wsi_wl_surface;
+    struct wp_tearing_control_v1 *tearing_control;
+ 
+@@ -180,10 +187,7 @@ struct wsi_wl_swapchain {
+       pthread_mutex_t lock; /* protects all members */
+       uint64_t max_completed;
+       struct wl_list outstanding_list;
+-      pthread_cond_t list_advanced;
+-      struct wl_event_queue *queue;
+       struct wp_presentation *wp_presentation;
+-      bool dispatch_in_progress;
+    } present_ids;
+ 
+    struct wsi_wl_image images[0];
+@@ -208,6 +212,135 @@ find_format(struct u_vector *formats, VkFormat format)
+    return NULL;
+ }
+ 
++static int
++wsi_wl_display_read_queue_with_timeout_internal(struct wsi_wl_display *wsi_wl_display,
++                                                struct wl_event_queue *queue,
++                                                uint64_t atimeout)
++{
++   uint64_t current_time_nsec;
++   struct timespec rel_timeout, end_time, current_time;
++   int ret;
++
++   if (wl_display_prepare_read_queue(wsi_wl_display->wl_display, queue) < 0) {
++      /* Another thread might have read events for our queue already. Go
++       * back to dispatch them.
++       */
++      pthread_mutex_unlock(&wsi_wl_display->wl_fd_lock);
++      if (errno == EAGAIN)
++         return VK_SUCCESS;
++
++      return VK_ERROR_OUT_OF_DATE_KHR;
++   }
++
++   wsi_wl_display->wl_fd_read_in_progress = true;
++   pthread_mutex_unlock(&wsi_wl_display->wl_fd_lock);
++
++   while (1) {
++      struct pollfd pollfd = {
++         .fd = wl_display_get_fd(wsi_wl_display->wl_display),
++         .events = POLLIN
++      };
++
++      current_time_nsec = os_time_get_nano();
++      if (current_time_nsec > atimeout) {
++         rel_timeout.tv_sec = 0;
++         rel_timeout.tv_nsec = 0;
++      } else {
++         timespec_from_nsec(&current_time, current_time_nsec);
++         timespec_from_nsec(&end_time, atimeout);
++         timespec_sub(&rel_timeout, &end_time, &current_time);
++      }
++
++      ret = ppoll(&pollfd, 1, &rel_timeout, NULL);
++      if (ret < 0) {
++         if (errno == EINTR || errno == EAGAIN)
++            continue;
++
++         ret = VK_ERROR_OUT_OF_DATE_KHR;
++      } else if (ret == 0)
++         ret = VK_TIMEOUT;
++      else
++         ret = VK_SUCCESS;
++
++      break;
++   }
++
++   if (ret != VK_SUCCESS) {
++         wl_display_cancel_read(wsi_wl_display->wl_display);
++   } else {
++      ret = wl_display_read_events(wsi_wl_display->wl_display);
++      if (ret != 0)
++        ret = VK_ERROR_OUT_OF_DATE_KHR;
++   }
++
++   pthread_mutex_lock(&wsi_wl_display->wl_fd_lock);
++   wsi_wl_display->wl_fd_read_in_progress = false;
++   pthread_cond_broadcast(&wsi_wl_display->wl_fd_reader_finished);
++   return ret;
++}
++
++static int
++wsi_wl_display_dispatch_queue_with_timeout(struct wsi_wl_display *wsi_wl_display,
++                                           struct wl_event_queue *queue,
++                                           uint64_t timeout)
++{
++   int err;
++   int n_events;
++   uint64_t atimeout, now;
++
++   if (timeout == UINT64_MAX)
++      atimeout = timeout;
++   else
++      atimeout = os_time_get_absolute_timeout(timeout);
++
++   while (1) {
++      n_events = wl_display_dispatch_queue_pending(wsi_wl_display->wl_display,
++                                                   queue);
++      if (n_events > 0) {
++         err = VK_SUCCESS;
++         break;
++      }
++      pthread_mutex_lock(&wsi_wl_display->wl_fd_lock);
++
++      if (wsi_wl_display->wl_fd_read_in_progress) {
++         struct timespec end_time;
++
++         timespec_from_nsec(&end_time, atimeout);
++
++         err = pthread_cond_timedwait(&wsi_wl_display->wl_fd_reader_finished,
++                                      &wsi_wl_display->wl_fd_lock,
++                                      &end_time);
++         if (err) {
++            if (errno == ETIMEDOUT)
++               err = VK_TIMEOUT;
++            else
++               err = VK_ERROR_OUT_OF_DATE_KHR;
++         } else {
++            /* We don't know if the other thread actually
++             * dispatched anything, so let the caller decide
++             * whether it should continue.
++             */
++            err = VK_INCOMPLETE;
++         }
++      } else {
++         err = wsi_wl_display_read_queue_with_timeout_internal(wsi_wl_display,
++                                                               queue,
++                                                               timeout);
++      }
++
++      pthread_mutex_unlock(&wsi_wl_display->wl_fd_lock);
++
++      now = os_time_get_nano();
++      if (now > atimeout) {
++         err = VK_TIMEOUT;
++         break;
++      }
++
++   }
++
++   return err;
++}
++
+ static struct wsi_wl_format *
+ wsi_wl_display_add_vk_format(struct wsi_wl_display *display,
+                              struct u_vector *formats,
+@@ -833,6 +966,8 @@ wsi_wl_display_finish(struct wsi_wl_display *display)
+       wl_proxy_wrapper_destroy(display->wl_display_wrapper);
+    if (display->queue)
+       wl_event_queue_destroy(display->queue);
++   pthread_mutex_destroy(&display->wl_fd_lock);
++   pthread_cond_destroy(&display->wl_fd_reader_finished);
+ }
+ 
+ static VkResult
+@@ -851,6 +986,11 @@ wsi_wl_display_init(struct wsi_wayland *wsi_wl,
+    display->wl_display = wl_display;
+    display->sw = sw;
+ 
++   display->wl_fd_read_in_progress = false;
++   pthread_mutex_init(&display->wl_fd_lock, NULL);
++   if (!wsi_init_pthread_cond_monotonic(&display->wl_fd_reader_finished))
++      goto fail;
++
+    display->queue = wl_display_create_queue(wl_display);
+    if (!display->queue) {
+       result = VK_ERROR_OUT_OF_HOST_MEMORY;
+@@ -951,6 +1091,7 @@ fail_registry:
+       wl_registry_destroy(registry);
+ 
+ fail:
++   pthread_mutex_destroy(&display->wl_fd_lock);
+    wsi_wl_display_finish(display);
+    return result;
+ }
+@@ -1675,19 +1816,15 @@ wsi_wl_swapchain_wait_for_present(struct wsi_swapchain *wsi_chain,
+                                   uint64_t timeout)
+ {
+    struct wsi_wl_swapchain *chain = (struct wsi_wl_swapchain *)wsi_chain;
+-   struct wl_display *wl_display = chain->wsi_wl_surface->display->wl_display;
+-   struct timespec end_time;
+-   int wl_fd = wl_display_get_fd(wl_display);
+-   VkResult ret;
+-   int err;
++   uint64_t end_time, time_left, now;
++   int ret;
++   bool expired = false;
++   bool finished;
+ 
+-   uint64_t atimeout;
+-   if (timeout == 0 || timeout == UINT64_MAX)
+-      atimeout = timeout;
++   if (timeout == UINT64_MAX)
++      end_time = timeout;
+    else
+-      atimeout = os_time_get_absolute_timeout(timeout);
+-
+-   timespec_from_nsec(&end_time, atimeout);
++      end_time = os_time_get_absolute_timeout(timeout);
+ 
+    /* Need to observe that the swapchain semaphore has been unsignalled,
+     * as this is guaranteed when a present is complete. */
+@@ -1703,141 +1840,45 @@ wsi_wl_swapchain_wait_for_present(struct wsi_swapchain *wsi_chain,
+       return VK_SUCCESS;
+    }
+ 
++   while (1) {
++      ret = wl_display_dispatch_queue_pending(chain->wsi_wl_surface->display->wl_display,
++                                              chain->queue);
++      if (ret < 0)
++         return VK_ERROR_OUT_OF_DATE_KHR;
++
+    /* PresentWait can be called concurrently.
+     * If there is contention on this mutex, it means there is currently a dispatcher in flight holding the lock.
+     * The lock is only held while there is forward progress processing events from Wayland,
+     * so there should be no problem locking without timeout.
+     * We would like to be able to support timeout = 0 to query the current max_completed count.
+     * A timedlock with no timeout can be problematic in that scenario. */
+-   err = pthread_mutex_lock(&chain->present_ids.lock);
+-   if (err != 0)
+-      return VK_ERROR_OUT_OF_DATE_KHR;
+-
+-   if (chain->present_ids.max_completed >= present_id) {
++      pthread_mutex_lock(&chain->present_ids.lock);
++      finished = chain->present_ids.max_completed >= present_id;
+       pthread_mutex_unlock(&chain->present_ids.lock);
+-      return VK_SUCCESS;
+-   }
+-
+-   /* Someone else is dispatching events; wait for them to update the chain
+-    * status and wake us up. */
+-   while (chain->present_ids.dispatch_in_progress) {
+-      /* We only own the lock when the wait succeeds. */
+-      err = pthread_cond_timedwait(&chain->present_ids.list_advanced,
+-                                   &chain->present_ids.lock, &end_time);
+-
+-      if (err == ETIMEDOUT) {
+-         pthread_mutex_unlock(&chain->present_ids.lock);
+-         return VK_TIMEOUT;
+-      } else if (err != 0) {
+-         pthread_mutex_unlock(&chain->present_ids.lock);
+-         return VK_ERROR_OUT_OF_DATE_KHR;
+-      }
+-
+-      if (chain->present_ids.max_completed >= present_id) {
+-         pthread_mutex_unlock(&chain->present_ids.lock);
++      if (finished)
+          return VK_SUCCESS;
+-      }
+-
+-      /* Whoever was previously dispatching the events isn't anymore, so we
+-       * will take over and fall through below. */
+-      if (!chain->present_ids.dispatch_in_progress)
+-         break;
+-   }
+-
+-   assert(!chain->present_ids.dispatch_in_progress);
+-   chain->present_ids.dispatch_in_progress = true;
+-
+-   /* Whether or not we were dispatching the events before, we are now: pull
+-    * all the new events from our event queue, post them, and wake up everyone
+-    * else who might be waiting. */
+-   while (1) {
+-      ret = wl_display_dispatch_queue_pending(wl_display, chain->present_ids.queue);
+-      if (ret < 0) {
+-         ret = VK_ERROR_OUT_OF_DATE_KHR;
+-         goto relinquish_dispatch;
+-      }
+-
+-      /* Some events dispatched: check the new completions. */
+-      if (ret > 0) {
+-         /* Completed our own present; stop our own dispatching and let
+-          * someone else pick it up. */
+-         if (chain->present_ids.max_completed >= present_id) {
+-            ret = VK_SUCCESS;
+-            goto relinquish_dispatch;
+-         }
+-
+-         /* Wake up other waiters who may have been unblocked by the events
+-          * we just read. */
+-         pthread_cond_broadcast(&chain->present_ids.list_advanced);
+-      }
+-
+-      /* Check for timeout, and relinquish the dispatch to another thread
+-       * if we're over our budget. */
+-      uint64_t current_time_nsec = os_time_get_nano();
+-      if (current_time_nsec > atimeout) {
+-         ret = VK_TIMEOUT;
+-         goto relinquish_dispatch;
+-      }
+-
+-      /* To poll and read from WL fd safely, we must be cooperative.
+-       * See wl_display_prepare_read_queue in https://wayland.freedesktop.org/docs/html/apb.html */
+-
+-      /* Try to read events from the server. */
+-      ret = wl_display_prepare_read_queue(wl_display, chain->present_ids.queue);
+-      if (ret < 0) {
+-         /* Another thread might have read events for our queue already. Go
+-          * back to dispatch them.
+-          */
+-         if (errno == EAGAIN)
+-            continue;
+-         ret = VK_ERROR_OUT_OF_DATE_KHR;
+-         goto relinquish_dispatch;
+-      }
+ 
+-      /* Drop the lock around poll, so people can wait whilst we sleep. */
+-      pthread_mutex_unlock(&chain->present_ids.lock);
+-
+-      struct pollfd pollfd = {
+-         .fd = wl_fd,
+-         .events = POLLIN
+-      };
+-      struct timespec current_time, rel_timeout;
+-      timespec_from_nsec(&current_time, current_time_nsec);
+-      timespec_sub(&rel_timeout, &end_time, &current_time);
+-      ret = ppoll(&pollfd, 1, &rel_timeout, NULL);
++      if (expired)
++         return VK_TIMEOUT;
+ 
+-      /* Re-lock after poll; either we're dispatching events under the lock or
+-       * bouncing out from an error also under the lock. We can't use timedlock
+-       * here because we need to acquire to clear dispatch_in_progress. */
+-      pthread_mutex_lock(&chain->present_ids.lock);
++      now = os_time_get_nano();
++      if (now > end_time)
++         time_left = 0;
++      else
++         time_left = end_time - now;
+ 
+-      if (ret <= 0) {
+-         int lerrno = errno;
+-         wl_display_cancel_read(wl_display);
+-         if (ret < 0) {
+-            /* If ppoll() was interrupted, try again. */
+-            if (lerrno == EINTR || lerrno == EAGAIN)
+-               continue;
+-            ret = VK_ERROR_OUT_OF_DATE_KHR;
+-            goto relinquish_dispatch;
+-         }
+-         assert(ret == 0);
++      ret = wsi_wl_display_dispatch_queue_with_timeout(chain->wsi_wl_surface->display,
++                                                       chain->queue,
++                                                       time_left);
++      if (ret == VK_INCOMPLETE)
+          continue;
+-      }
+ 
+-      ret = wl_display_read_events(wl_display);
+-      if (ret < 0) {
+-         ret = VK_ERROR_OUT_OF_DATE_KHR;
+-         goto relinquish_dispatch;
+-      }
+-   }
++      if (ret != VK_SUCCESS && ret != VK_TIMEOUT)
++         return ret;
+ 
+-relinquish_dispatch:
+-   assert(chain->present_ids.dispatch_in_progress);
+-   chain->present_ids.dispatch_in_progress = false;
+-   pthread_cond_broadcast(&chain->present_ids.list_advanced);
+-   pthread_mutex_unlock(&chain->present_ids.lock);
+-   return ret;
++      if (time_left == 0)
++         expired = true;
++   }
+ }
+ 
+ static VkResult
+@@ -1847,19 +1888,18 @@ wsi_wl_swapchain_acquire_next_image(struct wsi_swapchain *wsi_chain,
+ {
+    struct wsi_wl_swapchain *chain = (struct wsi_wl_swapchain *)wsi_chain;
+    struct wsi_wl_surface *wsi_wl_surface = chain->wsi_wl_surface;
+-   struct timespec start_time, end_time;
+-   struct timespec rel_timeout;
+-   int wl_fd = wl_display_get_fd(wsi_wl_surface->display->wl_display);
+-
+-   timespec_from_nsec(&rel_timeout, info->timeout);
++   uint64_t end_time, time_left, now;
++   bool expired = false;
++   int ret;
+ 
+-   clock_gettime(CLOCK_MONOTONIC, &start_time);
+-   timespec_add(&end_time, &rel_timeout, &start_time);
++   if (info->timeout == UINT64_MAX)
++      end_time = info->timeout;
++   else
++      end_time = os_time_get_absolute_timeout(info->timeout);
+ 
+    while (1) {
+-      /* Try to dispatch potential events. */
+-      int ret = wl_display_dispatch_queue_pending(wsi_wl_surface->display->wl_display,
+-                                                  wsi_wl_surface->display->queue);
++      ret = wl_display_dispatch_queue_pending(wsi_wl_surface->display->wl_display,
++                                              wsi_wl_surface->display->queue);
+       if (ret < 0)
+          return VK_ERROR_OUT_OF_DATE_KHR;
+ 
+@@ -1873,46 +1913,26 @@ wsi_wl_swapchain_acquire_next_image(struct wsi_swapchain *wsi_chain,
+          }
+       }
+ 
+-      /* Check for timeout. */
+-      struct timespec current_time;
+-      clock_gettime(CLOCK_MONOTONIC, &current_time);
+-      if (timespec_after(&current_time, &end_time))
+-         return (info->timeout ? VK_TIMEOUT : VK_NOT_READY);
++      if (expired)
++         return info->timeout ? VK_TIMEOUT : VK_NOT_READY;
+ 
+-      /* Try to read events from the server. */
+-      ret = wl_display_prepare_read_queue(wsi_wl_surface->display->wl_display,
+-                                          wsi_wl_surface->display->queue);
+-      if (ret < 0) {
+-         /* Another thread might have read events for our queue already. Go
+-          * back to dispatch them.
+-          */
+-         if (errno == EAGAIN)
+-            continue;
+-         return VK_ERROR_OUT_OF_DATE_KHR;
+-      }
++      now = os_time_get_nano();
++      if (now > end_time)
++         time_left = 0;
++      else
++         time_left = end_time - now;
+ 
+-      struct pollfd pollfd = {
+-         .fd = wl_fd,
+-         .events = POLLIN
+-      };
+-      timespec_sub(&rel_timeout, &end_time, &current_time);
+-      ret = ppoll(&pollfd, 1, &rel_timeout, NULL);
+-      if (ret <= 0) {
+-         int lerrno = errno;
+-         wl_display_cancel_read(wsi_wl_surface->display->wl_display);
+-         if (ret < 0) {
+-            /* If ppoll() was interrupted, try again. */
+-            if (lerrno == EINTR || lerrno == EAGAIN)
+-               continue;
+-            return VK_ERROR_OUT_OF_DATE_KHR;
+-         }
+-         assert(ret == 0);
++      ret = wsi_wl_display_dispatch_queue_with_timeout(wsi_wl_surface->display,
++                                                       wsi_wl_surface->display->queue,
++                                                       time_left);
++      if (ret == VK_ERROR_OUT_OF_DATE_KHR)
++         return ret;
++
++      if (ret == VK_INCOMPLETE)
+          continue;
+-      }
+ 
+-      ret = wl_display_read_events(wsi_wl_surface->display->wl_display);
+-      if (ret < 0)
+-         return VK_ERROR_OUT_OF_DATE_KHR;
++      if (ret == VK_TIMEOUT)
++         expired = true;
+    }
+ }
+ 
+@@ -1933,9 +1953,10 @@ presentation_handle_presented(void *data,
+ {
+    struct wsi_wl_present_id *id = data;
+ 
+-   /* present_ids.lock already held around dispatch */
++   pthread_mutex_lock(&id->chain->present_ids.lock);
+    if (id->present_id > id->chain->present_ids.max_completed)
+       id->chain->present_ids.max_completed = id->present_id;
++   pthread_mutex_unlock(&id->chain->present_ids.lock);
+ 
+    wp_presentation_feedback_destroy(feedback);
+    wl_list_remove(&id->link);
+@@ -1948,9 +1969,10 @@ presentation_handle_discarded(void *data,
+ {
+    struct wsi_wl_present_id *id = data;
+ 
+-   /* present_ids.lock already held around dispatch */
++   pthread_mutex_lock(&id->chain->present_ids.lock);
+    if (id->present_id > id->chain->present_ids.max_completed)
+       id->chain->present_ids.max_completed = id->present_id;
++   pthread_mutex_unlock(&id->chain->present_ids.lock);
+ 
+    wp_presentation_feedback_destroy(feedback);
+    wl_list_remove(&id->link);
+@@ -2198,8 +2220,6 @@ wsi_wl_swapchain_chain_free(struct wsi_wl_swapchain *chain,
+       chain->wsi_wl_surface->chain = NULL;
+ 
+    if (chain->present_ids.wp_presentation) {
+-      assert(!chain->present_ids.dispatch_in_progress);
+-
+       /* In VK_EXT_swapchain_maintenance1 there is no requirement to wait for all present IDs to be complete.
+        * Waiting for the swapchain fence is enough.
+        * Just clean up anything user did not wait for. */
+@@ -2211,7 +2231,6 @@ wsi_wl_swapchain_chain_free(struct wsi_wl_swapchain *chain,
+       }
+ 
+       wl_proxy_wrapper_destroy(chain->present_ids.wp_presentation);
+-      pthread_cond_destroy(&chain->present_ids.list_advanced);
+       pthread_mutex_destroy(&chain->present_ids.lock);
+    }
+ 
+@@ -2383,18 +2402,16 @@ wsi_wl_surface_create_swapchain(VkIcdSurfaceBase *icd_surface,
+       chain->drm_modifiers = drm_modifiers_copy;
+    }
+ 
++   chain->queue = wl_display_create_queue(chain->wsi_wl_surface->display->wl_display);
++
+    if (chain->wsi_wl_surface->display->wp_presentation_notwrapped) {
+-      if (!wsi_init_pthread_cond_monotonic(&chain->present_ids.list_advanced))
+-         goto fail;
+       pthread_mutex_init(&chain->present_ids.lock, NULL);
+ 
+       wl_list_init(&chain->present_ids.outstanding_list);
+-      chain->present_ids.queue =
+-            wl_display_create_queue(chain->wsi_wl_surface->display->wl_display);
+       chain->present_ids.wp_presentation =
+             wl_proxy_create_wrapper(chain->wsi_wl_surface->display->wp_presentation_notwrapped);
+       wl_proxy_set_queue((struct wl_proxy *) chain->present_ids.wp_presentation,
+-                         chain->present_ids.queue);
++                         chain->queue);
+    }
+ 
+    chain->fifo_ready = true;
+-- 
+2.42.0
+
+
+From ad381d34e00a89f1961cf345668b939830ed1d39 Mon Sep 17 00:00:00 2001
+From: Derek Foreman <derek.foreman@collabora.com>
+Date: Fri, 10 Nov 2023 07:25:35 -0600
+Subject: [PATCH 2/7] vulkan/wsi/wayland: Use commit_timing/commit_queue
+ protocol for FIFO
+
+The commit_timing protocol allows us to set a presentation timestamp,
+and the commit_queue protocol allows us to request FIFO semantics for
+committed state (instead of the default mailbox).
+
+I these are available, use them to implement Vulkan's FIFO presentation
+mode.
+
+Signed-off-by: Derek Foreman <derek.foreman@collabora.com>
+---
+ src/egl/wayland/wayland-drm/meson.build |   2 +
+ src/vulkan/wsi/meson.build              |   2 +
+ src/vulkan/wsi/wsi_common_wayland.c     | 138 +++++++++++++++++++++---
+ 3 files changed, 130 insertions(+), 12 deletions(-)
+
+diff --git a/src/egl/wayland/wayland-drm/meson.build b/src/egl/wayland/wayland-drm/meson.build
+index ac822acec67..8b6044f09e5 100644
+--- a/src/egl/wayland/wayland-drm/meson.build
++++ b/src/egl/wayland/wayland-drm/meson.build
+@@ -59,6 +59,8 @@ libwayland_drm = static_library(
+ # here for now as the maybe-least-bad solution.
+ wp_dir = dep_wl_protocols.get_variable(pkgconfig : 'pkgdatadir', internal : 'pkgdatadir')
+ wp_protos = {
++  'commit-queue-v1': 'staging/commit-queue/commit-queue-v1.xml',
++  'commit-timing-v1': 'staging/commit-timing/commit-timing-v1.xml',
+   'linux-dmabuf-unstable-v1': 'unstable/linux-dmabuf/linux-dmabuf-unstable-v1.xml',
+   'presentation-time': 'stable/presentation-time/presentation-time.xml',
+   'tearing-control-v1': 'staging/tearing-control/tearing-control-v1.xml',
+diff --git a/src/vulkan/wsi/meson.build b/src/vulkan/wsi/meson.build
+index 9d0db011767..83ad71f06fa 100644
+--- a/src/vulkan/wsi/meson.build
++++ b/src/vulkan/wsi/meson.build
+@@ -31,6 +31,8 @@ endif
+ 
+ if with_platform_wayland
+   files_vulkan_wsi += files('wsi_common_wayland.c')
++  files_vulkan_wsi += wp_files['commit-queue-v1']
++  files_vulkan_wsi += wp_files['commit-timing-v1']
+   files_vulkan_wsi += wp_files['linux-dmabuf-unstable-v1']
+   files_vulkan_wsi += wp_files['presentation-time']
+   files_vulkan_wsi += wp_files['tearing-control-v1']
+diff --git a/src/vulkan/wsi/wsi_common_wayland.c b/src/vulkan/wsi/wsi_common_wayland.c
+index d8ae6e36626..dd78d98dfce 100644
+--- a/src/vulkan/wsi/wsi_common_wayland.c
++++ b/src/vulkan/wsi/wsi_common_wayland.c
+@@ -41,6 +41,8 @@
+ #include "vk_util.h"
+ #include "wsi_common_entrypoints.h"
+ #include "wsi_common_private.h"
++#include "commit-queue-v1-client-protocol.h"
++#include "commit-timing-v1-client-protocol.h"
+ #include "linux-dmabuf-unstable-v1-client-protocol.h"
+ #include "presentation-time-client-protocol.h"
+ #include "tearing-control-v1-client-protocol.h"
+@@ -113,6 +115,9 @@ struct wsi_wl_display {
+    /* users want per-chain wsi_wl_swapchain->present_ids.wp_presentation */
+    struct wp_presentation *wp_presentation_notwrapped;
+ 
++   struct wp_commit_queue_manager_v1 *commit_queue_manager;
++   struct wp_commit_timing_manager_v1 *commit_timing_manager;
++
+    struct wsi_wayland *wsi_wl;
+ 
+    /* Formats populated by zwp_linux_dmabuf_v1 or wl_shm interfaces */
+@@ -135,6 +140,7 @@ struct wsi_wayland {
+ 
+ struct wsi_wl_image {
+    struct wsi_image base;
++   struct wsi_wl_swapchain *chain;
+    struct wl_buffer *buffer;
+    bool busy;
+    int shm_fd;
+@@ -166,6 +172,9 @@ struct wsi_wl_swapchain {
+ 
+    struct wsi_wl_surface *wsi_wl_surface;
+    struct wp_tearing_control_v1 *tearing_control;
++   struct wp_commit_queue_v1 *commit_queue;
++   struct wp_commit_timer_v1 *commit_timer;
++   bool can_timestamp;
+ 
+    struct wl_callback *frame;
+ 
+@@ -181,13 +190,17 @@ struct wsi_wl_swapchain {
+    const uint64_t *drm_modifiers;
+ 
+    VkPresentModeKHR present_mode;
+-   bool fifo_ready;
++   bool legacy_fifo_ready;
++
++   uint64_t last_target_time;
+ 
+    struct {
+       pthread_mutex_t lock; /* protects all members */
+       uint64_t max_completed;
+       struct wl_list outstanding_list;
+       struct wp_presentation *wp_presentation;
++      uint64_t phase_time;
++      unsigned int refresh_nsec;
+    } present_ids;
+ 
+    struct wsi_wl_image images[0];
+@@ -934,6 +947,12 @@ registry_handle_global(void *data, struct wl_registry *registry,
+    } else if (strcmp(interface, wp_tearing_control_manager_v1_interface.name) == 0) {
+       display->tearing_control_manager =
+          wl_registry_bind(registry, name, &wp_tearing_control_manager_v1_interface, 1);
++   } else if (strcmp(interface, wp_commit_timing_manager_v1_interface.name) == 0) {
++      display->commit_timing_manager =
++         wl_registry_bind(registry, name, &wp_commit_timing_manager_v1_interface, 1);
++   } else if (strcmp(interface, wp_commit_queue_manager_v1_interface.name) == 0) {
++      display->commit_queue_manager =
++         wl_registry_bind(registry, name, &wp_commit_queue_manager_v1_interface, 1);
+    }
+ }
+ 
+@@ -960,6 +979,10 @@ wsi_wl_display_finish(struct wsi_wl_display *display)
+       zwp_linux_dmabuf_v1_destroy(display->wl_dmabuf);
+    if (display->wp_presentation_notwrapped)
+       wp_presentation_destroy(display->wp_presentation_notwrapped);
++   if (display->commit_queue_manager)
++      wp_commit_queue_manager_v1_destroy(display->commit_queue_manager);
++   if (display->commit_timing_manager)
++      wp_commit_timing_manager_v1_destroy(display->commit_timing_manager);
+    if (display->tearing_control_manager)
+       wp_tearing_control_manager_v1_destroy(display->tearing_control_manager);
+    if (display->wl_display_wrapper)
+@@ -1922,6 +1945,16 @@ wsi_wl_swapchain_acquire_next_image(struct wsi_swapchain *wsi_chain,
+       else
+          time_left = end_time - now;
+ 
++      /* If we can use timestamps, we want to make sure to dispatch the queue
++       * feedback events are in so we can get a refresh rate and a vsync time to
++       * phase lock to */
++      if (chain->can_timestamp) {
++         ret = wl_display_dispatch_queue_pending(wsi_wl_surface->display->wl_display,
++                                                 chain->queue);
++         if (ret < 0)
++            return VK_ERROR_OUT_OF_DATE_KHR;
++      }
++
+       ret = wsi_wl_display_dispatch_queue_with_timeout(wsi_wl_surface->display,
+                                                        wsi_wl_surface->display->queue,
+                                                        time_left);
+@@ -1952,10 +1985,16 @@ presentation_handle_presented(void *data,
+                               uint32_t flags)
+ {
+    struct wsi_wl_present_id *id = data;
++   struct timespec presentation_time;
+ 
+    pthread_mutex_lock(&id->chain->present_ids.lock);
+    if (id->present_id > id->chain->present_ids.max_completed)
+       id->chain->present_ids.max_completed = id->present_id;
++
++   presentation_time.tv_sec = ((uint64_t)tv_sec_hi << 32) + tv_sec_lo;
++   presentation_time.tv_nsec = tv_nsec;
++   id->chain->present_ids.phase_time = timespec_to_nsec(&presentation_time);
++   id->chain->present_ids.refresh_nsec = refresh;
+    pthread_mutex_unlock(&id->chain->present_ids.lock);
+ 
+    wp_presentation_feedback_destroy(feedback);
+@@ -1991,8 +2030,10 @@ frame_handle_done(void *data, struct wl_callback *callback, uint32_t serial)
+ {
+    struct wsi_wl_swapchain *chain = data;
+ 
++   assert(!chain->can_timestamp);
++
+    chain->frame = NULL;
+-   chain->fifo_ready = true;
++   chain->legacy_fifo_ready = true;
+ 
+    wl_callback_destroy(callback);
+ }
+@@ -2001,6 +2042,46 @@ static const struct wl_callback_listener frame_listener = {
+    frame_handle_done,
+ };
+ 
++static void
++set_timestamp(struct wsi_wl_swapchain *chain)
++{
++   uint64_t now, target;
++   struct timespec target_ts;
++   uint64_t refresh;
++   uint64_t phase_time;
++
++   now = os_time_get_nano();
++
++   pthread_mutex_lock(&chain->present_ids.lock);
++   phase_time = chain->present_ids.phase_time;
++   refresh = chain->present_ids.refresh_nsec;
++   pthread_mutex_unlock(&chain->present_ids.lock);
++
++   if (refresh == 0)
++      refresh = 16666666;
++
++   target = chain->last_target_time + refresh;
++
++   if (now > target) {
++      uint64_t offset;
++
++      if (phase_time > now)
++         now = phase_time;
++
++      offset = (now - phase_time) % refresh;
++      target = now - offset + refresh;
++   }
++
++   timespec_from_nsec(&target_ts, target);
++   wp_commit_timer_v1_set_timestamp(chain->commit_timer,
++                                    target_ts.tv_sec >> 32, target_ts.tv_sec,
++                                    target_ts.tv_nsec);
++
++   wp_commit_queue_v1_set_queue_mode(chain->commit_queue,
++                                     WP_COMMIT_QUEUE_V1_QUEUE_MODE_FIFO);
++   chain->last_target_time = target;
++}
++
+ static VkResult
+ wsi_wl_swapchain_queue_present(struct wsi_swapchain *wsi_chain,
+                                uint32_t image_index,
+@@ -2009,6 +2090,7 @@ wsi_wl_swapchain_queue_present(struct wsi_swapchain *wsi_chain,
+ {
+    struct wsi_wl_swapchain *chain = (struct wsi_wl_swapchain *)wsi_chain;
+    struct wsi_wl_surface *wsi_wl_surface = chain->wsi_wl_surface;
++   bool mode_fifo = chain->base.present_mode == VK_PRESENT_MODE_FIFO_KHR;
+ 
+    if (chain->buffer_type == WSI_WL_BUFFER_SHM_MEMCPY) {
+       struct wsi_wl_image *image = &chain->images[image_index];
+@@ -2018,7 +2100,7 @@ wsi_wl_swapchain_queue_present(struct wsi_swapchain *wsi_chain,
+ 
+    /* For EXT_swapchain_maintenance1. We might have transitioned from FIFO to MAILBOX.
+     * In this case we need to let the FIFO request complete, before presenting MAILBOX. */
+-   while (!chain->fifo_ready) {
++   while (!chain->can_timestamp && !chain->legacy_fifo_ready) {
+       int ret = wl_display_dispatch_queue(wsi_wl_surface->display->wl_display,
+                                           wsi_wl_surface->display->queue);
+       if (ret < 0)
+@@ -2041,16 +2123,19 @@ wsi_wl_swapchain_queue_present(struct wsi_swapchain *wsi_chain,
+       wl_surface_damage(wsi_wl_surface->surface, 0, 0, INT32_MAX, INT32_MAX);
+    }
+ 
+-   if (chain->base.present_mode == VK_PRESENT_MODE_FIFO_KHR) {
+-      chain->frame = wl_surface_frame(wsi_wl_surface->surface);
+-      wl_callback_add_listener(chain->frame, &frame_listener, chain);
+-      chain->fifo_ready = false;
+-   } else {
+-      /* If we present MAILBOX, any subsequent presentation in FIFO can replace this image. */
+-      chain->fifo_ready = true;
++   if (!chain->can_timestamp) {
++      if (mode_fifo) {
++         chain->frame = wl_surface_frame(wsi_wl_surface->surface);
++         wl_callback_add_listener(chain->frame, &frame_listener, chain);
++         chain->legacy_fifo_ready = false;
++      } else {
++         /* If we present MAILBOX, any subsequent presentation in FIFO can replace this image. */
++         chain->legacy_fifo_ready = true;
++      }
+    }
+ 
+-   if (present_id > 0 && chain->present_ids.wp_presentation) {
++   if (chain->present_ids.wp_presentation &&
++       (present_id > 0 || (chain->can_timestamp && mode_fifo))) {
+       struct wsi_wl_present_id *id =
+          vk_zalloc(chain->wsi_wl_surface->display->wsi_wl->alloc, sizeof(*id), sizeof(uintptr_t),
+                    VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
+@@ -2069,6 +2154,10 @@ wsi_wl_swapchain_queue_present(struct wsi_swapchain *wsi_chain,
+    }
+ 
+    chain->images[image_index].busy = true;
++
++   if (chain->can_timestamp && mode_fifo)
++      set_timestamp(chain);
++
+    wl_surface_commit(wsi_wl_surface->surface);
+    wl_display_flush(wsi_wl_surface->display->wl_display);
+ 
+@@ -2184,6 +2273,7 @@ wsi_wl_image_init(struct wsi_wl_swapchain *chain,
+       goto fail_image;
+ 
+    wl_buffer_add_listener(image->buffer, &buffer_listener, image);
++   image->chain = chain;
+ 
+    return VK_SUCCESS;
+ 
+@@ -2234,6 +2324,12 @@ wsi_wl_swapchain_chain_free(struct wsi_wl_swapchain *chain,
+       pthread_mutex_destroy(&chain->present_ids.lock);
+    }
+ 
++   if (chain->commit_queue)
++      wp_commit_queue_v1_destroy(chain->commit_queue);
++
++   if (chain->commit_timer)
++      wp_commit_timer_v1_destroy(chain->commit_timer);
++
+    vk_free(pAllocator, (void *)chain->drm_modifiers);
+ 
+    wsi_swapchain_finish(&chain->base);
+@@ -2290,6 +2386,15 @@ wsi_wl_surface_create_swapchain(VkIcdSurfaceBase *icd_surface,
+          wp_tearing_control_v1_destroy(old_chain->tearing_control);
+          old_chain->tearing_control = NULL;
+       }
++      if (old_chain->commit_queue) {
++         wp_commit_queue_v1_destroy(old_chain->commit_queue);
++         old_chain->commit_queue = NULL;
++         old_chain->can_timestamp = false;
++      }
++      if (old_chain->commit_timer) {
++         wp_commit_timer_v1_destroy(old_chain->commit_timer);
++         old_chain->commit_timer = NULL;
++      }
+    }
+ 
+    /* Take ownership of the wsi_wl_surface */
+@@ -2414,7 +2519,16 @@ wsi_wl_surface_create_swapchain(VkIcdSurfaceBase *icd_surface,
+                          chain->queue);
+    }
+ 
+-   chain->fifo_ready = true;
++   chain->legacy_fifo_ready = true;
++   struct wsi_wl_display *dpy = chain->wsi_wl_surface->display;
++   if (dpy->commit_queue_manager &&
++       dpy->commit_timing_manager) {
++      chain->commit_queue = wp_commit_queue_manager_v1_get_queue_controller(dpy->commit_queue_manager,
++                                                                            chain->wsi_wl_surface->surface);
++      chain->commit_timer = wp_commit_timing_manager_v1_get_timer(dpy->commit_timing_manager,
++                                                                  chain->wsi_wl_surface->surface);
++      chain->can_timestamp = true;
++   }
+ 
+    for (uint32_t i = 0; i < chain->base.image_count; i++) {
+       result = wsi_wl_image_init(chain, &chain->images[i],
+-- 
+2.42.0
+
+
+From dfa0495e9fbe27216cfbcfd3564eeeb1c00a4e6e Mon Sep 17 00:00:00 2001
+From: Simon Ser <contact@emersion.fr>
+Date: Sat, 25 Nov 2023 16:25:58 +0100
+Subject: [PATCH 3/7] hack: rip out commit-timing-v1
+
+---
+ src/egl/wayland/wayland-drm/meson.build |  2 +-
+ src/vulkan/wsi/meson.build              |  2 +-
+ src/vulkan/wsi/wsi_common_wayland.c     | 24 ++----------------------
+ 3 files changed, 4 insertions(+), 24 deletions(-)
+
+diff --git a/src/egl/wayland/wayland-drm/meson.build b/src/egl/wayland/wayland-drm/meson.build
+index 8b6044f09e5..83a63385274 100644
+--- a/src/egl/wayland/wayland-drm/meson.build
++++ b/src/egl/wayland/wayland-drm/meson.build
+@@ -60,7 +60,7 @@ libwayland_drm = static_library(
+ wp_dir = dep_wl_protocols.get_variable(pkgconfig : 'pkgdatadir', internal : 'pkgdatadir')
+ wp_protos = {
+   'commit-queue-v1': 'staging/commit-queue/commit-queue-v1.xml',
+-  'commit-timing-v1': 'staging/commit-timing/commit-timing-v1.xml',
++  #'commit-timing-v1': 'staging/commit-timing/commit-timing-v1.xml',
+   'linux-dmabuf-unstable-v1': 'unstable/linux-dmabuf/linux-dmabuf-unstable-v1.xml',
+   'presentation-time': 'stable/presentation-time/presentation-time.xml',
+   'tearing-control-v1': 'staging/tearing-control/tearing-control-v1.xml',
+diff --git a/src/vulkan/wsi/meson.build b/src/vulkan/wsi/meson.build
+index 83ad71f06fa..dba95387975 100644
+--- a/src/vulkan/wsi/meson.build
++++ b/src/vulkan/wsi/meson.build
+@@ -32,7 +32,7 @@ endif
+ if with_platform_wayland
+   files_vulkan_wsi += files('wsi_common_wayland.c')
+   files_vulkan_wsi += wp_files['commit-queue-v1']
+-  files_vulkan_wsi += wp_files['commit-timing-v1']
++  #files_vulkan_wsi += wp_files['commit-timing-v1']
+   files_vulkan_wsi += wp_files['linux-dmabuf-unstable-v1']
+   files_vulkan_wsi += wp_files['presentation-time']
+   files_vulkan_wsi += wp_files['tearing-control-v1']
+diff --git a/src/vulkan/wsi/wsi_common_wayland.c b/src/vulkan/wsi/wsi_common_wayland.c
+index dd78d98dfce..1efe9e449e8 100644
+--- a/src/vulkan/wsi/wsi_common_wayland.c
++++ b/src/vulkan/wsi/wsi_common_wayland.c
+@@ -42,7 +42,6 @@
+ #include "wsi_common_entrypoints.h"
+ #include "wsi_common_private.h"
+ #include "commit-queue-v1-client-protocol.h"
+-#include "commit-timing-v1-client-protocol.h"
+ #include "linux-dmabuf-unstable-v1-client-protocol.h"
+ #include "presentation-time-client-protocol.h"
+ #include "tearing-control-v1-client-protocol.h"
+@@ -116,7 +115,6 @@ struct wsi_wl_display {
+    struct wp_presentation *wp_presentation_notwrapped;
+ 
+    struct wp_commit_queue_manager_v1 *commit_queue_manager;
+-   struct wp_commit_timing_manager_v1 *commit_timing_manager;
+ 
+    struct wsi_wayland *wsi_wl;
+ 
+@@ -173,7 +171,6 @@ struct wsi_wl_swapchain {
+    struct wsi_wl_surface *wsi_wl_surface;
+    struct wp_tearing_control_v1 *tearing_control;
+    struct wp_commit_queue_v1 *commit_queue;
+-   struct wp_commit_timer_v1 *commit_timer;
+    bool can_timestamp;
+ 
+    struct wl_callback *frame;
+@@ -947,9 +944,6 @@ registry_handle_global(void *data, struct wl_registry *registry,
+    } else if (strcmp(interface, wp_tearing_control_manager_v1_interface.name) == 0) {
+       display->tearing_control_manager =
+          wl_registry_bind(registry, name, &wp_tearing_control_manager_v1_interface, 1);
+-   } else if (strcmp(interface, wp_commit_timing_manager_v1_interface.name) == 0) {
+-      display->commit_timing_manager =
+-         wl_registry_bind(registry, name, &wp_commit_timing_manager_v1_interface, 1);
+    } else if (strcmp(interface, wp_commit_queue_manager_v1_interface.name) == 0) {
+       display->commit_queue_manager =
+          wl_registry_bind(registry, name, &wp_commit_queue_manager_v1_interface, 1);
+@@ -981,8 +975,6 @@ wsi_wl_display_finish(struct wsi_wl_display *display)
+       wp_presentation_destroy(display->wp_presentation_notwrapped);
+    if (display->commit_queue_manager)
+       wp_commit_queue_manager_v1_destroy(display->commit_queue_manager);
+-   if (display->commit_timing_manager)
+-      wp_commit_timing_manager_v1_destroy(display->commit_timing_manager);
+    if (display->tearing_control_manager)
+       wp_tearing_control_manager_v1_destroy(display->tearing_control_manager);
+    if (display->wl_display_wrapper)
+@@ -2073,9 +2065,6 @@ set_timestamp(struct wsi_wl_swapchain *chain)
+    }
+ 
+    timespec_from_nsec(&target_ts, target);
+-   wp_commit_timer_v1_set_timestamp(chain->commit_timer,
+-                                    target_ts.tv_sec >> 32, target_ts.tv_sec,
+-                                    target_ts.tv_nsec);
+ 
+    wp_commit_queue_v1_set_queue_mode(chain->commit_queue,
+                                      WP_COMMIT_QUEUE_V1_QUEUE_MODE_FIFO);
+@@ -2091,6 +2080,7 @@ wsi_wl_swapchain_queue_present(struct wsi_swapchain *wsi_chain,
+    struct wsi_wl_swapchain *chain = (struct wsi_wl_swapchain *)wsi_chain;
+    struct wsi_wl_surface *wsi_wl_surface = chain->wsi_wl_surface;
+    bool mode_fifo = chain->base.present_mode == VK_PRESENT_MODE_FIFO_KHR;
++   //fprintf(stderr, "FIFO = %d\n", mode_fifo);
+ 
+    if (chain->buffer_type == WSI_WL_BUFFER_SHM_MEMCPY) {
+       struct wsi_wl_image *image = &chain->images[image_index];
+@@ -2327,9 +2317,6 @@ wsi_wl_swapchain_chain_free(struct wsi_wl_swapchain *chain,
+    if (chain->commit_queue)
+       wp_commit_queue_v1_destroy(chain->commit_queue);
+ 
+-   if (chain->commit_timer)
+-      wp_commit_timer_v1_destroy(chain->commit_timer);
+-
+    vk_free(pAllocator, (void *)chain->drm_modifiers);
+ 
+    wsi_swapchain_finish(&chain->base);
+@@ -2391,10 +2378,6 @@ wsi_wl_surface_create_swapchain(VkIcdSurfaceBase *icd_surface,
+          old_chain->commit_queue = NULL;
+          old_chain->can_timestamp = false;
+       }
+-      if (old_chain->commit_timer) {
+-         wp_commit_timer_v1_destroy(old_chain->commit_timer);
+-         old_chain->commit_timer = NULL;
+-      }
+    }
+ 
+    /* Take ownership of the wsi_wl_surface */
+@@ -2521,12 +2504,9 @@ wsi_wl_surface_create_swapchain(VkIcdSurfaceBase *icd_surface,
+ 
+    chain->legacy_fifo_ready = true;
+    struct wsi_wl_display *dpy = chain->wsi_wl_surface->display;
+-   if (dpy->commit_queue_manager &&
+-       dpy->commit_timing_manager) {
++   if (dpy->commit_queue_manager) {
+       chain->commit_queue = wp_commit_queue_manager_v1_get_queue_controller(dpy->commit_queue_manager,
+                                                                             chain->wsi_wl_surface->surface);
+-      chain->commit_timer = wp_commit_timing_manager_v1_get_timer(dpy->commit_timing_manager,
+-                                                                  chain->wsi_wl_surface->surface);
+       chain->can_timestamp = true;
+    }
+ 
+-- 
+2.42.0
+
+
+From fbb52f6f45b02583a0b496e4cc34af34251cb1bd Mon Sep 17 00:00:00 2001
+From: Joshua Ashton <joshua@froggi.es>
+Date: Wed, 29 Nov 2023 11:06:51 +0000
+Subject: [PATCH 4/7] wsi: Use vendored gamescope-commit-queue-v1 protocol
+
+---
+ .../wayland-drm/gamescope-commit-queue-v1.xml | 181 ++++++++++++++++++
+ src/egl/wayland/wayland-drm/meson.build       |  22 ++-
+ src/vulkan/wsi/meson.build                    |   2 +-
+ src/vulkan/wsi/wsi_common_wayland.c           |  22 +--
+ 4 files changed, 214 insertions(+), 13 deletions(-)
+ create mode 100644 src/egl/wayland/wayland-drm/gamescope-commit-queue-v1.xml
+
+diff --git a/src/egl/wayland/wayland-drm/gamescope-commit-queue-v1.xml b/src/egl/wayland/wayland-drm/gamescope-commit-queue-v1.xml
+new file mode 100644
+index 00000000000..d460e0bc10f
+--- /dev/null
++++ b/src/egl/wayland/wayland-drm/gamescope-commit-queue-v1.xml
+@@ -0,0 +1,181 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<protocol name="gamescope_commit_queue_v1">
++  <copyright>
++    Copyright © 2023 Valve Corporation
++
++    Permission is hereby granted, free of charge, to any person obtaining a
++    copy of this software and associated documentation files (the "Software"),
++    to deal in the Software without restriction, including without limitation
++    the rights to use, copy, modify, merge, publish, distribute, sublicense,
++    and/or sell copies of the Software, and to permit persons to whom the
++    Software is furnished to do so, subject to the following conditions:
++
++    The above copyright notice and this permission notice (including the next
++    paragraph) shall be included in all copies or substantial portions of the
++    Software.
++
++    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
++    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
++    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
++    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
++    DEALINGS IN THE SOFTWARE.
++  </copyright>
++
++  <interface name="gamescope_commit_queue_manager_v1" version="1">
++    <description summary="commit queuing">
++      By design Wayland uses a "mailbox" style presentation model. Under
++      the mailbox model, when wl_surface.commit is called, the currently
++      pending state is intended to replace the current state immediately.
++
++      If state is committed many times before the compositor repaints a
++      scene, each commit takes place immediately, updating the existing
++      state. When the compositor repaints the display only the most
++      recent accumulation of state is visible. This may lead to client
++      buffers being released without presentation if they were replaced
++      before being displayed.
++
++      There are other presentation models such as FIFO (First In First
++      Out) in which state commits are explicitly queued for future
++      repaint intervals, and client buffers should not be released
++      without being displayed.
++
++      Graphics APIs such as Vulkan aim to support these presentation
++      models, but they are not implementable on top of our mailbox model
++      without the ability to change the default surface state handling
++      behaviour.
++
++      This interface provides a way to control the compositor's surface
++      state handling to enable presentation models other than mailbox.
++
++      It does so by exposing control of a compositor surface state queue,
++      and specifying for each call of wl_surface.commit whether the
++      pending state should be handled in a mailbox or a FIFO fashion.
++
++      Warning! The protocol described in this file is currently in the testing
++      phase. Backward compatible changes may be added together with the
++      corresponding interface version bump. Backward incompatible changes can
++      only be done by creating a new major version of the extension.
++    </description>
++    <enum name="error">
++      <description summary="fatal presentation error">
++        These fatal protocol errors may be emitted in response to
++        illegal requests.
++      </description>
++      <entry name="queue_controller_already_exists" value="0"
++             summary="commit queue controller already exists for surface"/>
++    </enum>
++
++    <request name="destroy" type="destructor">
++      <description summary="unbind from the surface queuing interface">
++        Informs the server that the client will no longer be using
++        this protocol object. Existing objects created by this object
++        are not affected.
++      </description>
++    </request>
++
++    <request name="get_queue_controller">
++      <description summary="request commit queue submission interface for surface">
++        Establish a queue controller for a surface.
++
++        Graphics APIs (EGL, Vulkan) will likely use this protocol
++        internally, so clients using them shouldn't directly use this
++        protocol on surfaces managed by those APIs, or a
++        queue_controller_already_exists protocol error will occur.
++      </description>
++      <arg name="id" type="new_id" interface="gamescope_commit_queue_v1"/>
++      <arg name="surface" type="object" interface="wl_surface"/>
++    </request>
++  </interface>
++
++  <interface name="gamescope_commit_queue_v1" version="1">
++    <description summary="commit queue controller">
++      A queue controller for a surface.
++
++      A wayland compositor may implicitly queue surface state to
++      allow it to pick the most recently ready state at repaint time,
++      or to allow surface state to contain timing information.
++
++      The commit queue controller object allows explicit control over
++      the queue of upcoming surface state by allowing a client to attach
++      a queue drain mode to pending surface state before it calls
++      wl_surface.commit.
++    </description>
++
++    <enum name="error">
++      <description summary="fatal presentation error">
++        These fatal protocol errors may be emitted in response to
++        illegal requests.
++      </description>
++      <entry name="invalid_queue_mode" value="0"
++             summary="invalid queue mode"/>
++    </enum>
++
++    <enum name="queue_mode">
++      <description summary="Queue drain mode">
++        This enum is used to choose how the compositor processes a queue
++        entry at output repaint time.
++      </description>
++      <entry name="mailbox" value="0">
++        <description summary="Fast forward through past timestamps">
++          State from this queue slot may be updated immediately (without
++          completing a repaint) if newer state is ready to display at
++          repaint time.
++        </description>
++      </entry>
++      <entry name="fifo" value="1">
++        <description summary="Attempt to display each queued commit">
++          This queue slot will be the last state update for this surface
++          that the compositor will process during the repaint in which
++          it is ready for display.
++
++          If the compositor is presenting with tearing, the surface state
++          must be made current for an iteration of the compositor's repaint
++          loop. This may result in the state being visible for a very short
++          duration, with visible artifacts, or even not visible at all for
++          surfaces that aren't full screen.
++
++          The compositor must not cause state processing to stall indefinitely
++          for a surface that is occluded or otherwise not visible. Instead,
++          if the compositor is choosing not to present a surface for reasons
++          unrelated to state readiness, the FIFO condition must be considered
++          satisfied at the moment new state becomes ready to replace the
++          undisplayed state.
++        </description>
++      </entry>
++    </enum>
++
++    <request name="set_queue_mode">
++      <description summary="set the queue draining mode for the pending commit">
++        This request adds a queue drain mode to the pending surface
++        state, which will be commit by the next wl_surface.commit.
++
++        This request tells the compositor how to process the state
++        from that commit when handling its internal state queue.
++
++        If the drain mode is "mailbox", the compositor may continue
++        processing the next state in the queue before it repaints
++        the display.
++
++        If the drain mode is "fifo", the compositor should ensure the
++        queue is not advanced until after this state has been current
++        for a repaint. The queue may be advance without repaint in the
++        case of off-screen or occluded surfaces.
++
++        The default drain mode when none is specified is "mailbox".
++      </description>
++      <arg name="mode" type="uint" enum="drain_mode"/>
++    </request>
++
++    <request name="destroy" type="destructor">
++      <description summary="Destroy the surface queue controller">
++        Informs the server that the client will no longer be using
++        this protocol object.
++
++        Surface state changes previously made by this protocol are
++        unaffected by this object's destruction.
++      </description>
++    </request>
++  </interface>
++</protocol>
+diff --git a/src/egl/wayland/wayland-drm/meson.build b/src/egl/wayland/wayland-drm/meson.build
+index 83a63385274..caba51b22a7 100644
+--- a/src/egl/wayland/wayland-drm/meson.build
++++ b/src/egl/wayland/wayland-drm/meson.build
+@@ -59,7 +59,7 @@ libwayland_drm = static_library(
+ # here for now as the maybe-least-bad solution.
+ wp_dir = dep_wl_protocols.get_variable(pkgconfig : 'pkgdatadir', internal : 'pkgdatadir')
+ wp_protos = {
+-  'commit-queue-v1': 'staging/commit-queue/commit-queue-v1.xml',
++  #'commit-queue-v1': 'staging/commit-queue/commit-queue-v1.xml',
+   #'commit-timing-v1': 'staging/commit-timing/commit-timing-v1.xml',
+   'linux-dmabuf-unstable-v1': 'unstable/linux-dmabuf/linux-dmabuf-unstable-v1.xml',
+   'presentation-time': 'stable/presentation-time/presentation-time.xml',
+@@ -81,3 +81,23 @@ foreach name, xml : wp_protos
+   )
+   wp_files += { name: [code, header] }
+ endforeach
++
++gamescope_protos = {
++  'gamescope-commit-queue-v1': 'gamescope-commit-queue-v1.xml',
++}
++foreach name, xml : gamescope_protos
++  code = custom_target(
++    name + '-protocol.c',
++    input : xml,
++    output : name + '-protocol.c',
++    command : [prog_wl_scanner, wl_scanner_arg, '@INPUT@', '@OUTPUT@'],
++  )
++  header = custom_target(
++    name + '-client-protocol.h',
++    input : xml,
++    output : name + '-client-protocol.h',
++    command : [prog_wl_scanner, 'client-header', '@INPUT@', '@OUTPUT@'],
++  )
++  wp_files += { name: [code, header] }
++endforeach
++
+diff --git a/src/vulkan/wsi/meson.build b/src/vulkan/wsi/meson.build
+index dba95387975..fb0fab69ac6 100644
+--- a/src/vulkan/wsi/meson.build
++++ b/src/vulkan/wsi/meson.build
+@@ -31,7 +31,7 @@ endif
+ 
+ if with_platform_wayland
+   files_vulkan_wsi += files('wsi_common_wayland.c')
+-  files_vulkan_wsi += wp_files['commit-queue-v1']
++  files_vulkan_wsi += wp_files['gamescope-commit-queue-v1']
+   #files_vulkan_wsi += wp_files['commit-timing-v1']
+   files_vulkan_wsi += wp_files['linux-dmabuf-unstable-v1']
+   files_vulkan_wsi += wp_files['presentation-time']
+diff --git a/src/vulkan/wsi/wsi_common_wayland.c b/src/vulkan/wsi/wsi_common_wayland.c
+index 1efe9e449e8..68d9088f936 100644
+--- a/src/vulkan/wsi/wsi_common_wayland.c
++++ b/src/vulkan/wsi/wsi_common_wayland.c
+@@ -41,7 +41,7 @@
+ #include "vk_util.h"
+ #include "wsi_common_entrypoints.h"
+ #include "wsi_common_private.h"
+-#include "commit-queue-v1-client-protocol.h"
++#include "gamescope-commit-queue-v1-client-protocol.h"
+ #include "linux-dmabuf-unstable-v1-client-protocol.h"
+ #include "presentation-time-client-protocol.h"
+ #include "tearing-control-v1-client-protocol.h"
+@@ -114,7 +114,7 @@ struct wsi_wl_display {
+    /* users want per-chain wsi_wl_swapchain->present_ids.wp_presentation */
+    struct wp_presentation *wp_presentation_notwrapped;
+ 
+-   struct wp_commit_queue_manager_v1 *commit_queue_manager;
++   struct gamescope_commit_queue_manager_v1 *commit_queue_manager;
+ 
+    struct wsi_wayland *wsi_wl;
+ 
+@@ -170,7 +170,7 @@ struct wsi_wl_swapchain {
+ 
+    struct wsi_wl_surface *wsi_wl_surface;
+    struct wp_tearing_control_v1 *tearing_control;
+-   struct wp_commit_queue_v1 *commit_queue;
++   struct gamescope_commit_queue_v1 *commit_queue;
+    bool can_timestamp;
+ 
+    struct wl_callback *frame;
+@@ -944,9 +944,9 @@ registry_handle_global(void *data, struct wl_registry *registry,
+    } else if (strcmp(interface, wp_tearing_control_manager_v1_interface.name) == 0) {
+       display->tearing_control_manager =
+          wl_registry_bind(registry, name, &wp_tearing_control_manager_v1_interface, 1);
+-   } else if (strcmp(interface, wp_commit_queue_manager_v1_interface.name) == 0) {
++   } else if (strcmp(interface, gamescope_commit_queue_manager_v1_interface.name) == 0) {
+       display->commit_queue_manager =
+-         wl_registry_bind(registry, name, &wp_commit_queue_manager_v1_interface, 1);
++         wl_registry_bind(registry, name, &gamescope_commit_queue_manager_v1_interface, 1);
+    }
+ }
+ 
+@@ -974,7 +974,7 @@ wsi_wl_display_finish(struct wsi_wl_display *display)
+    if (display->wp_presentation_notwrapped)
+       wp_presentation_destroy(display->wp_presentation_notwrapped);
+    if (display->commit_queue_manager)
+-      wp_commit_queue_manager_v1_destroy(display->commit_queue_manager);
++      gamescope_commit_queue_manager_v1_destroy(display->commit_queue_manager);
+    if (display->tearing_control_manager)
+       wp_tearing_control_manager_v1_destroy(display->tearing_control_manager);
+    if (display->wl_display_wrapper)
+@@ -2066,8 +2066,8 @@ set_timestamp(struct wsi_wl_swapchain *chain)
+ 
+    timespec_from_nsec(&target_ts, target);
+ 
+-   wp_commit_queue_v1_set_queue_mode(chain->commit_queue,
+-                                     WP_COMMIT_QUEUE_V1_QUEUE_MODE_FIFO);
++   gamescope_commit_queue_v1_set_queue_mode(chain->commit_queue,
++                                     GAMESCOPE_COMMIT_QUEUE_V1_QUEUE_MODE_FIFO);
+    chain->last_target_time = target;
+ }
+ 
+@@ -2315,7 +2315,7 @@ wsi_wl_swapchain_chain_free(struct wsi_wl_swapchain *chain,
+    }
+ 
+    if (chain->commit_queue)
+-      wp_commit_queue_v1_destroy(chain->commit_queue);
++      gamescope_commit_queue_v1_destroy(chain->commit_queue);
+ 
+    vk_free(pAllocator, (void *)chain->drm_modifiers);
+ 
+@@ -2374,7 +2374,7 @@ wsi_wl_surface_create_swapchain(VkIcdSurfaceBase *icd_surface,
+          old_chain->tearing_control = NULL;
+       }
+       if (old_chain->commit_queue) {
+-         wp_commit_queue_v1_destroy(old_chain->commit_queue);
++         gamescope_commit_queue_v1_destroy(old_chain->commit_queue);
+          old_chain->commit_queue = NULL;
+          old_chain->can_timestamp = false;
+       }
+@@ -2505,7 +2505,7 @@ wsi_wl_surface_create_swapchain(VkIcdSurfaceBase *icd_surface,
+    chain->legacy_fifo_ready = true;
+    struct wsi_wl_display *dpy = chain->wsi_wl_surface->display;
+    if (dpy->commit_queue_manager) {
+-      chain->commit_queue = wp_commit_queue_manager_v1_get_queue_controller(dpy->commit_queue_manager,
++      chain->commit_queue = gamescope_commit_queue_manager_v1_get_queue_controller(dpy->commit_queue_manager,
+                                                                             chain->wsi_wl_surface->surface);
+       chain->can_timestamp = true;
+    }
+-- 
+2.42.0
+
+
+From f0be8700af09a5a1c94d84c1b3b4ee3096de0b69 Mon Sep 17 00:00:00 2001
+From: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
+Date: Fri, 14 Jan 2022 15:58:45 +0100
+Subject: [PATCH 5/7] 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.
+---
+ src/util/00-radv-defaults.conf | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/util/00-radv-defaults.conf b/src/util/00-radv-defaults.conf
+index 0dcec733e52..f0d535df2f8 100644
+--- a/src/util/00-radv-defaults.conf
++++ b/src/util/00-radv-defaults.conf
+@@ -188,5 +188,9 @@ Application bugs worked around in this file:
+         <application name="Rocket League" executable="RocketLeague">
+             <option name="radv_zero_vram" value="true" />
+         </application>
++
++        <application name="Forza Horizon 5" application_name_match="ForzaHorizon5.exe">
++            <option name="vk_x11_override_min_image_count" value="4" />
++        </application>
+     </device>
+ </driconf>
+-- 
+2.42.0
+
+
+From 2ab76c1153f55d82c3f49a25f8f8a1f1e1e74075 Mon Sep 17 00:00:00 2001
+From: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
+Date: Mon, 21 Feb 2022 18:43:54 +0100
+Subject: [PATCH 6/7] STEAMOS: Dynamic swapchain override for gamescope limiter
+
+---
+ src/loader/loader_dri3_helper.c | 42 +++++++++++++++++++++++++++++++--
+ src/loader/loader_dri3_helper.h |  1 +
+ src/loader/meson.build          |  2 +-
+ src/vulkan/wsi/wsi_common_x11.c | 38 +++++++++++++++++++++++++++++
+ 4 files changed, 80 insertions(+), 3 deletions(-)
+
+diff --git a/src/loader/loader_dri3_helper.c b/src/loader/loader_dri3_helper.c
+index 2631a9e2fd5..dbf6db349c6 100644
+--- a/src/loader/loader_dri3_helper.c
++++ b/src/loader/loader_dri3_helper.c
+@@ -289,6 +289,30 @@ dri3_update_max_num_back(struct loader_dri3_drawable *draw)
+    }
+ }
+ 
++static unsigned
++gamescope_swapchain_override()
++{
++   const char *path = getenv("GAMESCOPE_LIMITER_FILE");
++   if (!path)
++      return 0;
++
++   static simple_mtx_t mtx = SIMPLE_MTX_INITIALIZER;
++   static int fd = -1;
++
++   simple_mtx_lock(&mtx);
++   if (fd < 0) {
++      fd = open(path, O_RDONLY);
++   }
++   simple_mtx_unlock(&mtx);
++
++   if (fd < 0)
++      return 0;
++
++   uint32_t override_value = 0;
++   pread(fd, &override_value, sizeof(override_value), 0);
++   return override_value;
++}
++
+ void
+ loader_dri3_set_swap_interval(struct loader_dri3_drawable *draw, int interval)
+ {
+@@ -303,10 +327,12 @@ loader_dri3_set_swap_interval(struct loader_dri3_drawable *draw, int interval)
+     * PS. changing from value A to B and A < B won't cause swap out of order but
+     * may still gets wrong target_msc value at the beginning.
+     */
+-   if (draw->swap_interval != interval)
++   if (draw->orig_swap_interval != interval)
+       loader_dri3_swapbuffer_barrier(draw);
+ 
+-   draw->swap_interval = interval;
++   draw->orig_swap_interval = interval;
++   if (gamescope_swapchain_override() != 1)
++      draw->swap_interval = interval;
+ }
+ 
+ static void
+@@ -438,6 +464,12 @@ loader_dri3_drawable_init(xcb_connection_t *conn,
+    draw->swap_interval = dri_get_initial_swap_interval(draw->dri_screen_render_gpu,
+                                                        draw->ext->config);
+ 
++   draw->orig_swap_interval = draw->swap_interval;
++
++   unsigned gamescope_override = gamescope_swapchain_override();
++   if (gamescope_override == 1)
++      draw->swap_interval = 1;
++
+    dri3_update_max_num_back(draw);
+ 
+    /* Create a new drawable */
+@@ -1085,6 +1117,12 @@ loader_dri3_swap_buffers_msc(struct loader_dri3_drawable *draw,
+    if (draw->type == LOADER_DRI3_DRAWABLE_WINDOW) {
+       dri3_fence_reset(draw->conn, back);
+ 
++      unsigned gamescope_override = gamescope_swapchain_override();
++      if (gamescope_override == 1)
++         draw->swap_interval = 1;
++      else
++         draw->swap_interval = draw->orig_swap_interval;
++
+       /* Compute when we want the frame shown by taking the last known
+        * 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/loader/loader_dri3_helper.h b/src/loader/loader_dri3_helper.h
+index cc2362dd599..fe73b3f329c 100644
+--- a/src/loader/loader_dri3_helper.h
++++ b/src/loader/loader_dri3_helper.h
+@@ -178,6 +178,7 @@ struct loader_dri3_drawable {
+    bool block_on_depleted_buffers;
+    bool queries_buffer_age;
+    int swap_interval;
++   int orig_swap_interval;
+ 
+    struct loader_dri3_extensions *ext;
+    const struct loader_dri3_vtable *vtable;
+diff --git a/src/loader/meson.build b/src/loader/meson.build
+index 35f9991ba2f..154cf809a69 100644
+--- a/src/loader/meson.build
++++ b/src/loader/meson.build
+@@ -29,7 +29,7 @@ if with_platform_x11 and with_dri3
+     dependencies : [
+       idep_mesautil,
+       dep_libdrm, dep_xcb_dri3, dep_xcb_present, dep_xcb_sync, dep_xshmfence,
+-      dep_xcb_xfixes,
++      dep_xcb_xfixes, dep_xcb_xrandr, idep_mesautil
+     ],
+     build_by_default : false,
+   )
+diff --git a/src/vulkan/wsi/wsi_common_x11.c b/src/vulkan/wsi/wsi_common_x11.c
+index cba1d1c5e7c..6d66387d5be 100644
+--- a/src/vulkan/wsi/wsi_common_x11.c
++++ b/src/vulkan/wsi/wsi_common_x11.c
+@@ -48,6 +48,7 @@
+ #include "util/hash_table.h"
+ #include "util/os_file.h"
+ #include "util/os_time.h"
++#include "util/simple_mtx.h"
+ #include "util/u_debug.h"
+ #include "util/u_thread.h"
+ #include "util/xmlconfig.h"
+@@ -219,6 +220,30 @@ wsi_x11_detect_xwayland(xcb_connection_t *conn,
+    return is_xwayland;
+ }
+ 
++static unsigned
++gamescope_swapchain_override()
++{
++   const char *path = getenv("GAMESCOPE_LIMITER_FILE");
++   if (!path)
++      return 0;
++
++   static simple_mtx_t mtx = SIMPLE_MTX_INITIALIZER;
++   static int fd = -1;
++
++   simple_mtx_lock(&mtx);
++   if (fd < 0) {
++      fd = open(path, O_RDONLY);
++   }
++   simple_mtx_unlock(&mtx);
++
++   if (fd < 0)
++      return 0;
++
++   uint32_t override_value = 0;
++   pread(fd, &override_value, sizeof(override_value), 0);
++   return override_value;
++}
++
+ static struct wsi_x11_connection *
+ wsi_x11_connection_create(struct wsi_device *wsi_dev,
+                           xcb_connection_t *conn)
+@@ -1107,6 +1132,8 @@ struct x11_swapchain {
+    /* Total number of images returned to application in AcquireNextImage. */
+    uint64_t                                     present_poll_acquire_count;
+ 
++   VkPresentModeKHR                             orig_present_mode;
++
+    struct x11_image                             images[0];
+ };
+ VK_DEFINE_NONDISP_HANDLE_CASTS(x11_swapchain, base.base, VkSwapchainKHR,
+@@ -1857,6 +1884,12 @@ x11_queue_present(struct wsi_swapchain *anv_chain,
+    if (chain->status < 0)
+       return chain->status;
+ 
++   unsigned gamescope_override = gamescope_swapchain_override();
++   if ((gamescope_override == 1 && chain->base.present_mode != VK_PRESENT_MODE_FIFO_KHR) ||
++       (gamescope_override != 1 && chain->base.present_mode != chain->orig_present_mode)) {
++      return x11_swapchain_result(chain, VK_ERROR_OUT_OF_DATE_KHR);
++   }
++
+    if (damage && damage->pRectangles && damage->rectangleCount > 0 &&
+       damage->rectangleCount <= MAX_DAMAGE_RECTS) {
+       xcb_rectangle_t rects[MAX_DAMAGE_RECTS];
+@@ -2615,6 +2648,10 @@ x11_surface_create_swapchain(VkIcdSurfaceBase *icd_surface,
+    xcb_void_cookie_t cookie;
+    VkResult result;
+    VkPresentModeKHR present_mode = wsi_swapchain_get_present_mode(wsi_device, pCreateInfo);
++   VkPresentModeKHR orig_present_mode = present_mode;
++
++   if (gamescope_swapchain_override() == 1)
++      present_mode = VK_PRESENT_MODE_FIFO_KHR;
+ 
+    assert(pCreateInfo->sType == VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR);
+ 
+@@ -2727,6 +2764,7 @@ x11_surface_create_swapchain(VkIcdSurfaceBase *icd_surface,
+    chain->base.wait_for_present = x11_wait_for_present;
+    chain->base.release_images = x11_release_images;
+    chain->base.present_mode = present_mode;
++   chain->orig_present_mode = orig_present_mode;
+    chain->base.image_count = num_images;
+    chain->conn = conn;
+    chain->window = window;
+-- 
+2.42.0
+
+
+From f00348f08f42a1ce3be4e71f9fba186fb629c723 Mon Sep 17 00:00:00 2001
+From: Friedrich Vock <friedrich.vock@gmx.de>
+Date: Fri, 1 Dec 2023 15:18:44 +0100
+Subject: [PATCH 7/7] radv: Enable compute dispatch tunneling
+
+Compute tunneling can considerably lower the latency of high-priority
+compute work. Enabling it is beneficial in cases where high-priority
+work is dispatched while the GPU is already busy with other work (e.g.
+rendering on GFX). This is the case in VR compositors that dispatch
+latency-sensitive compositing work to ACE while GFX is busy rendering
+the next frame.
+---
+ src/amd/vulkan/radv_device.c   | 7 +++++++
+ src/amd/vulkan/si_cmd_buffer.c | 2 ++
+ 2 files changed, 9 insertions(+)
+
+diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
+index 1bf900d073c..db5347dc0be 100644
+--- a/src/amd/vulkan/radv_device.c
++++ b/src/amd/vulkan/radv_device.c
+@@ -969,6 +969,13 @@ radv_CreateDevice(VkPhysicalDevice physicalDevice, const VkDeviceCreateInfo *pCr
+        */
+       device->dispatch_initiator |= S_00B800_ORDER_MODE(1);
+    }
++   if (device->physical_device->rad_info.gfx_level >= GFX10) {
++      /* Enable asynchronous compute tunneling. The KMD restricts this feature
++       * to high-priority compute queues, so setting the bit on any other queue
++       * is a no-op. PAL always sets this bit as well.
++       */
++      device->dispatch_initiator |= S_00B800_TUNNEL_ENABLE(1);
++   }
+ 
+    /* Disable partial preemption for task shaders.
+     * The kernel may not support preemption, but PAL always sets this bit,
+diff --git a/src/amd/vulkan/si_cmd_buffer.c b/src/amd/vulkan/si_cmd_buffer.c
+index ecb00d98575..1b5e585ade4 100644
+--- a/src/amd/vulkan/si_cmd_buffer.c
++++ b/src/amd/vulkan/si_cmd_buffer.c
+@@ -113,6 +113,8 @@ si_emit_compute(struct radv_device *device, struct radeon_cmdbuf *cs)
+       radeon_emit(cs, 0); /* R_00B894_COMPUTE_USER_ACCUM_1 */
+       radeon_emit(cs, 0); /* R_00B898_COMPUTE_USER_ACCUM_2 */
+       radeon_emit(cs, 0); /* R_00B89C_COMPUTE_USER_ACCUM_3 */
++
++      radeon_set_sh_reg(cs, R_00B9F4_COMPUTE_DISPATCH_TUNNEL, 0);
+    }
+ 
+    /* This register has been moved to R_00CD20_COMPUTE_MAX_WAVE_ID
+-- 
+2.42.0
+
diff --git a/spec_files/mesa/old/zink-fix-resizable-bar-detection-logic.patch b/spec_files/mesa/old/zink-fix-resizable-bar-detection-logic.patch
new file mode 100644
index 00000000..4a5e916d
--- /dev/null
+++ b/spec_files/mesa/old/zink-fix-resizable-bar-detection-logic.patch
@@ -0,0 +1,39 @@
+From a077c14f150f1c4f670dce381ac2eb548f1a4ac2 Mon Sep 17 00:00:00 2001
+From: Alessandro Astone <ales.astone@gmail.com>
+Date: Wed, 10 Jan 2024 17:24:30 +0100
+Subject: [PATCH] zink: Fix resizable BAR detection logic
+
+This was broken in two ways:
+* When looking for the MAX biggest_ram it was actually comparing
+  a candidate against biggest_vis_ram
+
+* mem_props.memoryTypes[] should be accessed with the memory type
+  index as found in heap_map
+
+Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/10341
+Cc: 23.3 <mesa-stable>
+Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26979>
+---
+ src/gallium/drivers/zink/zink_screen.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c
+index 5a6d17cb4fa3..6697d7ab938c 100644
+--- a/src/gallium/drivers/zink/zink_screen.c
++++ b/src/gallium/drivers/zink/zink_screen.c
+@@ -3258,10 +3258,10 @@ zink_internal_create_screen(const struct pipe_screen_config *config, int64_t dev
+    {
+       uint64_t biggest_vis_vram = 0;
+       for (unsigned i = 0; i < screen->heap_count[ZINK_HEAP_DEVICE_LOCAL_VISIBLE]; i++)
+-         biggest_vis_vram = MAX2(biggest_vis_vram, screen->info.mem_props.memoryHeaps[screen->info.mem_props.memoryTypes[i].heapIndex].size);
++         biggest_vis_vram = MAX2(biggest_vis_vram, screen->info.mem_props.memoryHeaps[screen->info.mem_props.memoryTypes[screen->heap_map[ZINK_HEAP_DEVICE_LOCAL_VISIBLE][i]].heapIndex].size);
+       uint64_t biggest_vram = 0;
+       for (unsigned i = 0; i < screen->heap_count[ZINK_HEAP_DEVICE_LOCAL]; i++)
+-         biggest_vram = MAX2(biggest_vis_vram, screen->info.mem_props.memoryHeaps[screen->info.mem_props.memoryTypes[i].heapIndex].size);
++         biggest_vram = MAX2(biggest_vram, screen->info.mem_props.memoryHeaps[screen->info.mem_props.memoryTypes[screen->heap_map[ZINK_HEAP_DEVICE_LOCAL][i]].heapIndex].size);
+       /* determine if vis vram is roughly equal to total vram */
+       if (biggest_vis_vram > biggest_vram * 0.9)
+          screen->resizable_bar = true;
+-- 
+GitLab
+