xf86-video-ati: Branch 'atombios-support'

[Dave Airlie]

 src/radeon_driver.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit c9a0cee97ca69e8fe1e1937c7670fa903214cded
Author: Dave Airlie <airlied at linux.ie>
Date:   Tue Dec 11 06:03:46 2007 +1000

    more zaphod fixes - some other work maybe needed

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 4afbee1..8ade8b1 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -2549,11 +2549,11 @@ static void RADEONFixZaphodOutputs(ScrnInfoPtr pScrn)
     int i;
 
     if (info->IsPrimary) {
+	xf86OutputDestroy(config->output[0]);
 	while(config->num_output > 1) {
 	    xf86OutputDestroy(config->output[1]);
 	}
     } else {
-	xf86OutputDestroy(config->output[0]);
 	while(config->num_output > 1) {
 	    xf86OutputDestroy(config->output[1]);
 	}
@@ -2597,6 +2597,10 @@ static Bool RADEONPreInitControllers(ScrnInfoPtr pScrn)
       
       output->status = (*output->funcs->detect) (output);
       ErrorF("finished output detect: %d\n", i);
+      if (info->IsPrimary || info->IsSecondary) {
+             if (output->status != XF86OutputStatusConnected)
+	         return FALSE;
+      }
     }
     ErrorF("finished all detect\n");
     return TRUE;