Timo Aaltonen pushed to branch debian-experimental at X Strike Force / lib /
mesa
Commits:
cc261db1 by Timo Aaltonen at 2023-12-08T08:59:18+02:00
control: Add libvulkan1 to libgl1-mesa-dri Depends where zink is built, since
it's loading libvulkan.so.1 directly instead of linking to it.
- - - - -
0cffce84 by Timo Aaltonen at 2023-12-08T09:23:11+02:00
0001-zink-initialize-drm_fd-to-1.patch: Fix GDM startup with the X11 backend.
- - - - -
d3e8ab0f by Timo Aaltonen at 2023-12-08T09:25:29+02:00
release to experimental
- - - - -
5 changed files:
- debian/changelog
- debian/control
- debian/control.in
- + debian/patches/0001-zink-initialize-drm_fd-to-1.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+mesa (23.3.0-2) experimental; urgency=medium
+
+ * control: Add libvulkan1 to libgl1-mesa-dri Depends where zink is
+ built, since it's loading libvulkan.so.1 directly instead of linking
+ to it.
+ * 0001-zink-initialize-drm_fd-to-1.patch: Fix GDM startup with the X11
+ backend.
+
+ -- Timo Aaltonen <tjaal...@debian.org> Fri, 08 Dec 2023 09:23:13 +0200
+
mesa (23.3.0-1) experimental; urgency=medium
* New upstream release.
=====================================
debian/control
=====================================
@@ -243,6 +243,7 @@ Section: libs
Architecture: any
Pre-Depends: ${misc:Pre-Depends}
Depends:
+ libvulkan1 [amd64 arm64 armel armhf i386 mips64el powerpc ppc64 ppc64el
riscv64 s390x sparc64 x32],
${shlibs:Depends},
${misc:Depends}
Multi-Arch: same
=====================================
debian/control.in
=====================================
@@ -243,6 +243,7 @@ Section: libs
Architecture: any
Pre-Depends: ${misc:Pre-Depends}
Depends:
+ libvulkan1 [@LLVM_ARCHS@],
${shlibs:Depends},
${misc:Depends}
Multi-Arch: same
=====================================
debian/patches/0001-zink-initialize-drm_fd-to-1.patch
=====================================
@@ -0,0 +1,42 @@
+From fff3fc45a0125b408ca8d4dbd48e5633d63ccc5a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= <jexpo...@redhat.com>
+Date: Wed, 22 Nov 2023 12:48:47 +0100
+Subject: [PATCH] zink: initialize drm_fd to -1
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The `zink_internal_create_screen()` function initializes
+`screen->drm_fd` to 0, a valid file descriptor value, via `rzalloc`.
+
+If an error is found during initialization, the `zink_destroy_screen()`
+function is invoked in the `fail` label and the `screen->drm_fd` is
+closed because its value is 0 and `screen->drm_fd != -1` is checked.
+
+Initialize `screen->drm_fd` to -1 to avoid this issue.
+
+Resolves: https://gitlab.freedesktop.org/mesa/mesa/-/issues/10191
+Reviewed-by: Erik Faye-Lund <erik.faye-l...@collabora.com>
+Reviewed-by: Michel Dänzer <mdaen...@redhat.com>
+Signed-off-by: José Expósito <jexpo...@redhat.com>
+Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26332>
+---
+ src/gallium/drivers/zink/zink_screen.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/gallium/drivers/zink/zink_screen.c
b/src/gallium/drivers/zink/zink_screen.c
+index 50168d8daa1..f42f340657b 100644
+--- a/src/gallium/drivers/zink/zink_screen.c
++++ b/src/gallium/drivers/zink/zink_screen.c
+@@ -3126,6 +3126,8 @@ zink_internal_create_screen(const struct
pipe_screen_config *config, int64_t dev
+ return NULL;
+ }
+
++ screen->drm_fd = -1;
++
+ glsl_type_singleton_init_or_ref();
+ zink_debug = debug_get_option_zink_debug();
+ if (zink_descriptor_mode == ZINK_DESCRIPTOR_MODE_AUTO)
+--
+2.40.1
+
=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
07_gallium-fix-build-failure-on-powerpcspe.diff
path_max.diff
src_glx_dri_common.h.diff
+0001-zink-initialize-drm_fd-to-1.patch
View it on GitLab:
https://salsa.debian.org/xorg-team/lib/mesa/-/compare/2578ae43f222e041a8e621aa791e4cf1f2442e50...d3e8ab0fa61fd7558a0c97ceec0c0140da264f45
--
View it on GitLab:
https://salsa.debian.org/xorg-team/lib/mesa/-/compare/2578ae43f222e041a8e621aa791e4cf1f2442e50...d3e8ab0fa61fd7558a0c97ceec0c0140da264f45
You're receiving this email because of your account on salsa.debian.org.
