diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes
index 3d8e6a6..b40593c 100644
--- a/Mesa-drivers.changes
+++ b/Mesa-drivers.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Mar 15 15:49:45 UTC 2018 - msrb@suse.com
+
+- u_st-dri-don-t-set-queryDmaBufFormats-queryDmaBufModif.patch
+  * Fixes laggy mouse in Wayland. (fdo#104926)
+
 -------------------------------------------------------------------
 Thu Mar  1 15:47:35 UTC 2018 - sndirsch@suse.com
 
diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec
index d866307..387123c 100644
--- a/Mesa-drivers.spec
+++ b/Mesa-drivers.spec
@@ -142,6 +142,7 @@ Patch32:        archlinux_glvnd-fix-gl-dot-pc.patch
 Patch43:        u_r600-egd_tables.py-make-the-script-python-2-3-compat.patch
 Patch45:        n_Disable-AMDGPU-GFX9-Vega-on-LLVM-lessthan-6.0.0.patch
 Patch46:        u_glsl-linker-error.patch
+Patch47:        u_st-dri-don-t-set-queryDmaBufFormats-queryDmaBufModif.patch
 
 BuildRequires:  autoconf >= 2.60
 BuildRequires:  automake
@@ -752,6 +753,7 @@ rm -rf docs/README.{VMS,WIN32,OS2}
 %patch43 -p1
 %patch45 -p1
 %patch46 -p1
+%patch47 -p1
 
 # Remove requires to libglvnd/libglvnd-devel from baselibs.conf when
 # disabling libglvnd build; ugly ...
diff --git a/Mesa.changes b/Mesa.changes
index 3d8e6a6..b40593c 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Mar 15 15:49:45 UTC 2018 - msrb@suse.com
+
+- u_st-dri-don-t-set-queryDmaBufFormats-queryDmaBufModif.patch
+  * Fixes laggy mouse in Wayland. (fdo#104926)
+
 -------------------------------------------------------------------
 Thu Mar  1 15:47:35 UTC 2018 - sndirsch@suse.com
 
diff --git a/Mesa.spec b/Mesa.spec
index c17fe8b..510c2b9 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -141,6 +141,7 @@ Patch32:        archlinux_glvnd-fix-gl-dot-pc.patch
 Patch43:        u_r600-egd_tables.py-make-the-script-python-2-3-compat.patch
 Patch45:        n_Disable-AMDGPU-GFX9-Vega-on-LLVM-lessthan-6.0.0.patch
 Patch46:        u_glsl-linker-error.patch
+Patch47:        u_st-dri-don-t-set-queryDmaBufFormats-queryDmaBufModif.patch
 
 BuildRequires:  autoconf >= 2.60
 BuildRequires:  automake
@@ -751,6 +752,7 @@ rm -rf docs/README.{VMS,WIN32,OS2}
 %patch43 -p1
 %patch45 -p1
 %patch46 -p1
+%patch47 -p1
 
 # Remove requires to libglvnd/libglvnd-devel from baselibs.conf when
 # disabling libglvnd build; ugly ...
diff --git a/u_st-dri-don-t-set-queryDmaBufFormats-queryDmaBufModif.patch b/u_st-dri-don-t-set-queryDmaBufFormats-queryDmaBufModif.patch
new file mode 100644
index 0000000..6aa3789
--- /dev/null
+++ b/u_st-dri-don-t-set-queryDmaBufFormats-queryDmaBufModif.patch
@@ -0,0 +1,33 @@
+Author: Michal Srb <msrb@suse.com>
+Subject: st/dri: don't set queryDmaBufFormats/queryDmaBufModifiers if the driver does not implement it
+Patch-mainline: To be upstreamed
+References: fdo#104926
+
+This is equivalent to commit a65db0ad1c3, but for dri_kms_init_screen. Without
+this gbm_dri_is_format_supported always returns false.
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104926
+---
+ src/gallium/state_trackers/dri/dri2.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/gallium/state_trackers/dri/dri2.c b/src/gallium/state_trackers/dri/dri2.c
+index 415002d2cd..59740b1301 100644
+--- a/src/gallium/state_trackers/dri/dri2.c
++++ b/src/gallium/state_trackers/dri/dri2.c
+@@ -2162,8 +2162,10 @@ dri_kms_init_screen(__DRIscreen * sPriv)
+       dri2ImageExtension.createImageFromFds = dri2_from_fds;
+       dri2ImageExtension.createImageFromDmaBufs = dri2_from_dma_bufs;
+       dri2ImageExtension.createImageFromDmaBufs2 = dri2_from_dma_bufs2;
+-      dri2ImageExtension.queryDmaBufFormats = dri2_query_dma_buf_formats;
+-      dri2ImageExtension.queryDmaBufModifiers = dri2_query_dma_buf_modifiers;
++      if (pscreen->query_dmabuf_modifiers) {
++         dri2ImageExtension.queryDmaBufFormats = dri2_query_dma_buf_formats;
++         dri2ImageExtension.queryDmaBufModifiers = dri2_query_dma_buf_modifiers;
++      }
+    }
+ 
+    sPriv->extensions = dri_screen_extensions;
+-- 
+2.13.6
+