diff options
| author | Alex Deucher <alex@samba.(none)> | 2007-08-19 20:55:32 -0400 |
|---|---|---|
| committer | Alex Deucher <alex@samba.(none)> | 2007-08-19 20:55:32 -0400 |
| commit | b275febdb0918e8cebdffbb433b0eeb3ff4d3746 (patch) | |
| tree | 8c3ac60414c84b8fd6f66307a1cfb0f855c7963f | |
| parent | a90d675832ddb02c81ace010ccbf02619b70edac (diff) | |
RADEON: turn off TVCLK when blanking tv encoder
| -rw-r--r-- | src/radeon_display.c | 6 | ||||
| -rw-r--r-- | src/radeon_tv.c | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/radeon_display.c b/src/radeon_display.c index 43340169..ec0cdd94 100644 --- a/src/radeon_display.c +++ b/src/radeon_display.c @@ -368,6 +368,9 @@ void RADEONEnableDisplay(xf86OutputPtr output, BOOL bEnable) save->lvds_gen_cntl &= ~(RADEON_LVDS_DISPLAY_DIS); } else if (radeon_output->MonType == MT_STV || radeon_output->MonType == MT_CTV) { + tmp = INREG(RADEON_TV_MASTER_CNTL); + tmp |= RADEON_TV_ON; + OUTREG(RADEON_TV_MASTER_CNTL, tmp); RADEONDacPowerSet(pScrn, bEnable, (radeon_output->DACType == DAC_PRIMARY)); } } else { @@ -422,6 +425,9 @@ void RADEONEnableDisplay(xf86OutputPtr output, BOOL bEnable) OUTPLL(pScrn, RADEON_PIXCLKS_CNTL, tmpPixclksCntl); } } else if (radeon_output->MonType == MT_STV || radeon_output->MonType == MT_CTV) { + tmp = INREG(RADEON_TV_MASTER_CNTL); + tmp &= ~RADEON_TV_ON; + OUTREG(RADEON_TV_MASTER_CNTL, tmp); RADEONDacPowerSet(pScrn, bEnable, (radeon_output->DACType == DAC_PRIMARY)); } } diff --git a/src/radeon_tv.c b/src/radeon_tv.c index db5288a7..8dbe9741 100644 --- a/src/radeon_tv.c +++ b/src/radeon_tv.c @@ -338,6 +338,7 @@ void RADEONInitTVRegisters(xf86OutputPtr output, RADEONSavePtr save, | RADEON_DVS_ASYNC_RST | RADEON_CRT_FIFO_CE_EN | RADEON_TV_FIFO_CE_EN + | RADEON_TVCLK_ALWAYS_ONb | RADEON_TV_ON); save->tv_modulator_cntl1 = RADEON_SLEW_RATE_LIMIT |