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