xf86-video-ati: Branch '6.12-branch'

[Alex Deucher]

 src/radeon_atombios.c |   10 ++++++++++
 1 file changed, 10 insertions(+)

New commits:
commit 89e87dcb8ffb8a1ffdd55b9b63c8efef5f42e603
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Thu Feb 18 14:02:00 2010 -0500

    RS600: add connector quirk
    
    System lists DVI port as HDMI.
    
    fixes fdo bug 26605

diff --git a/src/radeon_atombios.c b/src/radeon_atombios.c
index 1e7b202..621a110 100644
--- a/src/radeon_atombios.c
+++ b/src/radeon_atombios.c
@@ -1535,6 +1535,16 @@ static void RADEONApplyATOMQuirks(ScrnInfoPtr pScrn, int index)
 	}
     }
 
+    /* RS600 board lists the DVI port as HDMI */
+    if ((info->Chipset == PCI_CHIP_RS600_7941) &&
+	(PCI_SUB_VENDOR_ID(info->PciInfo) == 0x1849) &&
+	(PCI_SUB_DEVICE_ID(info->PciInfo) == 0x7941)) {
+	if ((info->BiosConnector[index].ConnectorType == CONNECTOR_HDMI_TYPE_A) &&
+	    (info->BiosConnector[index].devices & ATOM_DEVICE_DFP3_SUPPORT)) {
+	    info->BiosConnector[index].ConnectorType = CONNECTOR_DVI_D;
+	}
+    }
+
     /* a-bit f-i90hd - ciaranm on #radeonhd - this board has no DVI */
     if ((info->Chipset == PCI_CHIP_RS600_7941) &&
 	(PCI_SUB_VENDOR_ID(info->PciInfo) == 0x147b) &&