xf86-video-ati: Branch 'randr-1.2'

[Alex Deucher]

 src/radeon_tv.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
diff-tree 36c22a49580d86a6518b67f31a78bd53d39491af (from 9470bd67731059f26859ed5f0bea3ade09e2c80c)
Author: Alex Deucher <alex at t41p.hsd1.va.comcast.net>
Date:   Tue Aug 21 20:28:39 2007 -0400

    RADEON: fix tv-out on R3xx
    
    R3xx apparently needs the tv clock forced on.

diff --git a/src/radeon_tv.c b/src/radeon_tv.c
index 8dbe974..73bf34d 100644
--- a/src/radeon_tv.c
+++ b/src/radeon_tv.c
@@ -338,9 +338,11 @@ void RADEONInitTVRegisters(xf86OutputPtr
 			    | RADEON_DVS_ASYNC_RST
 			    | RADEON_CRT_FIFO_CE_EN
 			    | RADEON_TV_FIFO_CE_EN
-			    | RADEON_TVCLK_ALWAYS_ONb
 			    | RADEON_TV_ON);
 
+    if (!IS_R300_VARIANT)
+	save->tv_master_cntl |= RADEON_TVCLK_ALWAYS_ONb;
+
     save->tv_modulator_cntl1 = RADEON_SLEW_RATE_LIMIT
 	                       | RADEON_SYNC_TIP_LEVEL
 	                       | RADEON_YFLT_EN