mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2026-02-05 04:06:11 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into 'master'

Browse source 
render: respect WLR_DRM_DEVICES in open_drm_render_node

See merge request wlroots/wlroots!5235
This commit is contained in:
Phyzait Lu 2026-02-01 19:10:00 +00:00
commit adaafd0092
1 changed files with 62 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

72
render/wlr_renderer.c
View file

@ -2,6 +2,7 @@
#include <fcntl.h>
#include <stdbool.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <wlr/backend.h>
#include <wlr/render/interface.h>
@ -113,19 +114,70 @@ static int open_drm_render_node(void) {
}
int fd = -1;
for (int i = 0; i < devices_len; i++) {
drmDevice *dev = devices[i];
if (dev->available_nodes & (1 << DRM_NODE_RENDER)) {
const char *name = dev->nodes[DRM_NODE_RENDER];
wlr_log(WLR_DEBUG, "Opening DRM render node '%s'", name);
fd = open(name, O_RDWR | O_CLOEXEC);
if (fd < 0) {
wlr_log_errno(WLR_ERROR, "Failed to open '%s'", name);
goto out;
const char *drm_devices_env = getenv("WLR_DRM_DEVICES");
if (drm_devices_env) {
char *drm_devices = strdup(drm_devices_env);
if (drm_devices == NULL) {
wlr_log_errno(WLR_ERROR, "Allocation failed");
goto out;
}
char *saveptr;
char *token = strtok_r(drm_devices, ":", &saveptr);
while (token != NULL) {
bool found = false;
for (int i = 0; i < devices_len; i++) {
drmDevice *dev = devices[i];
bool match = false;
for (int j = 0; j < DRM_NODE_MAX; j++) {
if ((dev->available_nodes & (1 << j)) &&
strcmp(dev->nodes[j], token) == 0) {
match = true;
break;
}
}
if (match) {
found = true;
if (!(dev->available_nodes & (1 << DRM_NODE_RENDER))) {
wlr_log(WLR_DEBUG, "Skipping DRM device '%s': no render node", token);
break;
}
const char *name = dev->nodes[DRM_NODE_RENDER];
wlr_log(WLR_DEBUG, "Opening DRM render node '%s' from WLR_DRM_DEVICES", name);
fd = open(name, O_RDWR | O_CLOEXEC);
if (fd < 0) {
wlr_log_errno(WLR_ERROR, "Failed to open '%s'", name);
}
break;
}
}
if (fd >= 0) {
break;
}
if (!found) {
wlr_log(WLR_DEBUG, "DRM device '%s' not found", token);
}
token = strtok_r(NULL, ":", &saveptr);
}
free(drm_devices);
} else {
for (int i = 0; i < devices_len; i++) {
drmDevice *dev = devices[i];
if (dev->available_nodes & (1 << DRM_NODE_RENDER)) {
const char *name = dev->nodes[DRM_NODE_RENDER];
wlr_log(WLR_DEBUG, "Opening DRM render node '%s'", name);
fd = open(name, O_RDWR | O_CLOEXEC);
if (fd < 0) {
wlr_log_errno(WLR_ERROR, "Failed to open '%s'", name);
goto out;
}
break;
}
break;
}
}
if (fd < 0) {
wlr_log(WLR_ERROR, "Failed to find any DRM render node");
}