summaryrefslogtreecommitdiff
path: root/src/radeon_tv.c
diff options
context:
space:
mode:
authorAlex Deucher <alex@botch2.com>2007-08-02 02:11:20 -0400
committerAlex Deucher <alex@botch2.com>2007-08-02 02:11:20 -0400
commitb66a1bc7994b33d349c1519761e431959311c85f (patch)
treebfaa478bcfc8896d6fe21cf6887f8786b4046dc0 /src/radeon_tv.c
parentd86592c8d5ce45d81d8a726c263e870e94fbcf11 (diff)
RADEON: fix tv-out enable/disable
Diffstat (limited to 'src/radeon_tv.c')
-rw-r--r--src/radeon_tv.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/radeon_tv.c b/src/radeon_tv.c
index 38fbcd0e..b802234e 100644
--- a/src/radeon_tv.c
+++ b/src/radeon_tv.c
@@ -405,17 +405,14 @@ void RADEONInitTVRegisters(xf86OutputPtr output, RADEONSavePtr save,
tmp = (tmp << RADEON_UV_OUTPUT_POST_SCALE_SHIFT) | 0x000b0000;
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;
else
save->tv_dac_cntl |= RADEON_TV_DAC_STD_PAL;
-#if 1
- /* XXX: taken care of in enabledisplay() */
+#if 0
save->tv_dac_cntl |= (RADEON_TV_DAC_RDACPD | RADEON_TV_DAC_GDACPD
| RADEON_TV_DAC_BDACPD);