mirror of
https://src.fedoraproject.org/rpms/mesa.git
synced 2024-11-24 09:32:42 +00:00
drop zink patch
This commit is contained in:
parent
8c8f9ac1cf
commit
08b93756d5
2 changed files with 0 additions and 40 deletions
|
@ -1,39 +0,0 @@
|
||||||
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
|
|
||||||
|
|
|
@ -74,7 +74,6 @@ Source0: https://archive.mesa3d.org/mesa-%{ver}.tar.xz
|
||||||
Source1: Mesa-MLAA-License-Clarification-Email.txt
|
Source1: Mesa-MLAA-License-Clarification-Email.txt
|
||||||
|
|
||||||
Patch10: gnome-shell-glthread-disable.patch
|
Patch10: gnome-shell-glthread-disable.patch
|
||||||
Patch11: 0001-zink-initialize-drm_fd-to-1.patch
|
|
||||||
|
|
||||||
BuildRequires: meson >= 1.2.0
|
BuildRequires: meson >= 1.2.0
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
|
|
Loading…
Reference in a new issue