diff options
| author | Dave Airlie <airlied@linux.ie> | 2007-12-11 06:03:46 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2007-12-11 06:03:46 +1000 |
| commit | c9a0cee97ca69e8fe1e1937c7670fa903214cded (patch) | |
| tree | 0024f6d4adc5420d8c343a64489733e1a1ae73c6 /src/radeon_driver.c | |
| parent | 731830297f2fc4a416882aacfb0d9b5f8ed32520 (diff) | |
more zaphod fixes - some other work maybe needed
Diffstat (limited to 'src/radeon_driver.c')
| -rw-r--r-- | src/radeon_driver.c | 6 |
1 files changed, 5 insertions, 1 deletions
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; |