compositor-drm: Remove connector_allocator
Remove the last usage of connector_allocator, which was to check for
displays which have been hot-unplugged, and replace it with an array
which doesn't rely on the connector IDs remaining below 32 (or 64).
Signed-off-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Reported-by: Peter Senna Tschudin <peter.senna@collabora.com>
diff --git a/libweston/compositor-drm.c b/libweston/compositor-drm.c
index 99699d7..2a80c6d 100644
--- a/libweston/compositor-drm.c
+++ b/libweston/compositor-drm.c
@@ -94,7 +94,6 @@
char *filename;
} drm;
struct gbm_device *gbm;
- uint32_t connector_allocator;
struct wl_listener session_listener;
uint32_t gbm_format;
@@ -2548,8 +2547,6 @@
if (output->backlight)
backlight_destroy(output->backlight);
- b->connector_allocator &= ~(1 << output->connector_id);
-
free(output);
}
@@ -2625,8 +2622,6 @@
output->disable_pending = 0;
output->original_crtc = NULL;
- b->connector_allocator |= (1 << output->connector_id);
-
weston_output_init(&output->base, b->compositor);
weston_compositor_add_pending_output(&output->base, b->compositor);
@@ -2754,7 +2749,7 @@
drmModeConnector *connector;
drmModeRes *resources;
struct drm_output *output, *next;
- uint32_t connected = 0, disconnects = 0;
+ uint32_t *connected;
int i;
resources = drmModeGetResources(b->drm.fd);
@@ -2763,6 +2758,12 @@
return;
}
+ connected = calloc(resources->count_connectors, sizeof(uint32_t));
+ if (!connected) {
+ drmModeFreeResources(resources);
+ return;
+ }
+
/* collect new connects */
for (i = 0; i < resources->count_connectors; i++) {
uint32_t connector_id = resources->connectors[i];
@@ -2781,7 +2782,7 @@
continue;
}
- connected |= (1 << connector_id);
+ connected[i] = connector_id;
if (drm_output_find_by_connector(b, connector_id)) {
drmModeFreeConnector(connector);
@@ -2792,30 +2793,45 @@
connector, drm_device);
weston_log("connector %d connected\n", connector_id);
}
- drmModeFreeResources(resources);
- disconnects = b->connector_allocator & ~connected;
- if (disconnects) {
- wl_list_for_each_safe(output, next, &b->compositor->output_list,
- base.link) {
- if (disconnects & (1 << output->connector_id)) {
- disconnects &= ~(1 << output->connector_id);
- weston_log("connector %d disconnected\n",
- output->connector_id);
- drm_output_destroy(&output->base);
+ wl_list_for_each_safe(output, next, &b->compositor->output_list,
+ base.link) {
+ bool disconnected = true;
+
+ for (i = 0; i < resources->count_connectors; i++) {
+ if (connected[i] == output->connector_id) {
+ disconnected = false;
+ break;
}
}
- wl_list_for_each_safe(output, next, &b->compositor->pending_output_list,
- base.link) {
- if (disconnects & (1 << output->connector_id)) {
- disconnects &= ~(1 << output->connector_id);
- weston_log("connector %d disconnected\n",
- output->connector_id);
- drm_output_destroy(&output->base);
- }
- }
+ if (!disconnected)
+ continue;
+
+ weston_log("connector %d disconnected\n", output->connector_id);
+ drm_output_destroy(&output->base);
}
+
+ wl_list_for_each_safe(output, next, &b->compositor->pending_output_list,
+ base.link) {
+ bool disconnected = true;
+
+ for (i = 0; i < resources->count_connectors; i++) {
+ if (connected[i] == output->connector_id) {
+ disconnected = false;
+ break;
+ }
+ }
+
+ if (!disconnected)
+ continue;
+
+ weston_log("connector %d disconnected\n", output->connector_id);
+ drm_output_destroy(&output->base);
+ }
+
+ free(connected);
+ drmModeFreeResources(resources);
}
static int