From cf4b42606abe3ff22d45402b1e4ba41bf0c86fb1 Mon Sep 17 00:00:00 2001
From: Pete Walter <pwalter@fedoraproject.org>
Date: Thu, 2 Jun 2022 09:14:22 +0100
Subject: [PATCH] Update to 22.1.1

---
 ...-flush-resources-for-kms-swrast-path.patch | 29 -------------------
 mesa.spec                                     |  3 +-
 sources                                       |  2 +-
 3 files changed, 2 insertions(+), 32 deletions(-)
 delete mode 100644 0001-llvmpipe-flush-resources-for-kms-swrast-path.patch

diff --git a/0001-llvmpipe-flush-resources-for-kms-swrast-path.patch b/0001-llvmpipe-flush-resources-for-kms-swrast-path.patch
deleted file mode 100644
index 3aea6e3..0000000
--- a/0001-llvmpipe-flush-resources-for-kms-swrast-path.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 9f3eeb126143a510511789cf8669d8c24b99e086 Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@redhat.com>
-Date: Thu, 26 May 2022 10:54:51 +1000
-Subject: [PATCH] llvmpipe: flush resources for kms swrast path.
-
-The kms_swrast path calls this callback via the dri2 paths,
-not flushing caused artifacts when running inside a VM or on hw
-in weston/gnome-shell.
-
-Fixes: 6bbbe15a783a ("Reinstate: llvmpipe: allow vertex processing and fragment processing in parallel")
----
- src/gallium/drivers/llvmpipe/lp_surface.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/gallium/drivers/llvmpipe/lp_surface.c b/src/gallium/drivers/llvmpipe/lp_surface.c
-index cc97565893d..78a1b06b81d 100644
---- a/src/gallium/drivers/llvmpipe/lp_surface.c
-+++ b/src/gallium/drivers/llvmpipe/lp_surface.c
-@@ -174,6 +174,7 @@ static void lp_blit(struct pipe_context *pipe,
- static void
- lp_flush_resource(struct pipe_context *ctx, struct pipe_resource *resource)
- {
-+   llvmpipe_flush_resource(ctx, resource, 0, true, true, false, "resource");
- }
- 
- 
--- 
-2.35.3
-
diff --git a/mesa.spec b/mesa.spec
index 5c695d7..48c7662 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -52,7 +52,7 @@
 
 Name:           mesa
 Summary:        Mesa graphics libraries
-%global ver 22.1.0
+%global ver 22.1.1
 Version:        %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)}
 Release:        %autorelease
 License:        MIT
@@ -74,7 +74,6 @@ Patch0006: 0004-Revert-nouveau-no-modifier-the-invalid-modifier.patch
 Patch0007: 0005-Revert-nouveau-Use-DRM_FORMAT_MOD_NVIDIA_BLOCK_LINEA.patch
 Patch0008: 0006-Revert-nouveau-Stash-supported-sector-layout-in-scre.patch
 
-Patch0009: 0001-llvmpipe-flush-resources-for-kms-swrast-path.patch
 BuildRequires:  meson >= 0.45
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
diff --git a/sources b/sources
index c7aed43..8f0f1ff 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mesa-22.1.0.tar.xz) = a2a6f6f37d1e63aa5537a2bbdfd8634fafebf7e223099deb0fd96749d6d1880ea692231fe12eb06ade78a5eb483d11d6f9ef746e94fe3fd58b4381d469afa934
+SHA512 (mesa-22.1.1.tar.xz) = 4d4ad8b0e9bd0584635153af809bfbc5dc61e1f6994ae2719a3298b5a6e26dee96d28d151483e258a793313d19c54ca365a58a0849b5238964ae48941f423ae4