|
|
1
|
+From 747b170d4643bbc8334b07785916bf6160a0ffbf Mon Sep 17 00:00:00 2001
|
|
|
2
|
+From: Yiwei Zhang <zzyiwei@chromium.org>
|
|
|
3
|
+Date: Sat, 17 May 2025 12:50:28 -0700
|
|
|
4
|
+Subject: [PATCH] kopper: Revert "kopper: Explicitly choose zink"
|
|
|
5
|
+
|
|
|
6
|
+This reverts commit 854bc2ee05f90e426f318352682144050e402d4b.
|
|
|
7
|
+
|
|
|
8
|
+Forcing zink explicitly would get zink-on-lvp picked up over llvmpipe
|
|
|
9
|
+for gbm dri support, which is not intended. Currently, zink_screen's
|
|
|
10
|
+choose_pdev won't be able to reject it when the driver name is explicit.
|
|
|
11
|
+So we have to revert the change first to mitigate regressions.
|
|
|
12
|
+
|
|
|
13
|
+Reported-by: @n3rdopolis @0xnihilo
|
|
|
14
|
+Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/13009
|
|
|
15
|
+Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/13053
|
|
|
16
|
+Fixes: 854bc2ee05f ("kopper: Explicitly choose zink")
|
|
|
17
|
+Acked-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
|
|
|
18
|
+Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35039>
|
|
|
19
|
+(cherry picked from commit e6481d3f42e0cd735fda38fb3029e6f8abf5a0e6)
|
|
|
20
|
+---
|
|
|
21
|
+ src/gallium/frontends/dri/kopper.c | 2 +-
|
|
|
22
|
+ 1 files changed, 1 insertions(+), 1 deletions(-)
|
|
|
23
|
+
|
|
|
24
|
+diff --git a/src/gallium/frontends/dri/kopper.c b/src/gallium/frontends/dri/kopper.c
|
|
|
25
|
+index 54a754c919d..5d84b1b8f98 100644
|
|
|
26
|
+--- a/src/gallium/frontends/dri/kopper.c
|
|
|
27
|
++++ b/src/gallium/frontends/dri/kopper.c
|
|
|
28
|
+@@ -69,7 +69,7 @@ kopper_init_screen(struct dri_screen *screen, bool driver_name_is_inferred)
|
|
|
29
|
+ bool success;
|
|
|
30
|
+ #ifdef HAVE_LIBDRM
|
|
|
31
|
+ if (screen->fd != -1)
|
|
|
32
|
+- success = pipe_loader_drm_probe_fd(&screen->dev, screen->fd, true);
|
|
|
33
|
++ success = pipe_loader_drm_probe_fd(&screen->dev, screen->fd, false);
|
|
|
34
|
+ else
|
|
|
35
|
+ success = pipe_loader_vk_probe_dri(&screen->dev);
|
|
|
36
|
+ #else
|
|
|
37
|
+--
|
|
|
38
|
+2.48.1
|
|
|
39
|
+ |