diff options
| author | Rui Matos <tiagomatos@gmail.com> | 2016-08-24 14:47:51 +0200 |
|---|---|---|
| committer | Rui Matos <tiagomatos@gmail.com> | 2016-08-29 15:53:00 +0200 |
| commit | c8f24721c5047c5635fe094bb8aa300ed5150796 (patch) | |
| tree | 95c8d857c1d7965675b702fe2287c11cea32f0fd | |
| parent | 7ba803934cc2e89384321b590f9436f83374772b (diff) | |
| download | mutter-c8f24721c5047c5635fe094bb8aa300ed5150796.tar.gz | |
monitor-manager-kms: Use the output naming logic used by the X server
Switch to the output naming logic used by the X server's modesetting
driver which, in particular, uses drmModeConnector's connector_type_id
instead of connector_id.
The kernel generates new connector_id's every time there are changes
which means we can't identify the same monitor on the same connector
after an hardware hotplug. Switching to connector_type_id fixes this.
https://bugzilla.gnome.org/show_bug.cgi?id=770338
| -rw-r--r-- | src/backends/native/meta-monitor-manager-kms.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/backends/native/meta-monitor-manager-kms.c b/src/backends/native/meta-monitor-manager-kms.c index e0bd36622..2b36dadf1 100644 --- a/src/backends/native/meta-monitor-manager-kms.c +++ b/src/backends/native/meta-monitor-manager-kms.c @@ -155,14 +155,15 @@ make_output_name (drmModeConnector *connector) "Virtual", "DSI", }; - const char *connector_type_name; if (connector->connector_type < G_N_ELEMENTS (connector_type_names)) - connector_type_name = connector_type_names[connector->connector_type]; + return g_strdup_printf ("%s-%d", + connector_type_names[connector->connector_type], + connector->connector_type_id); else - connector_type_name = "unknown"; - - return g_strdup_printf ("%s%d", connector_type_name, connector->connector_id); + return g_strdup_printf ("Unknown%d-%d", + connector->connector_type, + connector->connector_type_id); } static void |