xf86-video-ati: Branch 'master'

[Dave Airlie]

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

New commits:
commit dbc792b6abe8576d4354533f56b385dcdfc5ac85
Author: Dave Airlie <airlied at linux.ie>
Date:   Fri Dec 5 20:03:53 2008 +1000

    radeon: damn you bios, HDMI cannot have DACs.

diff --git a/src/radeon_atombios.c b/src/radeon_atombios.c
index 5e811b5..62f18cb 100644
--- a/src/radeon_atombios.c
+++ b/src/radeon_atombios.c
@@ -1676,6 +1676,9 @@ RADEONGetATOMConnectorInfoFromBIOSObject (ScrnInfoPtr pScrn)
 		break;
 	    case ENCODER_OBJECT_ID_INTERNAL_DAC1:
 	    case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC1:
+    		if (info->BiosConnector[i].ConnectorType == CONNECTOR_HDMI_TYPE_A ||
+	   	    info->BiosConnector[index].ConnectorType == CONNECTOR_HDMI_TYPE_B)
+		    break;
 		if (info->BiosConnector[i].ConnectorType == CONNECTOR_DIN ||
 		    info->BiosConnector[i].ConnectorType == CONNECTOR_STV ||
 		    info->BiosConnector[i].ConnectorType == CONNECTOR_CTV)
@@ -1687,6 +1690,9 @@ RADEONGetATOMConnectorInfoFromBIOSObject (ScrnInfoPtr pScrn)
 		break;
 	    case ENCODER_OBJECT_ID_INTERNAL_DAC2:
 	    case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC2:
+    		if (info->BiosConnector[i].ConnectorType == CONNECTOR_HDMI_TYPE_A ||
+	   	    info->BiosConnector[index].ConnectorType == CONNECTOR_HDMI_TYPE_B)
+		    break;
 		if (info->BiosConnector[i].ConnectorType == CONNECTOR_DIN ||
 		    info->BiosConnector[i].ConnectorType == CONNECTOR_STV ||
 		    info->BiosConnector[i].ConnectorType == CONNECTOR_CTV)