diff options
| author | Thomas Hellstrom <thellstrom@vmware.com> | 2011-10-26 07:28:31 +0200 |
|---|---|---|
| committer | Thomas Hellstrom <thellstrom@vmware.com> | 2011-10-26 13:19:57 +0200 |
| commit | c73a7f3d991dd95d332829f2ca8a88aabfea5a46 (patch) | |
| tree | 4c3f0190da33c482b2cdf5285e9074b70c460bb7 /vmwgfx | |
| parent | a33710b0d16c9c01a1995b60f0b0d4d482f459d3 (diff) | |
vmwgfx: Update the connector type name array
Also map connector types that are not in the array to "Unknown".
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
Diffstat (limited to 'vmwgfx')
| -rw-r--r-- | vmwgfx/vmwgfx_output.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/vmwgfx/vmwgfx_output.c b/vmwgfx/vmwgfx_output.c index 5ec84a1..d0f238d 100644 --- a/vmwgfx/vmwgfx_output.c +++ b/vmwgfx/vmwgfx_output.c @@ -72,6 +72,9 @@ static char *output_enum_list[] = { "DP", "HDMI", "HDMI", + "TV", + "EDP", + "Virtual", }; static void @@ -110,7 +113,7 @@ output_detect(xf86OutputPtr output) * really want to have enabled just yet. * * If we are in initial config, and - * an output higher than LVDS1 is connected, + * an output higher than Virtual1 is connected, * and it has no monitor section in the config file, * status will be reported as unknown, which means * the xorg modesetting code will think it is @@ -276,6 +279,10 @@ xorg_output_init(ScrnInfoPtr pScrn) (void)v; #endif + if (drm_connector->connector_type >= + sizeof(output_enum_list) / sizeof(output_enum_list[0])) + drm_connector->connector_type = 0; + snprintf(name, 32, "%s%d", output_enum_list[drm_connector->connector_type], drm_connector->connector_type_id); |