diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2009-06-28 20:42:49 -0400 |
|---|---|---|
| committer | Alex Deucher <alexdeucher@gmail.com> | 2009-06-28 20:42:49 -0400 |
| commit | f39cafc5c4a93a16ac93756473ebb1f33c7881db (patch) | |
| tree | 7e3a198e97d8382bdd3de222bb72d75a28a214b0 /src/radeon_output.c | |
| parent | 407e676b04117c7ca3dcc0cc072f3552b03c64e5 (diff) | |
radeon: call hdmi-b connectors dvi in randr
Technically HDMI-B is a glorfied DL DVI, but this is confusing
to users, so call it DVI when reporting randr outputs. This
allows us to remove two quirks where the bios was actually
correct.
Diffstat (limited to 'src/radeon_output.c')
| -rw-r--r-- | src/radeon_output.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/radeon_output.c b/src/radeon_output.c index 62edd057..f5548246 100644 --- a/src/radeon_output.c +++ b/src/radeon_output.c @@ -2727,12 +2727,12 @@ Bool RADEONSetupConnectors(ScrnInfoPtr pScrn) RADEONConnectorType conntype = info->BiosConnector[i].ConnectorType; if ((conntype == CONNECTOR_DVI_D) || (conntype == CONNECTOR_DVI_I) || - (conntype == CONNECTOR_DVI_A)) { + (conntype == CONNECTOR_DVI_A) || + (conntype == CONNECTOR_HDMI_TYPE_B)) { num_dvi++; } else if (conntype == CONNECTOR_VGA) { num_vga++; - } else if ((conntype == CONNECTOR_HDMI_TYPE_A) || - (conntype == CONNECTOR_HDMI_TYPE_B)) { + } else if (conntype == CONNECTOR_HDMI_TYPE_A) { num_hdmi++; } else if (conntype == CONNECTOR_DISPLAY_PORT) { num_dp++; @@ -2762,14 +2762,18 @@ Bool RADEONSetupConnectors(ScrnInfoPtr pScrn) radeon_output->linkb = info->BiosConnector[i].linkb; radeon_output->connector_id = info->BiosConnector[i].connector_object; + /* Technically HDMI-B is a glorfied DL DVI so the bios is correct, + * but this can be confusing to users when it comes to output names, + * so call it DVI + */ if ((conntype == CONNECTOR_DVI_D) || (conntype == CONNECTOR_DVI_I) || - (conntype == CONNECTOR_DVI_A)) { + (conntype == CONNECTOR_DVI_A) || + (conntype == CONNECTOR_HDMI_TYPE_B)) { output = RADEONOutputCreate(pScrn, "DVI-%d", --num_dvi); } else if (conntype == CONNECTOR_VGA) { output = RADEONOutputCreate(pScrn, "VGA-%d", --num_vga); - } else if ((conntype == CONNECTOR_HDMI_TYPE_A) || - (conntype == CONNECTOR_HDMI_TYPE_B)) { + } else if (conntype == CONNECTOR_HDMI_TYPE_A) { output = RADEONOutputCreate(pScrn, "HDMI-%d", --num_hdmi); } else if (conntype == CONNECTOR_DISPLAY_PORT) { output = RADEONOutputCreate(pScrn, "DisplayPort-%d", --num_dp); |