xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/radeon_output.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit f061308e7abcf93d1612681b935387fee23e0a24
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Fri Mar 27 01:14:12 2009 -0400

    mac mini: fix connector setup regression
    
    fixes bug 20796

diff --git a/src/radeon_output.c b/src/radeon_output.c
index 7f68f64..b5fe0ac 100644
--- a/src/radeon_output.c
+++ b/src/radeon_output.c
@@ -2082,12 +2082,12 @@ static Bool RADEONSetupAppleConnectors(ScrnInfoPtr pScrn)
 	info->BiosConnector[0].load_detection = FALSE;
 	info->BiosConnector[0].ConnectorType = CONNECTOR_DVI_I;
 	info->BiosConnector[0].valid = TRUE;
-	info->BiosConnector[0].devices = ATOM_DEVICE_CRT1_SUPPORT | ATOM_DEVICE_DFP2_SUPPORT;
+	info->BiosConnector[0].devices = ATOM_DEVICE_CRT2_SUPPORT | ATOM_DEVICE_DFP2_SUPPORT;
 	if (!radeon_add_encoder(pScrn,
 				radeon_get_encoder_id_from_supported_device(pScrn,
 									    ATOM_DEVICE_CRT1_SUPPORT,
 									    1),
-				ATOM_DEVICE_CRT1_SUPPORT))
+				ATOM_DEVICE_CRT2_SUPPORT))
 	    return FALSE;
 	if (!radeon_add_encoder(pScrn,
 				radeon_get_encoder_id_from_supported_device(pScrn,
@@ -2113,12 +2113,12 @@ static Bool RADEONSetupAppleConnectors(ScrnInfoPtr pScrn)
 	info->BiosConnector[0].load_detection = FALSE;
 	info->BiosConnector[0].ConnectorType = CONNECTOR_DVI_I;
 	info->BiosConnector[0].valid = TRUE;
-	info->BiosConnector[0].devices = ATOM_DEVICE_CRT1_SUPPORT | ATOM_DEVICE_DFP1_SUPPORT;
+	info->BiosConnector[0].devices = ATOM_DEVICE_CRT2_SUPPORT | ATOM_DEVICE_DFP1_SUPPORT;
 	if (!radeon_add_encoder(pScrn,
 				radeon_get_encoder_id_from_supported_device(pScrn,
 									    ATOM_DEVICE_CRT1_SUPPORT,
 									    1),
-				ATOM_DEVICE_CRT1_SUPPORT))
+				ATOM_DEVICE_CRT2_SUPPORT))
 	    return FALSE;
 	if (!radeon_add_encoder(pScrn,
 				radeon_get_encoder_id_from_supported_device(pScrn,