RADEON: fixes

- fix output ordering
- set tv-out to return un-connected for now in radeon_detect()

2 files changed, 16 insertions, 14 deletions

diff --git a/src/radeon_bios.c b/src/radeon_bios.c
index fe1d091..4556552 100644
--- a/src/radeon_bios.c
+++ b/src/radeon_bios.c
@@ -200,13 +200,13 @@ static Bool RADEONGetATOMConnectorInfoFromBIOS (ScrnInfoPtr pScrn)
 
     /* DVI-I ports have 2 entries: one for analog, one for digital.  combine them */
     if (info->BiosConnector[0].valid && info->BiosConnector[7].valid) {
-	info->BiosConnector[0].TMDSType = info->BiosConnector[7].TMDSType;
-	info->BiosConnector[7].valid = FALSE;
+	info->BiosConnector[7].DACType = info->BiosConnector[0].DACType;
+	info->BiosConnector[0].valid = FALSE;
     }
 
     if (info->BiosConnector[4].valid && info->BiosConnector[3].valid) {
-	info->BiosConnector[4].TMDSType = info->BiosConnector[3].TMDSType;
-	info->BiosConnector[3].valid = FALSE;
+	info->BiosConnector[3].DACType = info->BiosConnector[4].DACType;
+	info->BiosConnector[4].valid = FALSE;
     }
 
 
diff --git a/src/radeon_output.c b/src/radeon_output.c
index 0cd1183..f65507a 100644
--- a/src/radeon_output.c
+++ b/src/radeon_output.c
@@ -1038,9 +1038,11 @@ radeon_detect(xf86OutputPtr output)
 
     /* assume tv is connected for now */
     if (radeon_output->type == OUTPUT_STV) {
-	radeon_output->MonType = MT_STV;
+	/*radeon_output->MonType = MT_STV;*/
+	radeon_output->MonType = MT_NONE;
     } else if (radeon_output->type == OUTPUT_CTV) {
-	radeon_output->MonType = MT_CTV;
+	/*radeon_output->MonType = MT_CTV;*/
+	radeon_output->MonType = MT_NONE;
     } else {
 	radeon_output->MonType = MT_UNKNOWN;
 	RADEONConnectorFindMonitor(pScrn, output);
@@ -1851,17 +1853,17 @@ Bool RADEONSetupConnectors(ScrnInfoPtr pScrn)
 		    (info->BiosConnector[i].ConnectorType == CONNECTOR_DVI_I_ATOM) ||
 		    (info->BiosConnector[i].ConnectorType == CONNECTOR_DVI_A_ATOM)) {
 		    if (num_dvi > 1) {
-			output = xf86OutputCreate(pScrn, &radeon_output_funcs, "DVI-1");
+			output = xf86OutputCreate(pScrn, &radeon_output_funcs, "DVI-0");
 			num_dvi--;
 		    } else {
-			output = xf86OutputCreate(pScrn, &radeon_output_funcs, "DVI-0");
+			output = xf86OutputCreate(pScrn, &radeon_output_funcs, "DVI-1");
 		    }
 		} else if (info->BiosConnector[0].ConnectorType == CONNECTOR_VGA_ATOM) {
 		    if (num_vga > 1) {
-			output = xf86OutputCreate(pScrn, &radeon_output_funcs, "VGA-1");
+			output = xf86OutputCreate(pScrn, &radeon_output_funcs, "VGA-0");
 			num_vga--;
 		    } else {
-			output = xf86OutputCreate(pScrn, &radeon_output_funcs, "VGA-0");
+			output = xf86OutputCreate(pScrn, &radeon_output_funcs, "VGA-1");
 		    }
 		} else
 		    output = xf86OutputCreate(pScrn, &radeon_output_funcs, OutputType[radeon_output->type]);
@@ -1869,17 +1871,17 @@ Bool RADEONSetupConnectors(ScrnInfoPtr pScrn)
 		if ((info->BiosConnector[i].ConnectorType == CONNECTOR_DVI_D) ||
 		     (info->BiosConnector[i].ConnectorType == CONNECTOR_DVI_I)) {
 		    if (num_dvi > 1) {
-			output = xf86OutputCreate(pScrn, &radeon_output_funcs, "DVI-1");
+			output = xf86OutputCreate(pScrn, &radeon_output_funcs, "DVI-0");
 			num_dvi--;
 		    } else {
-			output = xf86OutputCreate(pScrn, &radeon_output_funcs, "DVI-0");
+			output = xf86OutputCreate(pScrn, &radeon_output_funcs, "DVI-1");
 		    }
 		} else if (info->BiosConnector[0].ConnectorType == CONNECTOR_CRT) {
 		    if (num_vga > 1) {
-			output = xf86OutputCreate(pScrn, &radeon_output_funcs, "VGA-1");
+			output = xf86OutputCreate(pScrn, &radeon_output_funcs, "VGA-0");
 			num_vga--;
 		    } else {
-			output = xf86OutputCreate(pScrn, &radeon_output_funcs, "VGA-0");
+			output = xf86OutputCreate(pScrn, &radeon_output_funcs, "VGA-1");
 		    }
 		} else
 		    output = xf86OutputCreate(pScrn, &radeon_output_funcs, OutputType[radeon_output->type]);