diff options
author | Alex Deucher <alex@t41p.hsd1.va.comcast.net> | 2008-02-01 02:53:22 -0500 |
---|---|---|
committer | Alex Deucher <alex@t41p.hsd1.va.comcast.net> | 2008-02-01 02:53:22 -0500 |
commit | 5d7bea2b62c86868baf1960665a40249a43bafc5 (patch) | |
tree | c1b6f39e9959a96ae3cd3b01fe55d42cde6597d6 /src/legacy_output.c | |
parent | 73b437ce232c94c0067a0d2f70538b6e1e8c07a7 (diff) |
RADEON: remove redundant RADEONDisableDisplays()
use RADEONBlank() instead
Diffstat (limited to 'src/legacy_output.c')
-rw-r--r-- | src/legacy_output.c | 64 |
1 files changed, 0 insertions, 64 deletions
diff --git a/src/legacy_output.c b/src/legacy_output.c index 6e150516..c2faa47c 100644 --- a/src/legacy_output.c +++ b/src/legacy_output.c @@ -1784,67 +1784,3 @@ radeon_detect_tv(ScrnInfoPtr pScrn) return found; } - -/* disable all ouputs before enabling the ones we want */ -void -RADEONDisableDisplays(ScrnInfoPtr pScrn) { - RADEONInfoPtr info = RADEONPTR(pScrn); - unsigned char * RADEONMMIO = info->MMIO; - unsigned long tmp, tmpPixclksCntl; - - - /* primary DAC */ - tmp = INREG(RADEON_CRTC_EXT_CNTL); - tmp &= ~RADEON_CRTC_CRT_ON; - OUTREG(RADEON_CRTC_EXT_CNTL, tmp); - RADEONDacPowerSet(pScrn, FALSE, TRUE); - - /* Secondary DAC */ - if (info->ChipFamily == CHIP_FAMILY_R200) { - tmp = INREG(RADEON_FP2_GEN_CNTL); - tmp &= ~(RADEON_FP2_ON | RADEON_FP2_DVO_EN); - OUTREG(RADEON_FP2_GEN_CNTL, tmp); - } else { - tmp = INREG(RADEON_CRTC2_GEN_CNTL); - tmp &= ~RADEON_CRTC2_CRT2_ON; - OUTREG(RADEON_CRTC2_GEN_CNTL, tmp); - } - RADEONDacPowerSet(pScrn, FALSE, FALSE); - - /* turn off tv-out */ - if (info->InternalTVOut) { - tmp = INREG(RADEON_TV_MASTER_CNTL); - tmp &= ~RADEON_TV_ON; - OUTREG(RADEON_TV_MASTER_CNTL, tmp); - } - - /* FP 1 */ - tmp = INREG(RADEON_FP_GEN_CNTL); - tmp &= ~(RADEON_FP_FPON | RADEON_FP_TMDS_EN); - OUTREG(RADEON_FP_GEN_CNTL, tmp); - - /* FP 2 */ - tmp = INREG(RADEON_FP2_GEN_CNTL); - tmp |= RADEON_FP2_BLANK_EN; - tmp &= ~(RADEON_FP2_ON | RADEON_FP2_DVO_EN); - OUTREG(RADEON_FP2_GEN_CNTL, tmp); - - /* LVDS */ - if (info->IsMobility) { - tmpPixclksCntl = INPLL(pScrn, RADEON_PIXCLKS_CNTL); - if (info->IsMobility || info->IsIGP) { - /* Asic bug, when turning off LVDS_ON, we have to make sure - RADEON_PIXCLK_LVDS_ALWAYS_ON bit is off - */ - OUTPLLP(pScrn, RADEON_PIXCLKS_CNTL, 0, ~RADEON_PIXCLK_LVDS_ALWAYS_ONb); - } - tmp = INREG(RADEON_LVDS_GEN_CNTL); - tmp |= RADEON_LVDS_DISPLAY_DIS; - tmp &= ~(RADEON_LVDS_ON | RADEON_LVDS_BLON | RADEON_LVDS_EN); - OUTREG(RADEON_LVDS_GEN_CNTL, tmp); - if (info->IsMobility || info->IsIGP) { - OUTPLL(pScrn, RADEON_PIXCLKS_CNTL, tmpPixclksCntl); - } - } - -} |