xf86-video-ati: Branch 'master'

[Dave Airlie]

 src/radeon_output.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 8fd6f69c84103b277de70181988e843da23c85b0
Author: Dave Airlie <airlied at redhat.com>
Date:   Mon Aug 17 15:50:21 2009 +1000

    radeon: move detected monitor type debugging.
    
    We should print this after DAC detection to be useful for TV

diff --git a/src/radeon_output.c b/src/radeon_output.c
index f554824..30f6f3b 100644
--- a/src/radeon_output.c
+++ b/src/radeon_output.c
@@ -281,9 +281,6 @@ radeon_ddc_connected(xf86OutputPtr output)
     } else
 	MonType = MT_NONE;
 
-    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-	       "Output: %s, Detected Monitor Type: %d\n", output->name, MonType);
-
     return MonType;
 }
 
@@ -1013,6 +1010,8 @@ radeon_detect(xf86OutputPtr output)
     }
 
 
+    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+	       "Output: %s, Detected Monitor Type: %d\n", output->name, radeon_output->MonType);
     if (output->MonInfo) {
 	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "EDID data from the display on output: %s ----------------------\n",
 		   output->name);