diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2009-05-03 18:52:00 -0400 |
|---|---|---|
| committer | Alex Deucher <alexdeucher@gmail.com> | 2009-05-08 12:11:16 -0400 |
| commit | 0e49efbe8c271c26cec4dfca063c73755dc2d25f (patch) | |
| tree | ad6e293df369b5980bfa3d92f101736a727d2a6d /src | |
| parent | 421085949e195596000e37ea6693489db7c075b5 (diff) | |
r2xx-r4xx: fix typo in last i2c fix and clarify hw i2c pin sel
Diffstat (limited to 'src')
| -rw-r--r-- | src/radeon_output.c | 6 | ||||
| -rw-r--r-- | src/radeon_reg.h | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/radeon_output.c b/src/radeon_output.c index 67d94feb..ee8de6ab 100644 --- a/src/radeon_output.c +++ b/src/radeon_output.c @@ -1656,12 +1656,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 c0d34d1b..914fe510 100644 --- a/src/radeon_reg.h +++ b/src/radeon_reg.h @@ -936,11 +936,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) @@ -997,9 +997,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 |