From da11aac7706b8e6aaa822033a1705e2a12f3e8a2 Mon Sep 17 00:00:00 2001 From: Icenowy Zheng Date: Fri, 22 May 2026 01:22:26 +0800 Subject: [PATCH] Revert "pipe-loader: fallback to zink instead of kmsro for render nodes" This reverts commit adf18abb4097805c2896e350e06e3a5cad6ec68e. 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 Acked-by: Frank Binns Part-of: --- src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c b/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c index b97c526aedd..54e30948000 100644 --- a/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c +++ b/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c @@ -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;