xf86-video-ati: Branch 'master'

[Dave Airlie]

 src/radeon_atombios.c |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

New commits:
commit 94d5a432f72801f821d1c4ce952baba17552659d
Author: Dave Airlie <airlied at linux.ie>
Date:   Fri Jan 4 17:16:54 2008 +1000

    atombios: i2c lines are all done with sw so we can accept any of them.
    
    hch reported this working on his laptop with 0x7e60 as EDID for LVDS

diff --git a/src/radeon_atombios.c b/src/radeon_atombios.c
index 7cf0556..73a185b 100644
--- a/src/radeon_atombios.c
+++ b/src/radeon_atombios.c
@@ -1717,7 +1717,7 @@ RADEONGetATOMConnectorInfoFromBIOSConnectorTable (ScrnInfoPtr pScrn)
 	info->BiosConnector[i].ConnectorType = ci.sucConnectorInfo.sbfAccess.bfConnectorType;
 	info->BiosConnector[i].DACType = ci.sucConnectorInfo.sbfAccess.bfAssociatedDAC - 1;
 
-	if (ci.sucI2cId.sbfAccess.bfHW_Capable) {
+	if (ci.sucI2cId.sbfAccess.bfI2C_LineMux) {
 	    /* don't assign a gpio for tv */
 	    if ((i == ATOM_DEVICE_TV1_INDEX) ||
 		(i == ATOM_DEVICE_TV2_INDEX) ||
@@ -1726,11 +1726,6 @@ RADEONGetATOMConnectorInfoFromBIOSConnectorTable (ScrnInfoPtr pScrn)
 	    else
 		info->BiosConnector[i].ddc_line =
 		    RADEONLookupGPIOLineForDDC(pScrn, ci.sucI2cId.sbfAccess.bfI2C_LineMux);
-	} else if (ci.sucI2cId.sbfAccess.bfI2C_LineMux) {
-	    /* add support for GPIO line */
-	    ErrorF("Unsupported SW GPIO - device %d: gpio line: 0x%x\n",
-		   i, (unsigned int)RADEONLookupGPIOLineForDDC(pScrn, ci.sucI2cId.sbfAccess.bfI2C_LineMux));
-	    info->BiosConnector[i].ddc_line = 0;
 	} else {
 	    info->BiosConnector[i].ddc_line = 0;
 	}