diff options
| author | Alex Deucher <alex@samba.(none)> | 2006-09-29 00:44:36 -0400 |
|---|---|---|
| committer | Alex Deucher <alex@samba.(none)> | 2006-09-29 00:44:36 -0400 |
| commit | f6b42149c5a3fee663575fe6bbe78b62695bdbc8 (patch) | |
| tree | 057dc15dfa584f86508760e485c2e4eb7cd2811f | |
| parent | c0660495080719c052d6393ede707755929102cd (diff) | |
tvdac handling was reversed between r200 and other chips
| -rw-r--r-- | src/radeon_display.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/radeon_display.c b/src/radeon_display.c index 8537da40..af1b86a9 100644 --- a/src/radeon_display.c +++ b/src/radeon_display.c @@ -1445,15 +1445,15 @@ void RADEONEnableDisplay(ScrnInfoPtr pScrn, RADEONController* pCRTC, BOOL bEnabl save->crtc_ext_cntl |= RADEON_CRTC_CRT_ON; } else if (pCRTC->pPort->DACType == DAC_TVDAC) { if (info->ChipFamily == CHIP_FAMILY_R200) { - tmp = INREG(RADEON_CRTC2_GEN_CNTL); - tmp |= RADEON_CRTC2_CRT2_ON; - OUTREG(RADEON_CRTC2_GEN_CNTL, tmp); - save->crtc2_gen_cntl |= RADEON_CRTC2_CRT2_ON; - } else { tmp = INREG(RADEON_FP2_GEN_CNTL); tmp |= (RADEON_FP2_ON | RADEON_FP2_DVO_EN); OUTREG(RADEON_FP2_GEN_CNTL, tmp); save->fp2_gen_cntl |= (RADEON_FP2_ON | RADEON_FP2_DVO_EN); + } else { + tmp = INREG(RADEON_CRTC2_GEN_CNTL); + tmp |= RADEON_CRTC2_CRT2_ON; + OUTREG(RADEON_CRTC2_GEN_CNTL, tmp); + save->crtc2_gen_cntl |= RADEON_CRTC2_CRT2_ON; } } RADEONDacPowerSet(pScrn, bEnable, (pCRTC->pPort->DACType == DAC_PRIMARY)); |