From 76c030a6da5ba43f5e5eed7af32530a7a4e5d8a9 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Thu, 5 Oct 2023 16:15:25 +0200 Subject: [PATCH] drm: drop split render/display workaround --- types/wlr_drm.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/types/wlr_drm.c b/types/wlr_drm.c index 8a6521a12..cdca0eb14 100644 --- a/types/wlr_drm.c +++ b/types/wlr_drm.c @@ -210,15 +210,13 @@ struct wlr_drm *wlr_drm_create(struct wl_display *display, return NULL; } - char *node_name = NULL; - if (dev->available_nodes & (1 << DRM_NODE_RENDER)) { - node_name = strdup(dev->nodes[DRM_NODE_RENDER]); - } else { - assert(dev->available_nodes & (1 << DRM_NODE_PRIMARY)); - wlr_log(WLR_DEBUG, "No DRM render node available, " - "falling back to primary node '%s'", dev->nodes[DRM_NODE_PRIMARY]); - node_name = strdup(dev->nodes[DRM_NODE_PRIMARY]); + if (!(dev->available_nodes & (1 << DRM_NODE_RENDER))) { + wlr_log(WLR_DEBUG, "No DRM render node available"); + drmFreeDevice(&dev); + return NULL; } + + char *node_name = strdup(dev->nodes[DRM_NODE_RENDER]); drmFreeDevice(&dev); if (node_name == NULL) { return NULL;