diff options
| author | Steev Klimaszewski <threeway@gmail.com> | 2022-08-16 17:41:42 -0500 |
|---|---|---|
| committer | Steev Klimaszewski <steev@kali.org> | 2022-08-18 16:04:37 -0500 |
| commit | 48d9af9539715b0fd29d149733cdbd6d68bfc8bb (patch) | |
| tree | d8b0f98bf680b2713b4d4f5bef81ca6b022b76d5 | |
| parent | 0b26ad635e703dc5cd1255933253c4dd40d611d5 (diff) | |
| download | mutter-gnome-3-38.tar.gz | |
Update meta connector types enumgnome-3-38
This adds the 4 new connector types that mutter didn't know about from
drm_mode.h in the kernel.
Noticed because mutter kept crashing when plugging in a USB-C adapter to
use an external monitor.
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2577>
(cherry picked from commit 64279167)
| -rw-r--r-- | src/backends/meta-monitor-manager.c | 4 | ||||
| -rw-r--r-- | src/backends/meta-output.h | 7 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/backends/meta-monitor-manager.c b/src/backends/meta-monitor-manager.c index 1beb658bd..c118ef753 100644 --- a/src/backends/meta-monitor-manager.c +++ b/src/backends/meta-monitor-manager.c @@ -1016,6 +1016,10 @@ get_connector_type_name (MetaConnectorType connector_type) case META_CONNECTOR_TYPE_eDP: return "eDP"; case META_CONNECTOR_TYPE_VIRTUAL: return "VIRTUAL"; case META_CONNECTOR_TYPE_DSI: return "DSI"; + case META_CONNECTOR_TYPE_DPI: return "DPI"; + case META_CONNECTOR_TYPE_WRITEBACK: return "WRITEBACK"; + case META_CONNECTOR_TYPE_SPI: return "SPI"; + case META_CONNECTOR_TYPE_USB: return "USB"; default: g_assert_not_reached (); } return NULL; diff --git a/src/backends/meta-output.h b/src/backends/meta-output.h index c10b5fec6..b2b5e044e 100644 --- a/src/backends/meta-output.h +++ b/src/backends/meta-output.h @@ -38,7 +38,7 @@ struct _MetaTileInfo guint32 tile_h; }; -/* This matches the values in drm_mode.h */ +/* These 21 match the values in drm_mode.h */ typedef enum { META_CONNECTOR_TYPE_Unknown = 0, @@ -58,6 +58,11 @@ typedef enum META_CONNECTOR_TYPE_eDP = 14, META_CONNECTOR_TYPE_VIRTUAL = 15, META_CONNECTOR_TYPE_DSI = 16, + META_CONNECTOR_TYPE_DPI = 17, + META_CONNECTOR_TYPE_WRITEBACK = 18, + META_CONNECTOR_TYPE_SPI = 19, + META_CONNECTOR_TYPE_USB = 20, + } MetaConnectorType; typedef struct _MetaOutputInfo |