rpms/mesa
7
0
Fork 1
Code Issues Pull Requests Releases Activity

Backport MR #26332 to fix X11 session on VMs

Browse Source 
MR: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26332
Mesa bug: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26332
This commit is contained in:
José Expósito 2023-11-22 13:01:53 +01:00
parent bdefef8468
commit 0c855a11ab
2 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
0001-zink-initialize-drm_fd-to-1.patch Normal file
View File

@ -0,0 +1,39 @@
From a89bf9e86a83005befcdcef47a94fff167bdc47b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= <jexposit@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
Signed-off-by: José Expósito <jexposit@redhat.com>
---
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.42.0

1
mesa.spec
View File

@ -77,6 +77,7 @@ Patch10: gnome-shell-glthread-disable.patch
Patch11: 0001-nir-add-deref-follower-builder-for-casts.patch
Patch12: 0001-zink-Fix-crash-on-zink_create_screen-error-path.patch
Patch13: 0001-zink-allow-software-rendering-only-if-selected.patch
Patch14: 0001-zink-initialize-drm_fd-to-1.patch
BuildRequires: meson >= 1.2.0
BuildRequires: gcc