xf86-video-ati: Branch 'master'

[Dave Airlie]

 src/radeon_atombios.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 1c647279f021d01e110980727b7c7dd7efae1642
Author: Dave Airlie <airlied at linux.ie>
Date:   Thu Jan 3 11:55:28 2008 +1000

    r600: change devices list depending on connector

diff --git a/src/radeon_atombios.c b/src/radeon_atombios.c
index f4d7b2b..b352a56 100644
--- a/src/radeon_atombios.c
+++ b/src/radeon_atombios.c
@@ -1533,7 +1533,12 @@ RADEONGetATOMConnectorInfoFromBIOSObject (ScrnInfoPtr pScrn)
 		break;
 	    case ENCODER_OBJECT_ID_INTERNAL_DAC2:
 	    case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC2:
-		info->BiosConnector[i].devices |= (1 << ATOM_DEVICE_CRT2_INDEX) | (1<<ATOM_DEVICE_TV1_INDEX);
+		if (info->BiosConnector[i].ConnectorType == CONNECTOR_DIN ||
+		    info->BiosConnector[i].ConnectorType == CONNECTOR_STV ||
+		    info->BiosConnector[i].ConnectorType == CONNECTOR_CTV)
+		    info->BiosConnector[i].devices |= (1 << ATOM_DEVICE_TV1_INDEX);
+		else
+		    info->BiosConnector[i].devices |= (1 << ATOM_DEVICE_CRT2_INDEX);
 		info->BiosConnector[i].DACType = DAC_TVDAC;
 		break;
 	    }