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

[Alex Deucher]

 src/radeon_atombios.c |    7 -------
 src/radeon_output.c   |    6 +++---
 src/radeon_reg.h      |   12 ++++++------
 3 files changed, 9 insertions(+), 16 deletions(-)

New commits:
commit 3880bc3c95764acccd62cfa438932458df95daf6
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Sun May 3 19:01:28 2009 -0400

    Remove some old debugging info

diff --git a/src/radeon_atombios.c b/src/radeon_atombios.c
index cf8c323..7e4a355 100644
--- a/src/radeon_atombios.c
+++ b/src/radeon_atombios.c
@@ -1941,7 +1941,6 @@ RADEONGetATOMConnectorInfoFromBIOSObject (ScrnInfoPtr pScrn)
 	    for (j = 0; j < ATOM_MAX_SUPPORTED_DEVICE; j++) {
 		if (info->BiosConnector[j].valid && (i != j) ) {
 		    if (info->BiosConnector[i].i2c_line_mux == info->BiosConnector[j].i2c_line_mux) {
-			ErrorF("Shared DDC line: %d %d\n", i, j);
 			info->BiosConnector[i].shared_ddc = TRUE;
 			info->BiosConnector[j].shared_ddc = TRUE;
 		    }
@@ -2418,12 +2417,6 @@ RADEONGetATOMConnectorInfoFromBIOSConnectorTable (ScrnInfoPtr pScrn)
 	}
     }
 
-    for (i = 0; i < ATOM_MAX_SUPPORTED_DEVICE; i++) {
-	if (info->encoders[i] != NULL) {
-	    ErrorF("encoder: 0x%x\n", info->encoders[i]->encoder_id);
-	}
-    }
-
     return TRUE;
 }
 
commit 3362381aa3a97c1da564f8a479ed4e7b0d6368b8
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Sun May 3 18:52:00 2009 -0400

    r2xx-r4xx: fix typo in last i2c fix and clarify hw i2c pin sel

diff --git a/src/radeon_output.c b/src/radeon_output.c
index 634fd65..e453cc2 100644
--- a/src/radeon_output.c
+++ b/src/radeon_output.c
@@ -1667,12 +1667,12 @@ RADEONI2CDoLock(xf86OutputPtr output, I2CBusPtr b, int lock_state)
 	 * holds the i2c port in a bad state - switch hw i2c away before
 	 * doing DDC - do this for all r200s/r300s for safety sakes */
 	if ((info->ChipFamily >= CHIP_FAMILY_R200) && (!IS_AVIVO_VARIANT)) {
-	    if (pRADEONI2CBus->mask_clk_reg == RADEON_GPIO_CRT2_DDC)
+	    if (pRADEONI2CBus->mask_clk_reg == RADEON_GPIO_MONID)
                 OUTREG(RADEON_DVI_I2C_CNTL_0, (RADEON_I2C_SOFT_RST |
-					       R200_DVI_I2C_PIN_SEL(R200_SEL_DVI_DDC)));
+					       R200_DVI_I2C_PIN_SEL(R200_SEL_DDC1)));
 	    else
                 OUTREG(RADEON_DVI_I2C_CNTL_0, (RADEON_I2C_SOFT_RST |
-					       R200_DVI_I2C_PIN_SEL(R200_SEL_CRT2_DDC)));
+					       R200_DVI_I2C_PIN_SEL(R200_SEL_DDC3)));
 	}
 
 	temp = INREG(pRADEONI2CBus->a_clk_reg);
diff --git a/src/radeon_reg.h b/src/radeon_reg.h
index d230a20..c418a25 100644
--- a/src/radeon_reg.h
+++ b/src/radeon_reg.h
@@ -966,11 +966,11 @@
 #define RADEON_GENMO_WT                     0x03c2 /* VGA */
 #define RADEON_GENS0                        0x03c2 /* VGA */
 #define RADEON_GENS1                        0x03da /* VGA, 0x03ba */
-#define RADEON_GPIO_MONID                   0x0068 /* DDC interface via I2C */
+#define RADEON_GPIO_MONID                   0x0068 /* DDC interface via I2C */ /* DDC3 */
 #define RADEON_GPIO_MONIDB                  0x006c
 #define RADEON_GPIO_CRT2_DDC                0x006c
-#define RADEON_GPIO_DVI_DDC                 0x0064
-#define RADEON_GPIO_VGA_DDC                 0x0060
+#define RADEON_GPIO_DVI_DDC                 0x0064 /* DDC2 */
+#define RADEON_GPIO_VGA_DDC                 0x0060 /* DDC1 */
 #       define RADEON_GPIO_A_0              (1 <<  0)
 #       define RADEON_GPIO_A_1              (1 <<  1)
 #       define RADEON_GPIO_Y_0              (1 <<  8)
@@ -1027,9 +1027,9 @@
 
 #define RADEON_DVI_I2C_CNTL_0		    0x02e0
 #       define R200_DVI_I2C_PIN_SEL(x)      ((x) << 3)
-#       define R200_SEL_DVI_DDC             0
-#       define R200_SEL_VGA_DDC             1
-#       define R200_SEL_CRT2_DDC            2
+#       define R200_SEL_DDC1                0 /* 0x60 - VGA_DDC */
+#       define R200_SEL_DDC2                1 /* 0x64 - DVI_DDC */
+#       define R200_SEL_DDC3                2 /* 0x68 - MONID_DDC */
 #define RADEON_DVI_I2C_CNTL_1               0x02e4
 #define RADEON_DVI_I2C_DATA		    0x02e8