hyprwm/wlroots-hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/wlroots-hyprland.git synced 2024-11-02 11:55:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

backend/drm: destroy backend on udev remove event

Browse source 
Any use of the DRM FD after the remove event results in a "Permission
denied" error.
This commit is contained in:
Simon Ser 2020-12-27 15:21:07 +01:00
parent 5597776914
commit 9b0e0970f9
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
backend/drm/backend.c
View file

@ -52,6 +52,7 @@ static void backend_destroy(struct wlr_backend *backend) {
wl_list_remove(&drm->session_active.link); wl_list_remove(&drm->session_active.link);
wl_list_remove(&drm->parent_destroy.link); wl_list_remove(&drm->parent_destroy.link);
wl_list_remove(&drm->dev_change.link); wl_list_remove(&drm->dev_change.link);
wl_list_remove(&drm->dev_remove.link);
finish_drm_resources(drm); finish_drm_resources(drm);
finish_drm_renderer(&drm->renderer); finish_drm_renderer(&drm->renderer);
@ -133,6 +134,13 @@ static void handle_dev_change(struct wl_listener *listener, void *data) {
scan_drm_connectors(drm); scan_drm_connectors(drm);
} }
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);
backend_destroy(&drm->backend);
}
static void handle_session_destroy(struct wl_listener *listener, void *data) { static void handle_session_destroy(struct wl_listener *listener, void *data) {
struct wlr_drm_backend *drm = struct wlr_drm_backend *drm =
wl_container_of(listener, drm, session_destroy); wl_container_of(listener, drm, session_destroy);
@ -189,6 +197,9 @@ struct wlr_backend *wlr_drm_backend_create(struct wl_display *display,
drm->dev_change.notify = handle_dev_change; drm->dev_change.notify = handle_dev_change;
wl_signal_add(&dev->events.change, &drm->dev_change); wl_signal_add(&dev->events.change, &drm->dev_change);
drm->dev_remove.notify = handle_dev_remove;
wl_signal_add(&dev->events.remove, &drm->dev_remove);
drm->display = display; drm->display = display;
struct wl_event_loop *event_loop = wl_display_get_event_loop(display); struct wl_event_loop *event_loop = wl_display_get_event_loop(display);

1
include/backend/drm/drm.h
View file

@ -88,6 +88,7 @@ struct wlr_drm_backend {
struct wl_listener session_active; struct wl_listener session_active;
struct wl_listener parent_destroy; struct wl_listener parent_destroy;
struct wl_listener dev_change; struct wl_listener dev_change;
struct wl_listener dev_remove;
struct wl_list fbs; // wlr_drm_fb.link struct wl_list fbs; // wlr_drm_fb.link
struct wl_list outputs; struct wl_list outputs;