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

[Alex Deucher]

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

New commits:
commit 45f8b911659dba7f43b9b70bde4b9c3be51b0b5b
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Mon Dec 29 10:25:33 2008 -0500

    RS600: remove gpio quirk for ddc
    
    Doesn't seem necessary on RS600.  I'll try and find out more.

diff --git a/src/radeon_atombios.c b/src/radeon_atombios.c
index b674a41..43f2c18 100644
--- a/src/radeon_atombios.c
+++ b/src/radeon_atombios.c
@@ -2049,8 +2049,7 @@ RADEONGetATOMConnectorInfoFromBIOSConnectorTable (ScrnInfoPtr pScrn)
 	    (i == ATOM_DEVICE_TV2_INDEX) ||
 	    (i == ATOM_DEVICE_CV_INDEX))
 	    info->BiosConnector[i].ddc_i2c.valid = FALSE;
-	else if ((info->ChipFamily == CHIP_FAMILY_RS600) ||
-		 (info->ChipFamily == CHIP_FAMILY_RS690) ||
+	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))
commit e913990030c536427bfecdb7b3d1e18f1beb90d2
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Mon Dec 29 10:22:20 2008 -0500

    Revert "radeon: maybe special handling only needed for DVI port not HDMI one."
    
    This reverts commit c877450a75d3fd4a2f200af197c691669966f6f4.
    
    This breaks RS690 setups.  I think for now we just apply this quirk to
    RS690/RS740.  I'll follow up with the bios folks about RS600.

diff --git a/src/radeon_atombios.c b/src/radeon_atombios.c
index ce1ac03..b674a41 100644
--- a/src/radeon_atombios.c
+++ b/src/radeon_atombios.c
@@ -2052,9 +2052,8 @@ RADEONGetATOMConnectorInfoFromBIOSConnectorTable (ScrnInfoPtr pScrn)
 	else if ((info->ChipFamily == CHIP_FAMILY_RS600) ||
 		 (info->ChipFamily == CHIP_FAMILY_RS690) ||
 		 (info->ChipFamily == CHIP_FAMILY_RS740)) {
-	    /* 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)
+	    /* IGP DFP ports use non-standard gpio entries */
+	    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