fdo-mirrors/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston.git synced 2026-05-05 16:58:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

compositor-drm: find disconnects from head_list

Browse source 
Instead of iterating output_list and pending_output_list, iterate
head_list to find outputs whose connectors have been disconnected.

This helps a following patch to move connector fields from drm_output to
drm_head.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Acked-by: Derek Foreman <derekf@osg.samsung.com>
This commit is contained in:
Pekka Paalanen 2017-08-31 15:41:57 +03:00
parent aeca2b5aad
commit a0a3746a8a
1 changed files with 12 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
libweston/compositor-drm.c
View file

@ -5197,7 +5197,8 @@ update_outputs(struct drm_backend *b, struct udev_device *drm_device)
{
drmModeConnector *connector;
drmModeRes *resources;
struct drm_output *output, *next;
struct weston_head *base, *next;
struct drm_head *head;
uint32_t *connected;
int i;
@ -5238,12 +5239,17 @@ update_outputs(struct drm_backend *b, struct udev_device *drm_device)
weston_log("connector %d connected\n", connector_id);
}
wl_list_for_each_safe(output, next, &b->compositor->output_list,
base.link) {
wl_list_for_each_safe(base, next,
&b->compositor->head_list, compositor_link) {
bool disconnected = true;
head = to_drm_head(base);
if (!head->output)
continue;
for (i = 0; i < resources->count_connectors; i++) {
if (connected[i] == output->connector_id) {
if (connected[i] == head->output->connector_id) {
disconnected = false;
break;
}
@ -5252,26 +5258,8 @@ update_outputs(struct drm_backend *b, struct udev_device *drm_device)
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);
weston_log("connector %d disconnected\n", head->output->connector_id);
drm_output_destroy(&head->output->base);
}
drm_backend_update_unused_outputs(b, resources);