xf86-video-ati: Branch 'master' - 2 commits

[Dave Airlie]

 src/radeon_atombios.c |   12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit c877450a75d3fd4a2f200af197c691669966f6f4
Author: Dave Airlie <airlied at linux.ie>
Date:   Mon Dec 29 09:05:45 2008 +1000

    radeon: maybe special handling only needed for DVI port not HDMI one.
    
    fixes ciaranm's rs600 board on radeon DDC

diff --git a/src/radeon_atombios.c b/src/radeon_atombios.c
index b674a41..ce1ac03 100644
--- a/src/radeon_atombios.c
+++ b/src/radeon_atombios.c
@@ -2052,8 +2052,9 @@ RADEONGetATOMConnectorInfoFromBIOSConnectorTable (ScrnInfoPtr pScrn)
 	else if ((info->ChipFamily == CHIP_FAMILY_RS600) ||
 		 (info->ChipFamily == CHIP_FAMILY_RS690) ||
 		 (info->ChipFamily == CHIP_FAMILY_RS740)) {
-	    /* IGP DFP ports use non-standard gpio entries */
-	    if ((i == ATOM_DEVICE_DFP2_INDEX) || (i == ATOM_DEVICE_DFP3_INDEX))
+	    /* IGP DVI ports use non-standard gpio entries - HDMI appears to
+	     * possibly be okay - radeonhd channel Dec 29th 2008 */
+	    if (i == ATOM_DEVICE_DFP2_INDEX)
 		info->BiosConnector[i].ddc_i2c =
 		    RADEONLookupGPIOLineForDDC(pScrn, ci.sucI2cId.sbfAccess.bfI2C_LineMux + 1);
 	    else
commit 2a9bc6be3246ec230b181391221e3a46beb94a23
Author: Dave Airlie <airlied at linux.ie>
Date:   Mon Dec 29 09:05:16 2008 +1000

    radeon: a-bit motherboard has no DVI output
    
    thanks to ciaranm for finding this.

diff --git a/src/radeon_atombios.c b/src/radeon_atombios.c
index 3cd7eae..b674a41 100644
--- a/src/radeon_atombios.c
+++ b/src/radeon_atombios.c
@@ -1530,6 +1530,13 @@ static void RADEONApplyATOMQuirks(ScrnInfoPtr pScrn, int index)
 	    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) &&
+	(PCI_SUB_DEVICE_ID(info->PciInfo) == 0x2412)) {
+	if (info->BiosConnector[index].ConnectorType == CONNECTOR_DVI_I)
+	    info->BiosConnector[index].valid = FALSE;
+    }
 
     /* Falcon NW laptop lists vga ddc line for LVDS */
     if ((info->Chipset == PCI_CHIP_RV410_5653) &&