xf86-video-ati: Branch 'master'

[Alex Deucher]

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

New commits:
commit c0215d2f2a27755fb04d20aaa4320a5e7da7ee04
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Thu Apr 16 11:58:19 2009 -0400

    RS690/RS740: fix connector enumeration in some cases
    
    Should fix Masta-G's issue reported on IRC.

diff --git a/src/radeon_atombios.c b/src/radeon_atombios.c
index e2348a4..2aa5911 100644
--- a/src/radeon_atombios.c
+++ b/src/radeon_atombios.c
@@ -2294,10 +2294,11 @@ RADEONGetATOMConnectorInfoFromBIOSConnectorTable (ScrnInfoPtr pScrn)
 	else if ((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))
+	    if ((i == ATOM_DEVICE_DFP2_INDEX) || (i == ATOM_DEVICE_DFP3_INDEX)) {
 		info->BiosConnector[i].ddc_i2c =
 		    RADEONLookupGPIOLineForDDC(pScrn, ci.sucI2cId.sbfAccess.bfI2C_LineMux + 1);
-	    else
+		info->BiosConnector[i].output_id = ci.sucI2cId.sbfAccess.bfI2C_LineMux + 1;
+	    } else
 		info->BiosConnector[i].ddc_i2c =
 		    RADEONLookupGPIOLineForDDC(pScrn, ci.sucI2cId.sbfAccess.bfI2C_LineMux);
 	} else