40 lines
1.4 KiB
Diff
40 lines
1.4 KiB
Diff
|
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
|
||
|
|
|