isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 09:30:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

kms: drmModeGetConnector may fail

Browse Source 
drmModeGetConnector may fail and return NULL, this may happen when
a connector is removed underneath us (which can happen with e.g.
DP MST or GPU hot unplug).

Deal with this by skipping the connector when enumerating and by
assuming it is disconnected when checking its connection state.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/713
This commit is contained in:
Hans de Goede 2019-08-02 22:48:41 +02:00 committed by Jonas Ådahl
parent 578ff22464
commit 3ccb7cf4b2
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/backends/native/meta-kms-connector.c
View File

@ -456,7 +456,7 @@ meta_kms_connector_read_state (MetaKmsConnector *connector,
g_clear_pointer (&connector->current_state, meta_kms_connector_state_free); g_clear_pointer (&connector->current_state, meta_kms_connector_state_free);
if (drm_connector->connection != DRM_MODE_CONNECTED) if (!drm_connector || drm_connector->connection != DRM_MODE_CONNECTED)
return; return;
state = meta_kms_connector_state_new (); state = meta_kms_connector_state_new ();

3
src/backends/native/meta-kms-impl-device.c
View File

@ -209,6 +209,9 @@ init_connectors (MetaKmsImplDevice *impl_device,
drm_connector = drmModeGetConnector (impl_device->fd, drm_connector = drmModeGetConnector (impl_device->fd,
drm_resources->connectors[i]); drm_resources->connectors[i]);
if (!drm_connector)
continue;
connector = meta_kms_connector_new (impl_device, drm_connector, connector = meta_kms_connector_new (impl_device, drm_connector,
drm_resources); drm_resources);
drmModeFreeConnector (drm_connector); drmModeFreeConnector (drm_connector);