xf86-video-ati: Branch 'randr-1.2'

[Alex Deucher]

 src/radeon_output.c |   78 ++++++++++++++++++++++++++--------------------------
 1 files changed, 40 insertions(+), 38 deletions(-)

New commits:
diff-tree e38cad5633c974467f6417051eda8d487ac3686e (from aed193a47a939451d9a6d05b02653b1d73e1d523)
Author: Alex Deucher <alex at t41p.hsd1.va.comcast.net>
Date:   Tue May 22 00:09:46 2007 -0400

    RADEON: Only add valid connectors

diff --git a/src/radeon_output.c b/src/radeon_output.c
index c2bebf0..7fb5fb7 100644
--- a/src/radeon_output.c
+++ b/src/radeon_output.c
@@ -556,47 +556,49 @@ Bool RADEONSetupConnectors(ScrnInfoPtr p
     }
 
     for (i = 0 ; i < RADEON_MAX_BIOS_CONNECTOR; i++) {
-	RADEONOutputPrivatePtr radeon_output = xnfcalloc(sizeof(RADEONOutputPrivateRec), 1);
-	if (!radeon_output) {
-	    return FALSE;
-	}
-	radeon_output->MonType = MT_UNKNOWN;
-	radeon_output->ConnectorType = info->BiosConnector[i].ConnectorType;
-	radeon_output->DDCType = info->BiosConnector[i].DDCType;
-	if (info->IsAtomBios) {
-	    if (radeon_output->ConnectorType == CONNECTOR_DVI_D_ATOM)
-		radeon_output->DACType = DAC_NONE;
-	    else
-		radeon_output->DACType = info->BiosConnector[i].DACType;
+	if (info->BiosConnector[i].ConnectorType != CONNECTOR_NONE) {
+	    RADEONOutputPrivatePtr radeon_output = xnfcalloc(sizeof(RADEONOutputPrivateRec), 1);
+	    if (!radeon_output) {
+		return FALSE;
+	    }
+	    radeon_output->MonType = MT_UNKNOWN;
+	    radeon_output->ConnectorType = info->BiosConnector[i].ConnectorType;
+	    radeon_output->DDCType = info->BiosConnector[i].DDCType;
+	    if (info->IsAtomBios) {
+		if (radeon_output->ConnectorType == CONNECTOR_DVI_D_ATOM)
+		    radeon_output->DACType = DAC_NONE;
+		else
+		    radeon_output->DACType = info->BiosConnector[i].DACType;
+
+		if (radeon_output->ConnectorType == CONNECTOR_VGA_ATOM)
+		    radeon_output->TMDSType = TMDS_NONE;
+		else
+		    radeon_output->TMDSType = info->BiosConnector[i].TMDSType;
+	    } else {
+		if (radeon_output->ConnectorType == CONNECTOR_DVI_D)
+		    radeon_output->DACType = DAC_NONE;
+		else
+		    radeon_output->DACType = info->BiosConnector[i].DACType;
+
+		if (radeon_output->ConnectorType == CONNECTOR_CRT)
+		    radeon_output->TMDSType = TMDS_NONE;
+		else
+		    radeon_output->TMDSType = info->BiosConnector[i].TMDSType;
+	    }
+	    RADEONSetOutputType(pScrn, radeon_output);
+	    output = xf86OutputCreate(pScrn, &radeon_output_funcs, OutputType[radeon_output->type]);
+	    if (!output) {
+		return FALSE;
+	    }
+	    output->driver_private = radeon_output;
+	    output->possible_crtcs = 1;
+	    if (radeon_output->type != OUTPUT_LVDS)
+		output->possible_crtcs |= 2;
 
-	    if (radeon_output->ConnectorType == CONNECTOR_VGA_ATOM)
-		radeon_output->TMDSType = TMDS_NONE;
-	    else
-		radeon_output->TMDSType = info->BiosConnector[i].TMDSType;
-	} else {
-	    if (radeon_output->ConnectorType == CONNECTOR_DVI_D)
-		radeon_output->DACType = DAC_NONE;
-	    else
-		radeon_output->DACType = info->BiosConnector[i].DACType;
+	    output->possible_clones = 0 /*1|2*/;
 
-	    if (radeon_output->ConnectorType == CONNECTOR_CRT)
-		radeon_output->TMDSType = TMDS_NONE;
-	    else
-		radeon_output->TMDSType = info->BiosConnector[i].TMDSType;
+	    RADEONInitConnector(output);
 	}
-	RADEONSetOutputType(pScrn, radeon_output);
-	output = xf86OutputCreate(pScrn, &radeon_output_funcs, OutputType[radeon_output->type]);
-	if (!output) {
-	    return FALSE;
-	}
-	output->driver_private = radeon_output;
-	output->possible_crtcs = 1;
-	if (radeon_output->type != OUTPUT_LVDS)
- 	    output->possible_crtcs |= 2;
-
-	output->possible_clones = 0 /*1|2*/;
-
-	RADEONInitConnector(output);
     }
 
     /* if it's a mobility make sure we have a LVDS port */