summaryrefslogtreecommitdiff
path: root/src/legacy_output.c
diff options
context:
space:
mode:
authorAlex Deucher <alexdeucher@gmail.com>2008-08-05 15:01:33 -0400
committerAlex Deucher <alexdeucher@gmail.com>2008-08-05 15:01:33 -0400
commiteb65ddf70d182b6457e1ef5ebb820456039e8f6d (patch)
tree774bb4d8be3af0eb33151fe6e1cf5fb0690262e4 /src/legacy_output.c
parent8b8990917809b9a35c6e9c1b9e3b12ff81c6dbb3 (diff)
IGP: attempt to get external TMDS working
RS4xx chips have a tmds init table in the mobile info table
Diffstat (limited to 'src/legacy_output.c')
-rw-r--r--src/legacy_output.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/legacy_output.c b/src/legacy_output.c
index ccf59ba3..3ca019f4 100644
--- a/src/legacy_output.c
+++ b/src/legacy_output.c
@@ -285,12 +285,11 @@ RADEONRestoreDVOChip(ScrnInfoPtr pScrn, xf86OutputPtr output)
if (!radeon_output->DVOChip)
return;
- OUTREG(radeon_output->dvo_i2c.mask_clk_reg,
- INREG(radeon_output->dvo_i2c.mask_clk_reg) &
- (uint32_t)~(RADEON_GPIO_A_0 | RADEON_GPIO_A_1));
-
if (!RADEONInitExtTMDSInfoFromBIOS(output)) {
if (radeon_output->DVOChip) {
+ OUTREG(radeon_output->dvo_i2c.mask_clk_reg,
+ INREG(radeon_output->dvo_i2c.mask_clk_reg) &
+ (uint32_t)~(RADEON_GPIO_A_0 | RADEON_GPIO_A_1));
switch(info->ext_tmds_chip) {
case RADEON_SIL_164:
RADEONDVOWriteByte(radeon_output->DVOChip, 0x08, 0x30);
@@ -1443,8 +1442,8 @@ legacy_output_mode_set(xf86OutputPtr output, DisplayModePtr mode,
}
OUTREG(RADEON_FP2_GEN_CNTL, fp2_gen_cntl);
} else {
- RADEONRestoreDVOChip(pScrn, output);
RADEONRestoreFP2Registers(pScrn, info->ModeReg);
+ RADEONRestoreDVOChip(pScrn, output);
}
}
break;