aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Ser <contact@emersion.fr>2020-12-27 15:21:07 +0100
committerSimon Ser <contact@emersion.fr>2021-04-27 09:11:44 +0200
commit9b0e0970f9c69636d54b320d98bd23b2814c735b (patch)
tree17e0debd92cbfa0eda752caa97d1dad1dfddc084
parent5597776914d715903f1ac61d02b719941b0ac2b4 (diff)
backend/drm: destroy backend on udev remove event
Any use of the DRM FD after the remove event results in a "Permission denied" error.
-rw-r--r--backend/drm/backend.c11
-rw-r--r--include/backend/drm/drm.h1
2 files changed, 12 insertions, 0 deletions
diff --git a/backend/drm/backend.c b/backend/drm/backend.c
index 25d9995a..3240b375 100644
--- a/backend/drm/backend.c
+++ b/backend/drm/backend.c
@@ -52,6 +52,7 @@ static void backend_destroy(struct wlr_backend *backend) {
wl_list_remove(&drm->session_active.link);
wl_list_remove(&drm->parent_destroy.link);
wl_list_remove(&drm->dev_change.link);
+ wl_list_remove(&drm->dev_remove.link);
finish_drm_resources(drm);
finish_drm_renderer(&drm->renderer);
@@ -133,6 +134,13 @@ static void handle_dev_change(struct wl_listener *listener, void *data) {
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) {
struct wlr_drm_backend *drm =
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;
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;
struct wl_event_loop *event_loop = wl_display_get_event_loop(display);
diff --git a/include/backend/drm/drm.h b/include/backend/drm/drm.h
index 3d1ff121..8604f0b3 100644
--- a/include/backend/drm/drm.h
+++ b/include/backend/drm/drm.h
@@ -88,6 +88,7 @@ struct wlr_drm_backend {
struct wl_listener session_active;
struct wl_listener parent_destroy;
struct wl_listener dev_change;
+ struct wl_listener dev_remove;
struct wl_list fbs; // wlr_drm_fb.link
struct wl_list outputs;