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

[Alex Deucher]

 src/radeon_output.c |   30 ++++++++++++++++++++++++------
 1 files changed, 24 insertions(+), 6 deletions(-)

New commits:
diff-tree 9a147fef8e0e2ede2a0008c4ecfbd9b00c8dc5f6 (from bbd6faff4c6acb48970d774375c8a61861405f96)
Author: Alex Deucher <alex at t41p.hsd1.va.comcast.net>
Date:   Fri May 18 23:45:11 2007 -0400

    RADEON: if connector is VGA set TMDS to none

diff --git a/src/radeon_output.c b/src/radeon_output.c
index 3247b74..a52b1fc 100644
--- a/src/radeon_output.c
+++ b/src/radeon_output.c
@@ -553,14 +553,28 @@ Bool RADEONSetupConnectors(ScrnInfoPtr p
 	}
 	radeon_output->MonType = MT_UNKNOWN;
 	radeon_output->ConnectorType = info->BiosConnector[i].ConnectorType;
-	if ((info->IsAtomBios && radeon_output->ConnectorType == CONNECTOR_DVI_D_ATOM) ||
-	    radeon_output->ConnectorType == CONNECTOR_DVI_D)
-	    radeon_output->DACType = DAC_NONE;
-	else
-	    radeon_output->DACType = info->BiosConnector[i].DACType;
 	radeon_output->DDCType = info->BiosConnector[i].DDCType;
-	radeon_output->TMDSType = info->BiosConnector[i].TMDSType;
+	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) {
diff-tree bbd6faff4c6acb48970d774375c8a61861405f96 (from 7940ec364f3cbf02ba64b92c74cbaad4555baf38)
Author: Alex Deucher <alex at t41p.hsd1.va.comcast.net>
Date:   Fri May 18 23:30:19 2007 -0400

    RADEON: Change default LVDS i2c line for powerpc

diff --git a/src/radeon_output.c b/src/radeon_output.c
index 924c3e0..3247b74 100644
--- a/src/radeon_output.c
+++ b/src/radeon_output.c
@@ -482,7 +482,11 @@ Bool RADEONSetupConnectors(ScrnInfoPtr p
         (info->BiosConnector[1].DDCType == 0))) {
 	if (info->IsMobility) {
 	    /* Below is the most common setting, but may not be true */
+#if defined(__powerpc__)
+	    info->BiosConnector[0].DDCType = DDC_DVI;
+#else
 	    info->BiosConnector[0].DDCType = DDC_LCD;
+#endif
 	    info->BiosConnector[0].DACType = DAC_UNKNOWN;
 	    info->BiosConnector[0].TMDSType = TMDS_UNKNOWN;
 	    info->BiosConnector[0].ConnectorType = CONNECTOR_PROPRIETARY;