fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-06-09 23:08:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Revert "pipe-loader: fallback to zink instead of kmsro for render nodes"

Browse source 
This reverts commit adf18abb40.

Some setups rely on matching kmsro for render nodes (e.g. clients to
wlroot-based compositors).

Backport-to: 26.1
Signed-off-by: Icenowy Zheng <zhengxingda@iscas.ac.cn>
Acked-by: Frank Binns <frank.binns@imgtec.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/41737>
This commit is contained in:
Icenowy Zheng 2026-05-22 01:22:26 +08:00 • committed by Marge Bot
parent e569df0145
commit da11aac770
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c
View file

@ -172,14 +172,10 @@ pipe_loader_drm_probe_fd_nodup(struct pipe_loader_device **dev, int fd, bool zin
if (strcmp(ddev->base.driver_name, "vgem") == 0)
goto fail;
/* kmsro supports lots of drivers, try as a fallback for primary nodes */
if (!ddev->dd && !zink && drmGetNodeTypeFromFd(fd) == DRM_NODE_PRIMARY)
/* kmsro supports lots of drivers, try as a fallback */
if (!ddev->dd && !zink)
ddev->dd = get_driver_descriptor("kmsro");
/* Try zink for unknown render nodes */
if (!ddev->dd && drmGetNodeTypeFromFd(fd) == DRM_NODE_RENDER)
ddev->dd = get_driver_descriptor("zink");
if (!ddev->dd)
goto fail;