Merge branch 'rawhide' into f40

0001-nvk-Only-enable-WSI-modifiers-if-the-extension-is-su.patch

@@ -1,33 +0,0 @@
-From 726838620ebdd890edf481d7821edc0728b1ebe4 Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@redhat.com>
-Date: Thu, 6 Jun 2024 10:26:25 +1000
-Subject: [PATCH] nvk: Only enable WSI modifiers if the extension is supported.
-
-The extension relies on the kernel being new, so don't tell
-wsi about it.
-
-Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/11270
-Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/11166
-Fixes: e6f77defec0d ("nvk/wsi: Advertise modifier support")
-Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29563>
----
- src/nouveau/vulkan/nvk_wsi.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/nouveau/vulkan/nvk_wsi.c b/src/nouveau/vulkan/nvk_wsi.c
-index 6c9c459ad36..11c554721ac 100644
---- a/src/nouveau/vulkan/nvk_wsi.c
-+++ b/src/nouveau/vulkan/nvk_wsi.c
-@@ -29,7 +29,8 @@ nvk_init_wsi(struct nvk_physical_device *pdev)
-       return result;
- 
-    pdev->wsi_device.supports_scanout = false;
--   pdev->wsi_device.supports_modifiers = true;
-+   pdev->wsi_device.supports_modifiers =
-+      pdev->vk.supported_extensions.table.EXT_image_drm_format_modifier;
- 
-    pdev->vk.wsi_device = &pdev->wsi_device;
- 
--- 
-2.45.2
-

fix-llvmpipe-dma-buf.patch

@@ -1,41 +0,0 @@
-From db38a4913ec6fde264facf95077e241c64573b27 Mon Sep 17 00:00:00 2001
-From: Lucas Fryzek <lfryzek@igalia.com>
-Date: Mon, 3 Jun 2024 11:39:27 +0100
-Subject: [PATCH] llvmpipe: query winsys support for dmabuf mapping
-
-Fixes #11257 by ensuring winsys mapping functions is only called
-if its supported by the winsys, which should prevent llvmpipe from
-crashing with kmswast.
-
-If the winsys is kms_swrast then this method will be null, but on
-drisw it will be available.
-
-Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
-Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
-Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29546>
----
- src/gallium/drivers/llvmpipe/lp_texture.c | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/src/gallium/drivers/llvmpipe/lp_texture.c b/src/gallium/drivers/llvmpipe/lp_texture.c
-index 9bad41a983682..6e86a6da06cb6 100644
---- a/src/gallium/drivers/llvmpipe/lp_texture.c
-+++ b/src/gallium/drivers/llvmpipe/lp_texture.c
-@@ -664,7 +664,13 @@ llvmpipe_resource_from_handle(struct pipe_screen *_screen,
- #ifdef HAVE_LINUX_UDMABUF_H
-       struct llvmpipe_memory_fd_alloc *alloc;
-       uint64_t size;
--      if(_screen->import_memory_fd(_screen, whandle->handle, (struct pipe_memory_allocation**)&alloc, &size, true)) {
-+      /* Not all winsys implement displaytarget_create_mapped so we need to check
-+       * that is available (not null).
-+       */
-+      if (winsys->displaytarget_create_mapped &&
-+          _screen->import_memory_fd(_screen, whandle->handle,
-+                                    (struct pipe_memory_allocation**)&alloc,
-+                                    &size, true)) {
-          data = alloc->data;
-          lpr->dt = winsys->displaytarget_create_mapped(winsys, template->bind,
-                                                        template->format, template->width0, template->height0,
--- 
-GitLab
-

mesa.spec

@@ -64,7 +64,7 @@
 
 Name:           mesa
 Summary:        Mesa graphics libraries
-%global ver 24.1.1
+%global ver 24.1.2
 Version:        %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)}
 Release:        %autorelease
 License:        MIT AND BSD-3-Clause AND SGI-B-2.0
@@ -77,8 +77,6 @@ Source0:        https://archive.mesa3d.org/mesa-%{ver}.tar.xz
 Source1:        Mesa-MLAA-License-Clarification-Email.txt
 
 Patch10:        gnome-shell-glthread-disable.patch
-Patch11:        0001-nvk-Only-enable-WSI-modifiers-if-the-extension-is-su.patch
-Patch12:        fix-llvmpipe-dma-buf.patch
 
 BuildRequires:  meson >= 1.3.0
 BuildRequires:  gcc

sources

@@ -1 +1 @@
-SHA512 (mesa-24.1.1.tar.xz) = a23fc2fe479f21027095a7791042148586b23da848474209ca4fecfe5c4d499e66fff0ebfa06d07ed9f16b5d6a2ef755b362cb6079141aff5fdc47cc571e3b1d
+SHA512 (mesa-24.1.2.tar.xz) = ea28540552f9f28200c22423afcf9d9bb961557eae0dc11416c5ef60788c3e7f6d2b841c6bdbe2827d1339ea9d854623c1a0e08d4f1fd79d304fcdd52f790637