diff options
| author | Alex Deucher <alex@botch2.(none)> | 2008-01-19 18:49:53 -0500 |
|---|---|---|
| committer | Alex Deucher <alex@botch2.(none)> | 2008-01-19 18:49:53 -0500 |
| commit | a43003b24022a833e604f41b2873c0350b34181c (patch) | |
| tree | 051124fc3c01d8eb0ff030fe8d4d4df3a26883c0 /src/radeon_tv.c | |
| parent | d4596c52ac9994be26e9ec2d7d57b3892c34abdb (diff) | |
RADEON: get dac2 adj values from the bios tables
Diffstat (limited to 'src/radeon_tv.c')
| -rw-r--r-- | src/radeon_tv.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/radeon_tv.c b/src/radeon_tv.c index 51f21d0a..d5d1e9e7 100644 --- a/src/radeon_tv.c +++ b/src/radeon_tv.c @@ -841,9 +841,15 @@ void RADEONInitTVRegisters(xf86OutputPtr output, RADEONSavePtr save, tmp = (tmp << RADEON_UV_OUTPUT_POST_SCALE_SHIFT) | 0x000b0000; save->tv_timing_cntl = tmp; - save->tv_dac_cntl = (RADEON_TV_DAC_NBLANK | - RADEON_TV_DAC_NHOLD | - radeon_output->tv_dac_adj /*(8 << 16) | (6 << 20)*/); + if (radeon_output->tvStd == TV_STD_NTSC || + radeon_output->tvStd == TV_STD_NTSC_J || + radeon_output->tvStd == TV_STD_PAL_M || + radeon_output->tvStd == TV_STD_PAL_60) + save->tv_dac_cntl = radeon_output->ntsc_tvdac_adj; + else + save->tv_dac_cntl = radeon_output->pal_tvdac_adj; + + save->tv_dac_cntl |= (RADEON_TV_DAC_NBLANK | RADEON_TV_DAC_NHOLD); if (radeon_output->tvStd == TV_STD_NTSC || radeon_output->tvStd == TV_STD_NTSC_J) |