diff options
| author | Jakob Bornecrantz <jakob@vmware.com> | 2009-10-18 15:25:30 +0200 |
|---|---|---|
| committer | Jakob Bornecrantz <jakob@vmware.com> | 2009-10-18 15:46:24 +0200 |
| commit | b8843c60565094be311e3b31c0826a3035627a3e (patch) | |
| tree | 26aae721c8d11ed62a186c3baa1d0cf349541ceb /src/gallium/state_trackers/xorg/xorg_output.c | |
| parent | 68b5dc9634a39b5aa84fe963676b4fd0249363cf (diff) | |
st/xorg: Support more then one output of a given type
Diffstat (limited to 'src/gallium/state_trackers/xorg/xorg_output.c')
| -rw-r--r-- | src/gallium/state_trackers/xorg/xorg_output.c | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/src/gallium/state_trackers/xorg/xorg_output.c b/src/gallium/state_trackers/xorg/xorg_output.c index 26f45f8d64..964d9595a9 100644 --- a/src/gallium/state_trackers/xorg/xorg_output.c +++ b/src/gallium/state_trackers/xorg/xorg_output.c @@ -56,17 +56,17 @@ static char *connector_enum_list[] = { "Unknown", "VGA", - "DVI-I", - "DVI-D", - "DVI-A", + "DVI", + "DVI", + "DVI", "Composite", "SVIDEO", "LVDS", - "Component", - "9-pin DIN", - "DisplayPort", - "HDMI Type A", - "HDMI Type B", + "CTV", + "DIN", + "DP", + "HDMI", + "HDMI", }; static void @@ -240,7 +240,7 @@ output_init(ScrnInfoPtr pScrn) drmModeResPtr res; drmModeConnectorPtr drm_connector = NULL; drmModeEncoderPtr drm_encoder = NULL; - char *name; + char name[32]; int c, v, p; res = drmModeGetResources(ms->fd); @@ -273,7 +273,10 @@ output_init(ScrnInfoPtr pScrn) (void)v; #endif - name = connector_enum_list[drm_connector->connector_type]; + snprintf(name, 32, "%s%d", + connector_enum_list[drm_connector->connector_type], + drm_connector->connector_type_id); + output = xf86OutputCreate(pScrn, &output_funcs, name); if (!output) |