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

backend/session: introduce wlr_device_manager

Browse source
This commit is contained in:
Simon Ser 2026-05-24 13:43:09 +02:00
parent 3bd8f29b13
commit e8b81b3d4a
7 changed files with 362 additions and 251 deletions
Download patch file Download diff file Expand all files Collapse all files

10
backend/libinput/backend.c
View file

@ -6,6 +6,7 @@
#include <wlr/backend/session.h> #include <wlr/backend/session.h>
#include <wlr/util/log.h> #include <wlr/util/log.h>
#include "backend/libinput.h" #include "backend/libinput.h"
#include "backend/session/udev.h"
#include "util/env.h" #include "util/env.h"
static struct wlr_libinput_backend *get_libinput_backend_from_backend( static struct wlr_libinput_backend *get_libinput_backend_from_backend(
@ -181,6 +182,13 @@ static void handle_session_destroy(struct wl_listener *listener, void *data) {
} }
struct wlr_backend *wlr_libinput_backend_create(struct wlr_session *session) { struct wlr_backend *wlr_libinput_backend_create(struct wlr_session *session) {
struct wlr_udev_device_manager *device_manager =
wlr_udev_device_manager_try_from_base(session->device_manager);
if (device_manager == NULL) {
wlr_log(WLR_ERROR, "libinput requires an udev device manager");
return NULL;
}
struct wlr_libinput_backend *backend = calloc(1, sizeof(*backend)); struct wlr_libinput_backend *backend = calloc(1, sizeof(*backend));
if (!backend) { if (!backend) {
wlr_log(WLR_ERROR, "Allocation failed: %s", strerror(errno)); wlr_log(WLR_ERROR, "Allocation failed: %s", strerror(errno));
@ -192,7 +200,7 @@ struct wlr_backend *wlr_libinput_backend_create(struct wlr_session *session) {
backend->session = session; backend->session = session;
backend->libinput_context = libinput_udev_create_context(&libinput_impl, backend->libinput_context = libinput_udev_create_context(&libinput_impl,
backend, backend->session->udev); backend, device_manager->udev);
if (!backend->libinput_context) { if (!backend->libinput_context) {
wlr_log(WLR_ERROR, "Failed to create libinput context"); wlr_log(WLR_ERROR, "Failed to create libinput context");
wlr_backend_finish(&backend->backend); wlr_backend_finish(&backend->backend);

2
backend/session/meson.build
View file

@ -12,6 +12,6 @@ if not (udev.found() and libseat.found())
subdir_done() subdir_done()
endif endif
wlr_files += files('session.c') wlr_files += files('session.c', 'udev.c')
wlr_deps += [udev, libseat] wlr_deps += [udev, libseat]
features += { 'session': true } features += { 'session': true }

273
backend/session/session.c
View file

@ -1,5 +1,5 @@
#include <assert.h> #include <assert.h>
#include <libudev.h> #include <libseat.h>
#include <stdarg.h> #include <stdarg.h>
#include <stddef.h> #include <stddef.h>
#include <stdlib.h> #include <stdlib.h>
@ -15,12 +15,43 @@
#include <xf86drm.h> #include <xf86drm.h>
#include <xf86drmMode.h> #include <xf86drmMode.h>
#include "backend/session/session.h" #include "backend/session/session.h"
#include "backend/session/udev.h"
#include "util/time.h" #include "util/time.h"
#include <libseat.h>
#define WAIT_GPU_TIMEOUT 10000 // ms #define WAIT_GPU_TIMEOUT 10000 // ms
struct wlr_device *session_find_device_by_devid(struct wlr_session *session, dev_t devid) {
struct wlr_device *dev;
wl_list_for_each(dev, &session->devices, link) {
if (dev->dev == devid) {
return dev;
}
}
return NULL;
}
void wlr_device_manager_init(struct wlr_device_manager *manager,
const struct wlr_device_manager_impl *impl, struct wlr_session *session) {
assert(impl && impl->destroy && impl->find_drm_cards);
*manager = (struct wlr_device_manager){
.session = session,
.impl = impl,
};
}
void wlr_device_manager_finish(struct wlr_device_manager *manager) {
// No-op
}
static void device_manager_destroy(struct wlr_device_manager *manager) {
manager->impl->destroy(manager);
}
static ssize_t device_manager_find_drm_cards(struct wlr_device_manager *manager,
size_t ret_cap, struct wlr_device **ret) {
return manager->impl->find_drm_cards(manager, ret_cap, ret);
}
static void handle_enable_seat(struct libseat *seat, void *data) { static void handle_enable_seat(struct libseat *seat, void *data) {
struct wlr_session *session = data; struct wlr_session *session = data;
session->active = true; session->active = true;
@ -133,115 +164,6 @@ static void libseat_session_finish(struct wlr_session *session) {
session->libseat_event = NULL; session->libseat_event = NULL;
} }
static bool is_drm_card(const char *sysname) {
const char prefix[] = DRM_PRIMARY_MINOR_NAME;
if (strncmp(sysname, prefix, strlen(prefix)) != 0) {
return false;
}
for (size_t i = strlen(prefix); sysname[i] != '\0'; i++) {
if (sysname[i] < '0' || sysname[i] > '9') {
return false;
}
}
return true;
}
static void read_udev_change_event(struct wlr_device_change_event *event,
struct udev_device *udev_dev) {
const char *hotplug = udev_device_get_property_value(udev_dev, "HOTPLUG");
if (hotplug != NULL && strcmp(hotplug, "1") == 0) {
event->type = WLR_DEVICE_HOTPLUG;
struct wlr_device_hotplug_event *hotplug = &event->hotplug;
const char *connector =
udev_device_get_property_value(udev_dev, "CONNECTOR");
if (connector != NULL) {
hotplug->connector_id = strtoul(connector, NULL, 10);
}
const char *prop =
udev_device_get_property_value(udev_dev, "PROPERTY");
if (prop != NULL) {
hotplug->prop_id = strtoul(prop, NULL, 10);
}
return;
}
const char *lease = udev_device_get_property_value(udev_dev, "LEASE");
if (lease != NULL && strcmp(lease, "1") == 0) {
event->type = WLR_DEVICE_LEASE;
return;
}
}
static int handle_udev_event(int fd, uint32_t mask, void *data) {
struct wlr_session *session = data;
struct udev_device *udev_dev = udev_monitor_receive_device(session->mon);
if (!udev_dev) {
return 1;
}
const char *sysname = udev_device_get_sysname(udev_dev);
const char *devnode = udev_device_get_devnode(udev_dev);
const char *action = udev_device_get_action(udev_dev);
wlr_log(WLR_DEBUG, "udev event for %s (%s)", sysname, action);
if (!is_drm_card(sysname) || !action || !devnode) {
goto out;
}
const char *seat = udev_device_get_property_value(udev_dev, "ID_SEAT");
if (!seat) {
seat = "seat0";
}
if (session->seat[0] != '\0' && strcmp(session->seat, seat) != 0) {
goto out;
}
dev_t devnum = udev_device_get_devnum(udev_dev);
if (strcmp(action, "add") == 0) {
struct wlr_device *dev;
wl_list_for_each(dev, &session->devices, link) {
if (dev->dev == devnum) {
wlr_log(WLR_DEBUG, "Skipping duplicate device %s", sysname);
goto out;
}
}
wlr_log(WLR_DEBUG, "DRM device %s added", sysname);
struct wlr_session_add_event event = {
.path = devnode,
};
wl_signal_emit_mutable(&session->events.add_drm_card, &event);
} else if (strcmp(action, "change") == 0) {
struct wlr_device *dev;
wl_list_for_each(dev, &session->devices, link) {
if (dev->dev == devnum) {
wlr_log(WLR_DEBUG, "DRM device %s changed", sysname);
struct wlr_device_change_event event = {0};
read_udev_change_event(&event, udev_dev);
wl_signal_emit_mutable(&dev->events.change, &event);
break;
}
}
} else if (strcmp(action, "remove") == 0) {
struct wlr_device *dev;
wl_list_for_each(dev, &session->devices, link) {
if (dev->dev == devnum) {
wlr_log(WLR_DEBUG, "DRM device %s removed", sysname);
wl_signal_emit_mutable(&dev->events.remove, NULL);
break;
}
}
}
out:
udev_device_unref(udev_dev);
return 1;
}
static void handle_event_loop_destroy(struct wl_listener *listener, void *data) { static void handle_event_loop_destroy(struct wl_listener *listener, void *data) {
struct wlr_session *session = struct wlr_session *session =
wl_container_of(listener, session, event_loop_destroy); wl_container_of(listener, session, event_loop_destroy);
@ -266,39 +188,17 @@ struct wlr_session *wlr_session_create(struct wl_event_loop *event_loop) {
goto error_open; goto error_open;
} }
session->udev = udev_new(); session->device_manager = wlr_udev_device_manager_create(session);
if (!session->udev) { if (session->device_manager == NULL) {
wlr_log_errno(WLR_ERROR, "Failed to create udev context"); wlr_log(WLR_ERROR, "Failed to create udev device manager");
goto error_session; goto error_session;
} }
session->mon = udev_monitor_new_from_netlink(session->udev, "udev");
if (!session->mon) {
wlr_log_errno(WLR_ERROR, "Failed to create udev monitor");
goto error_udev;
}
udev_monitor_filter_add_match_subsystem_devtype(session->mon, "drm", NULL);
udev_monitor_enable_receiving(session->mon);
int fd = udev_monitor_get_fd(session->mon);
session->udev_event = wl_event_loop_add_fd(event_loop, fd,
WL_EVENT_READABLE, handle_udev_event, session);
if (!session->udev_event) {
wlr_log_errno(WLR_ERROR, "Failed to create udev event source");
goto error_mon;
}
session->event_loop_destroy.notify = handle_event_loop_destroy; session->event_loop_destroy.notify = handle_event_loop_destroy;
wl_event_loop_add_destroy_listener(event_loop, &session->event_loop_destroy); wl_event_loop_add_destroy_listener(event_loop, &session->event_loop_destroy);
return session; return session;
error_mon:
udev_monitor_unref(session->mon);
error_udev:
udev_unref(session->udev);
error_session: error_session:
libseat_session_finish(session); libseat_session_finish(session);
error_open: error_open:
@ -319,9 +219,7 @@ void wlr_session_destroy(struct wlr_session *session) {
wl_list_remove(&session->event_loop_destroy.link); wl_list_remove(&session->event_loop_destroy.link);
wl_event_source_remove(session->udev_event); device_manager_destroy(session->device_manager);
udev_monitor_unref(session->mon);
udev_unref(session->udev);
struct wlr_device *dev, *tmp_dev; struct wlr_device *dev, *tmp_dev;
wl_list_for_each_safe(dev, tmp_dev, &session->devices, link) { wl_list_for_each_safe(dev, tmp_dev, &session->devices, link) {
@ -443,25 +341,6 @@ static ssize_t explicit_find_gpus(struct wlr_session *session,
return i; return i;
} }
static struct udev_enumerate *enumerate_drm_cards(struct udev *udev) {
struct udev_enumerate *en = udev_enumerate_new(udev);
if (!en) {
wlr_log(WLR_ERROR, "udev_enumerate_new failed");
return NULL;
}
udev_enumerate_add_match_subsystem(en, "drm");
udev_enumerate_add_match_sysname(en, DRM_PRIMARY_MINOR_NAME "[0-9]*");
if (udev_enumerate_scan_devices(en) != 0) {
wlr_log(WLR_ERROR, "udev_enumerate_scan_devices failed");
udev_enumerate_unref(en);
return NULL;
}
return en;
}
struct find_gpus_add_handler { struct find_gpus_add_handler {
bool added; bool added;
struct wl_listener listener; struct wl_listener listener;
@ -481,14 +360,11 @@ ssize_t wlr_session_find_gpus(struct wlr_session *session,
return explicit_find_gpus(session, ret_len, ret, explicit); return explicit_find_gpus(session, ret_len, ret, explicit);
} }
struct udev_enumerate *en = enumerate_drm_cards(session->udev); ssize_t n = device_manager_find_drm_cards(session->device_manager, ret_len, ret);
if (!en) { if (n != 0) {
return -1; return n;
} }
if (udev_enumerate_get_list_entry(en) == NULL) {
udev_enumerate_unref(en);
en = NULL;
wlr_log(WLR_INFO, "Waiting for a KMS device"); wlr_log(WLR_INFO, "Waiting for a KMS device");
struct find_gpus_add_handler handler = {0}; struct find_gpus_add_handler handler = {0};
@ -514,70 +390,5 @@ ssize_t wlr_session_find_gpus(struct wlr_session *session,
wl_list_remove(&handler.listener.link); wl_list_remove(&handler.listener.link);
en = enumerate_drm_cards(session->udev); return device_manager_find_drm_cards(session->device_manager, ret_len, ret);
if (!en) {
return -1;
}
}
struct udev_list_entry *entry;
size_t i = 0;
udev_list_entry_foreach(entry, udev_enumerate_get_list_entry(en)) {
if (i == ret_len) {
break;
}
const char *path = udev_list_entry_get_name(entry);
struct udev_device *dev = udev_device_new_from_syspath(session->udev, path);
if (!dev) {
continue;
}
const char *seat = udev_device_get_property_value(dev, "ID_SEAT");
if (!seat) {
seat = "seat0";
}
if (session->seat[0] && strcmp(session->seat, seat) != 0) {
udev_device_unref(dev);
continue;
}
bool is_primary = false;
const char *boot_display = udev_device_get_sysattr_value(dev, "boot_display");
if (boot_display && strcmp(boot_display, "1") == 0) {
is_primary = true;
} else {
// This is owned by 'dev', so we don't need to free it
struct udev_device *pci =
udev_device_get_parent_with_subsystem_devtype(dev, "pci", NULL);
if (pci) {
const char *id = udev_device_get_sysattr_value(pci, "boot_vga");
if (id && strcmp(id, "1") == 0) {
is_primary = true;
}
}
}
struct wlr_device *wlr_dev =
session_open_if_kms(session, udev_device_get_devnode(dev));
udev_device_unref(dev);
if (!wlr_dev) {
continue;
}
ret[i] = wlr_dev;
if (is_primary) {
struct wlr_device *tmp = ret[0];
ret[0] = ret[i];
ret[i] = tmp;
}
++i;
}
udev_enumerate_unref(en);
return i;
} }

259
backend/session/udev.c Normal file
View file

@ -0,0 +1,259 @@
#include <libudev.h>
#include <stdlib.h>
#include <wayland-server-core.h>
#include <wlr/backend/session.h>
#include <wlr/util/log.h>
#include <xf86drm.h>
#include "backend/session/session.h"
#include "backend/session/udev.h"
static struct udev_enumerate *enumerate_drm_cards(struct udev *udev) {
struct udev_enumerate *en = udev_enumerate_new(udev);
if (!en) {
wlr_log(WLR_ERROR, "udev_enumerate_new failed");
return NULL;
}
udev_enumerate_add_match_subsystem(en, "drm");
udev_enumerate_add_match_sysname(en, DRM_PRIMARY_MINOR_NAME "[0-9]*");
if (udev_enumerate_scan_devices(en) != 0) {
wlr_log(WLR_ERROR, "udev_enumerate_scan_devices failed");
udev_enumerate_unref(en);
return NULL;
}
return en;
}
static ssize_t manager_find_drm_cards(struct wlr_device_manager *base,
size_t ret_cap, struct wlr_device **ret) {
struct wlr_udev_device_manager *manager = wl_container_of(base, manager, base);
struct wlr_session *session = manager->base.session;
struct udev_enumerate *en = enumerate_drm_cards(manager->udev);
if (!en) {
return -1;
}
struct udev_list_entry *entry;
size_t i = 0;
udev_list_entry_foreach(entry, udev_enumerate_get_list_entry(en)) {
if (i == ret_cap) {
break;
}
const char *path = udev_list_entry_get_name(entry);
struct udev_device *dev = udev_device_new_from_syspath(manager->udev, path);
if (!dev) {
continue;
}
const char *seat = udev_device_get_property_value(dev, "ID_SEAT");
if (!seat) {
seat = "seat0";
}
if (session->seat[0] && strcmp(session->seat, seat) != 0) {
udev_device_unref(dev);
continue;
}
bool is_primary = false;
const char *boot_display = udev_device_get_sysattr_value(dev, "boot_display");
if (boot_display && strcmp(boot_display, "1") == 0) {
is_primary = true;
} else {
// This is owned by 'dev', so we don't need to free it
struct udev_device *pci =
udev_device_get_parent_with_subsystem_devtype(dev, "pci", NULL);
if (pci) {
const char *id = udev_device_get_sysattr_value(pci, "boot_vga");
if (id && strcmp(id, "1") == 0) {
is_primary = true;
}
}
}
struct wlr_device *wlr_dev =
session_open_if_kms(session, udev_device_get_devnode(dev));
udev_device_unref(dev);
if (!wlr_dev) {
continue;
}
ret[i] = wlr_dev;
if (is_primary) {
struct wlr_device *tmp = ret[0];
ret[0] = ret[i];
ret[i] = tmp;
}
++i;
}
udev_enumerate_unref(en);
return i;
}
static void manager_destroy(struct wlr_device_manager *base) {
struct wlr_udev_device_manager *manager = wl_container_of(base, manager, base);
wl_event_source_remove(manager->udev_event);
udev_monitor_unref(manager->mon);
udev_unref(manager->udev);
free(manager);
}
static const struct wlr_device_manager_impl manager_impl = {
.destroy = manager_destroy,
.find_drm_cards = manager_find_drm_cards,
};
static bool is_drm_card(const char *sysname) {
const char prefix[] = DRM_PRIMARY_MINOR_NAME;
if (strncmp(sysname, prefix, strlen(prefix)) != 0) {
return false;
}
for (size_t i = strlen(prefix); sysname[i] != '\0'; i++) {
if (sysname[i] < '0' || sysname[i] > '9') {
return false;
}
}
return true;
}
static void read_udev_change_event(struct wlr_device_change_event *event,
struct udev_device *udev_dev) {
const char *hotplug = udev_device_get_property_value(udev_dev, "HOTPLUG");
if (hotplug != NULL && strcmp(hotplug, "1") == 0) {
event->type = WLR_DEVICE_HOTPLUG;
struct wlr_device_hotplug_event *hotplug = &event->hotplug;
const char *connector =
udev_device_get_property_value(udev_dev, "CONNECTOR");
if (connector != NULL) {
hotplug->connector_id = strtoul(connector, NULL, 10);
}
const char *prop =
udev_device_get_property_value(udev_dev, "PROPERTY");
if (prop != NULL) {
hotplug->prop_id = strtoul(prop, NULL, 10);
}
return;
}
const char *lease = udev_device_get_property_value(udev_dev, "LEASE");
if (lease != NULL && strcmp(lease, "1") == 0) {
event->type = WLR_DEVICE_LEASE;
return;
}
}
static int handle_udev_event(int fd, uint32_t mask, void *data) {
struct wlr_udev_device_manager *manager = data;
struct wlr_session *session = manager->base.session;
struct udev_device *udev_dev = udev_monitor_receive_device(manager->mon);
if (!udev_dev) {
return 1;
}
const char *sysname = udev_device_get_sysname(udev_dev);
const char *devnode = udev_device_get_devnode(udev_dev);
const char *action = udev_device_get_action(udev_dev);
wlr_log(WLR_DEBUG, "udev event for %s (%s)", sysname, action);
if (!is_drm_card(sysname) || !action || !devnode) {
goto out;
}
const char *seat = udev_device_get_property_value(udev_dev, "ID_SEAT");
if (!seat) {
seat = "seat0";
}
if (session->seat[0] != '\0' && strcmp(session->seat, seat) != 0) {
goto out;
}
dev_t devnum = udev_device_get_devnum(udev_dev);
struct wlr_device *dev = session_find_device_by_devid(session, devnum);
if (strcmp(action, "add") == 0) {
if (dev != NULL) {
wlr_log(WLR_DEBUG, "Skipping duplicate device %s", sysname);
goto out;
}
wlr_log(WLR_DEBUG, "DRM device %s added", sysname);
struct wlr_session_add_event event = {
.path = devnode,
};
wl_signal_emit_mutable(&session->events.add_drm_card, &event);
} else if (strcmp(action, "change") == 0 && dev != NULL) {
wlr_log(WLR_DEBUG, "DRM device %s changed", sysname);
struct wlr_device_change_event event = {0};
read_udev_change_event(&event, udev_dev);
wl_signal_emit_mutable(&dev->events.change, &event);
} else if (strcmp(action, "remove") == 0 && dev != NULL) {
wlr_log(WLR_DEBUG, "DRM device %s removed", sysname);
wl_signal_emit_mutable(&dev->events.remove, NULL);
}
out:
udev_device_unref(udev_dev);
return 1;
}
struct wlr_device_manager *wlr_udev_device_manager_create(struct wlr_session *session) {
struct wlr_udev_device_manager *manager = calloc(1, sizeof(*manager));
if (manager == NULL) {
return NULL;
}
wlr_device_manager_init(&manager->base, &manager_impl, session);
manager->udev = udev_new();
if (!manager->udev) {
wlr_log_errno(WLR_ERROR, "Failed to create udev context");
goto error_manager;
}
manager->mon = udev_monitor_new_from_netlink(manager->udev, "udev");
if (!manager->mon) {
wlr_log_errno(WLR_ERROR, "Failed to create udev monitor");
goto error_udev;
}
udev_monitor_filter_add_match_subsystem_devtype(manager->mon, "drm", NULL);
udev_monitor_enable_receiving(manager->mon);
int fd = udev_monitor_get_fd(manager->mon);
manager->udev_event = wl_event_loop_add_fd(session->event_loop, fd,
WL_EVENT_READABLE, handle_udev_event, manager);
if (!manager->udev_event) {
wlr_log_errno(WLR_ERROR, "Failed to create udev event source");
goto error_mon;
}
return &manager->base;
error_mon:
udev_monitor_unref(manager->mon);
error_udev:
udev_unref(manager->udev);
error_manager:
free(manager);
return NULL;
}
struct wlr_udev_device_manager *wlr_udev_device_manager_try_from_base(struct wlr_device_manager *base) {
if (base->impl != &manager_impl) {
return NULL;
}
struct wlr_udev_device_manager *manager = wl_container_of(base, manager, base);
return manager;
}

18
include/backend/session/session.h
View file

@ -2,6 +2,7 @@
#define BACKEND_SESSION_SESSION_H #define BACKEND_SESSION_SESSION_H
#include <stdbool.h> #include <stdbool.h>
#include <sys/types.h>
struct wl_display; struct wl_display;
struct wlr_session; struct wlr_session;
@ -16,5 +17,22 @@ void session_init(struct wlr_session *session);
struct wlr_device *session_open_if_kms(struct wlr_session *restrict session, struct wlr_device *session_open_if_kms(struct wlr_session *restrict session,
const char *restrict path); const char *restrict path);
struct wlr_device *session_find_device_by_devid(struct wlr_session *session, dev_t devid);
struct wlr_device_manager {
struct wlr_session *session;
const struct wlr_device_manager_impl *impl;
};
struct wlr_device_manager_impl {
void (*destroy)(struct wlr_device_manager *manager);
ssize_t (*find_drm_cards)(struct wlr_device_manager *manager,
size_t ret_cap, struct wlr_device **ret);
};
void wlr_device_manager_init(struct wlr_device_manager *manager,
const struct wlr_device_manager_impl *impl, struct wlr_session *session);
void wlr_device_manager_finish(struct wlr_device_manager *manager);
#endif #endif

17
include/backend/session/udev.h Normal file
View file

@ -0,0 +1,17 @@
#ifndef BACKEND_SESSION_UDEV_H
#define BACKEND_SESSION_UDEV_H
#include "backend/session/session.h"
struct wlr_udev_device_manager {
struct wlr_device_manager base;
struct udev *udev;
struct udev_monitor *mon;
struct wl_event_source *udev_event;
};
struct wlr_device_manager *wlr_udev_device_manager_create(struct wlr_session *session);
struct wlr_udev_device_manager *wlr_udev_device_manager_try_from_base(struct wlr_device_manager *base);
#endif

4
include/wlr/backend/session.h
View file

@ -45,9 +45,7 @@ struct wlr_session {
char seat[256]; char seat[256];
struct udev *udev; struct wlr_device_manager *device_manager;
struct udev_monitor *mon;
struct wl_event_source *udev_event;
struct libseat *seat_handle; struct libseat *seat_handle;
struct wl_event_source *libseat_event; struct wl_event_source *libseat_event;