fdo-mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2026-05-09 09:28:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '260427' into 'master'

Browse source 
backend/session: fix wlr_device remove

See merge request wlroots/wlroots!5359
This commit is contained in:
Liu Peng 2026-05-08 23:13:16 +08:00
commit f5550f63dd
3 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
backend/drm/backend.c
View file

@ -65,7 +65,9 @@ static void backend_destroy(struct wlr_backend *backend) {
}
free(drm->name);
wlr_session_close_file(drm->session, drm->dev);
if (drm->dev) {
wlr_session_close_file(drm->session, drm->dev);
}
wl_event_source_remove(drm->drm_event);
free(drm);
}
@ -152,6 +154,7 @@ static void handle_dev_remove(struct wl_listener *listener, void *data) {
struct wlr_drm_backend *drm = wl_container_of(listener, drm, dev_remove);
wlr_log(WLR_INFO, "Destroying DRM backend for %s", drm->name);
drm->dev = NULL;
backend_destroy(&drm->backend);
}

15
backend/session/session.c
View file

@ -227,11 +227,11 @@ static int handle_udev_event(int fd, uint32_t mask, void *data) {
}
}
} else if (strcmp(action, "remove") == 0) {
struct wlr_device *dev;
wl_list_for_each(dev, &session->devices, link) {
struct wlr_device *dev, *tmp;
wl_list_for_each_safe(dev, tmp, &session->devices, link) {
if (dev->dev == devnum) {
wlr_log(WLR_DEBUG, "DRM device %s removed", sysname);
wl_signal_emit_mutable(&dev->events.remove, NULL);
wlr_session_close_file(session, dev);
break;
}
}
@ -375,11 +375,10 @@ void wlr_session_close_file(struct wlr_session *session,
wlr_log_errno(WLR_ERROR, "Failed to close device %d", dev->device_id);
}
wl_signal_emit_mutable(&dev->events.remove, NULL);
assert(wl_list_empty(&dev->events.change.listener_list));
// TODO: assert that the "remove" listener list is empty as well. Listeners
// will typically call wlr_session_close_file() in response, and
// wl_signal_emit_mutable() installs two phantom listeners, so we'd count
// these two.
assert(wl_list_empty(&dev->events.remove.listener_list));
close(dev->fd);
wl_list_remove(&dev->link);
@ -546,7 +545,7 @@ ssize_t wlr_session_find_gpus(struct wlr_session *session,
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;
is_primary = true;
} else {
// This is owned by 'dev', so we don't need to free it
struct udev_device *pci =

6
types/wlr_cursor_shape_v1.c
View file

@ -135,10 +135,10 @@ static void create_device(struct wl_resource *manager_resource, uint32_t id,
wl_signal_add(&seat_client->events.destroy, &device->seat_client_destroy);
if (tablet_tool != NULL) {
device->tablet_tool_destroy.notify = device_handle_tablet_tool_destroy;
wl_signal_add(&tablet_tool->wlr_tool->events.destroy, &device->tablet_tool_destroy);
device->tablet_tool_destroy.notify = device_handle_tablet_tool_destroy;
wl_signal_add(&tablet_tool->wlr_tool->events.destroy, &device->tablet_tool_destroy);
} else {
wl_list_init(&device->tablet_tool_destroy.link);
wl_list_init(&device->tablet_tool_destroy.link);
}
wl_resource_set_user_data(device_resource, device);