xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/radeon_atombios.c |   19 +------------------
 src/radeon_output.c   |   16 ++++++++++------
 2 files changed, 11 insertions(+), 24 deletions(-)

New commits:
commit f39cafc5c4a93a16ac93756473ebb1f33c7881db
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Sun Jun 28 20:42:49 2009 -0400

    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.

diff --git a/src/radeon_atombios.c b/src/radeon_atombios.c
index e654228..f590d5b 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 62edd05..f554824 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);