xf86-video-ati: Branch 'master'

[Alex Deucher]

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

New commits:
commit 966ac1be81da76c8aa4ea46b63f3ca5358a2c021
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Fri Aug 27 18:22:21 2010 -0400

    evergreen: work around bad data in some i2c tables
    
    The 7th entry in a lot of evergreen i2c gpio tables is partially
    zeroed.  Fix the entry.
    
    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>

diff --git a/src/radeon_atombios.c b/src/radeon_atombios.c
index 61b5372..27231cd 100644
--- a/src/radeon_atombios.c
+++ b/src/radeon_atombios.c
@@ -1538,6 +1538,19 @@ RADEONLookupGPIOLineForDDC(ScrnInfoPtr pScrn, uint8_t id)
 
     for (i = 0; i < num_indices; i++) {
 	    gpio = &atomDataPtr->GPIO_I2C_Info->asGPIO_Info[i];
+
+	    if (IS_DCE4_VARIANT) {
+	        if ((i == 7) &&
+		    (gpio->usClkMaskRegisterIndex == 0x1936) &&
+		    (gpio->sucI2cId.ucAccess == 0)) {
+		    gpio->sucI2cId.ucAccess = 0x97;
+		    gpio->ucDataMaskShift = 8;
+		    gpio->ucDataEnShift = 8;
+		    gpio->ucDataY_Shift = 8;
+		    gpio->ucDataA_Shift = 8;
+		}
+	    }
+
 	    if (gpio->sucI2cId.ucAccess == id) {
 		    i2c.mask_clk_reg = le16_to_cpu(gpio->usClkMaskRegisterIndex) * 4;
 		    i2c.mask_data_reg = le16_to_cpu(gpio->usDataMaskRegisterIndex) * 4;