xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/radeon_output.c |   10 ++++++++++
 1 file changed, 10 insertions(+)

New commits:
diff-tree 5db3afaa1fdb69d382ac769ef40191a4b964d28e (from 1148d332f52f3780897aae3fcd5d6a67687c42cd)
Author: Alex Deucher <alex at t41p.hsd1.va.comcast.net>
Date:   Thu Oct 11 20:25:20 2007 -0400

    RADEON: return status unknown for flaky chip/connector combinations
    
    This should at least get something on the screen.
    XPRESS chips, I'm looking in your general direction...

diff --git a/src/radeon_output.c b/src/radeon_output.c
index 643cbc4..4229eee 100644
--- a/src/radeon_output.c
+++ b/src/radeon_output.c
@@ -1647,6 +1647,16 @@ radeon_detect(xf86OutputPtr output)
 	  break;
       }
 
+      if (!connected) {
+	  /* default to unknown for flaky chips/connectors
+	   * so we can get something on the screen
+	   */
+	  if (((radeon_output->type == OUTPUT_VGA || radeon_output->type == OUTPUT_DVI) &&
+	       radeon_output->DACType == DAC_TVDAC) ||
+	      (info->IsIGP && radeon_output->type == OUTPUT_DVI))
+	      return XF86OutputStatusUnknown;
+      }
+
       if (connected)
 	  return XF86OutputStatusConnected;
       else