xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/radeon_output.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
diff-tree 81b708dbd35c29bf2d67e8c655af97b60e61498b (from c3ab53159d42157985a25e9125eaa5362273b73d)
Author: Alex Deucher <alex at botch2.(none)>
Date:   Mon Sep 17 23:54:03 2007 -0400

    RADEON: turn off load detection on tv dac by default
    
    it's just too unreliable and even when it is most people
    don't want it.  enable it via output attribute or force
    the outputs on with xrandr

diff --git a/src/radeon_output.c b/src/radeon_output.c
index 44bc0ef..19bea2d 100644
--- a/src/radeon_output.c
+++ b/src/radeon_output.c
@@ -1811,9 +1811,9 @@ radeon_create_resources(xf86OutputPtr ou
 
 	if (radeon_output->DACType == DAC_PRIMARY)
 	    data = 1; /* primary dac, only drives vga */
-	else if (radeon_output->DACType == DAC_TVDAC &&
+	/*else if (radeon_output->DACType == DAC_TVDAC &&
 		 info->tvdac_use_count < 2)
-	    data = 1; /* only one output with tvdac */
+		 data = 1;*/ /* only one output with tvdac */
 	else
 	    data = 0; /* shared tvdac between vga/dvi/tv */
 
@@ -2621,9 +2621,9 @@ void RADEONInitConnector(xf86OutputPtr o
 
     if (radeon_output->DACType == DAC_PRIMARY)
 	radeon_output->load_detection = 1; /* primary dac, only drives vga */
-    else if (radeon_output->DACType == DAC_TVDAC &&
+    /*else if (radeon_output->DACType == DAC_TVDAC &&
 	     info->tvdac_use_count < 2)
-	radeon_output->load_detection = 1; /* only one output with tvdac */
+	     radeon_output->load_detection = 1;*/ /* only one output with tvdac */
     else
 	radeon_output->load_detection = 0; /* shared tvdac between vga/dvi/tv */