xf86-video-ati: Branch 'master'

[Alex Deucher]

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

New commits:
commit aa59b5b55e6ac64940fb3f0fa61f7b8fe36ba745
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Tue Apr 21 12:06:24 2009 -0400

    RS690: add quirk for acer board
    
    thanks to Gino Badouri for testing

diff --git a/src/radeon_atombios.c b/src/radeon_atombios.c
index 189e3f0..389b145 100644
--- a/src/radeon_atombios.c
+++ b/src/radeon_atombios.c
@@ -1593,6 +1593,20 @@ static void RADEONApplyATOMQuirks(ScrnInfoPtr pScrn, int index)
 	    info->BiosConnector[index].ConnectorType = CONNECTOR_DVI_D;
 	}
     }
+
+    /* Acer board, gpios for DFPs are not off by one */
+    if ((info->Chipset == PCI_CHIP_RS690_791E) &&
+	(PCI_SUB_VENDOR_ID(info->PciInfo) == 0x105b) &&
+	(PCI_SUB_DEVICE_ID(info->PciInfo) == 0x0e0b)) {
+	if (index == ATOM_DEVICE_DFP3_INDEX) {
+	    info->BiosConnector[index].ConnectorType = CONNECTOR_DVI_I;
+	    info->BiosConnector[index].output_id = 0;
+	    info->BiosConnector[index].ddc_i2c = RADEONLookupGPIOLineForDDC(pScrn, 0);
+	}
+	if (index == ATOM_DEVICE_DFP2_INDEX)
+	    info->BiosConnector[index].ddc_i2c = RADEONLookupGPIOLineForDDC(pScrn, 1);
+    }
+
     /* 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) &&