xf86-video-ati: Branch 'master'

[Dave Airlie]

 src/radeon_output.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9dd33cc8346073300312cd5f68de72d9bea1dd6b
Author: Dave Airlie <airlied at redhat.com>
Date:   Fri Apr 17 10:30:21 2009 +1000

    radeon: tweak ddc fix for all r300s.
    
    Alex seems to think this might affect some other chips

diff --git a/src/radeon_output.c b/src/radeon_output.c
index c6ae2ae..e545c79 100644
--- a/src/radeon_output.c
+++ b/src/radeon_output.c
@@ -222,8 +222,8 @@ radeon_ddc_connected(xf86OutputPtr output)
     if (radeon_output->pI2CBus) {
 	/* RV410 appears to have a bug where the hw i2c in reset
 	 * holds the i2c port in a bad state - switch hw i2c away before
-	 * doing DDC */
-	if (info->ChipFamily == CHIP_FAMILY_RV410) {
+	 * doing DDC - do this for all r300s for safety sakes */
+	if (IS_R300_VARIANT) {
 	    if (radeon_output->ddc_i2c.mask_clk_reg == RADEON_GPIO_VGA_DDC)
                 OUTREG(RADEON_DVI_I2C_CNTL_0, 0x30);
 	    else