diff options
| author | Alex Deucher <alex@botch2.com> | 2007-08-02 00:50:04 -0400 |
|---|---|---|
| committer | Alex Deucher <alex@botch2.com> | 2007-08-02 00:50:04 -0400 |
| commit | 971feb34843225030fff05b3f9d3801534fbf2d4 (patch) | |
| tree | 565fca227927586c759c4df5096c0d48a2962425 | |
| parent | 98d7e00437bea78e03180eb30ff30de3455d9d1a (diff) | |
RADEON: move tv dac enable to enabledisplay()
| -rw-r--r-- | src/radeon_display.c | 23 | ||||
| -rw-r--r-- | src/radeon_tv.c | 4 |
2 files changed, 13 insertions, 14 deletions
diff --git a/src/radeon_display.c b/src/radeon_display.c index 059dfca..bca0ac1 100644 --- a/src/radeon_display.c +++ b/src/radeon_display.c @@ -362,18 +362,16 @@ 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) { -#if 0 +#if 1 /* TV_MASTER_CNTL ??? */ /* XXX: FIXME: STV vs CTV and DACPD bits */ tmp = INREG(RADEON_TV_DAC_CNTL); - tmp |= (TV_DAC_CNTL_NBLANK | TV_DAC_CNTL_NHOLD); - tmp &= ~(TV_DAC_CNTL_BGSLEEP | TV_DAC_CNTL_RDACPD - | TV_DAC_CNTL_GDACPD | TV_DAC_CNTL_BDACPD); + tmp |= (RADEON_TV_DAC_NBLANK | RADEON_TV_DAC_NHOLD); + tmp &= ~RADEON_TV_DAC_BGSLEEP; OUTREG(RADEON_TV_DAC_CNTL, tmp); - save->tv_dac_cntl |= (TV_DAC_CNTL_NBLANK | TV_DAC_CNTL_NHOLD); - save->tv_dac_cntl &= ~(TV_DAC_CNTL_BGSLEEP | TV_DAC_CNTL_RDACPD - | TV_DAC_CNTL_GDACPD | TV_DAC_CNTL_BDACPD); + save->tv_dac_cntl |= (RADEON_TV_DAC_NBLANK | RADEON_TV_DAC_NHOLD); + save->tv_dac_cntl &= ~RADEON_TV_DAC_BGSLEEP; #endif } } else { @@ -435,15 +433,16 @@ void RADEONEnableDisplay(xf86OutputPtr output, BOOL bEnable) if (radeon_output->MonType == MT_STV || radeon_output->MonType == MT_CTV) { +#if 1 /* TV_MASTER_CNTL ??? */ -#if 0 + tmp = INREG(RADEON_TV_DAC_CNTL); - tmp &= ~(TV_DAC_CNTL_NBLANK | TV_DAC_CNTL_NHOLD); - tmp |= (TV_DAC_CNTL_BGSLEEP | TV_DAC_CNTL_RDACPD | TV_DAC_CNTL_GDACPD | TV_DAC_CNTL_BDACPD); + tmp &= ~(RADEON_TV_DAC_NBLANK | RADEON_TV_DAC_NHOLD); + tmp |= RADEON_TV_DAC_BGSLEEP; OUTREG(RADEON_TV_DAC_CNTL, tmp); - save->tv_dac_cntl &= ~(TV_DAC_CNTL_NBLANK | TV_DAC_CNTL_NHOLD); - save->tv_dac_cntl |= (TV_DAC_CNTL_BGSLEEP | TV_DAC_CNTL_RDACPD | TV_DAC_CNTL_GDACPD | TV_DAC_CNTL_BDACPD); + save->tv_dac_cntl &= ~(RADEON_TV_DAC_NBLANK | RADEON_TV_DAC_NHOLD); + save->tv_dac_cntl |= RADEON_TV_DAC_BGSLEEP; #endif } } diff --git a/src/radeon_tv.c b/src/radeon_tv.c index e4e6763..38fbcd0 100644 --- a/src/radeon_tv.c +++ b/src/radeon_tv.c @@ -406,8 +406,8 @@ void RADEONInitTVRegisters(xf86OutputPtr output, RADEONSavePtr save, save->tv_timing_cntl = tmp; /* XXX: taken care of in enabledisplay() */ - save->tv_dac_cntl = RADEON_TV_DAC_NBLANK | RADEON_TV_DAC_NHOLD - | (8 << 16) | (6 << 20); + save->tv_dac_cntl = /*RADEON_TV_DAC_NBLANK | RADEON_TV_DAC_NHOLD + |*/ (8 << 16) | (6 << 20); if (radeon_output->tvStd == TV_STD_NTSC) save->tv_dac_cntl |= RADEON_TV_DAC_STD_NTSC; |