summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/radeon_atombios.c19
-rw-r--r--src/radeon_output.c16
2 files changed, 11 insertions, 24 deletions
diff --git a/src/radeon_atombios.c b/src/radeon_atombios.c
index e6542288..f590d5b9 100644
--- a/src/radeon_atombios.c
+++ b/src/radeon_atombios.c
@@ -1625,22 +1625,6 @@ static void RADEONApplyATOMQuirks(ScrnInfoPtr pScrn, int index)
}
}
- /* ASUS HD 3600 XT board lists the DVI port as HDMI */
- if ((info->Chipset == PCI_CHIP_RV635_9598) &&
- (PCI_SUB_VENDOR_ID(info->PciInfo) == 0x1043) &&
- (PCI_SUB_DEVICE_ID(info->PciInfo) == 0x01da)) {
- if (info->BiosConnector[index].ConnectorType == CONNECTOR_HDMI_TYPE_B)
- info->BiosConnector[index].ConnectorType = CONNECTOR_DVI_D;
- }
-
- /* ASUS HD 3450 board lists the DVI port as HDMI */
- if ((info->Chipset == PCI_CHIP_RV620_95C5) &&
- (PCI_SUB_VENDOR_ID(info->PciInfo) == 0x1043) &&
- (PCI_SUB_DEVICE_ID(info->PciInfo) == 0x01e2)) {
- if (info->BiosConnector[index].ConnectorType == CONNECTOR_HDMI_TYPE_B)
- info->BiosConnector[index].ConnectorType = CONNECTOR_DVI_D;
- }
-
/* some BIOSes seem to report DAC on HDMI - usually this is a board with
* HDMI + VGA reporting as HDMI
*/
@@ -1649,8 +1633,7 @@ static void RADEONApplyATOMQuirks(ScrnInfoPtr pScrn, int index)
info->BiosConnector[index].devices &= ~(ATOM_DEVICE_DFP_SUPPORT);
info->BiosConnector[index].ConnectorType = CONNECTOR_VGA;
info->BiosConnector[index].connector_object = 0;
- } else
- info->BiosConnector[index].devices &= ~(ATOM_DEVICE_CRT_SUPPORT);
+ }
}
}
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);