xf86-video-ati: Branch 'master'

[Adam Jackson]

 src/radeon_atombios.c |    3 +--
 src/radeon_output.c   |    2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 96581746eea2f4e29a04f9266ec9649f25480424
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed Jun 24 17:05:47 2009 -0400

    atom: Fix phantom VGA connector when HDMI-B present.
    
    HDMI-B is really a glorified DL-DVI connector, the analog pins work fine.

diff --git a/src/radeon_atombios.c b/src/radeon_atombios.c
index 6375626..e654228 100644
--- a/src/radeon_atombios.c
+++ b/src/radeon_atombios.c
@@ -1644,8 +1644,7 @@ static void RADEONApplyATOMQuirks(ScrnInfoPtr pScrn, int index)
     /* some BIOSes seem to report DAC on HDMI - usually this is a board with
      * HDMI + VGA reporting as HDMI
      */
-    if ((info->BiosConnector[index].ConnectorType == CONNECTOR_HDMI_TYPE_A) ||
-	(info->BiosConnector[index].ConnectorType == CONNECTOR_HDMI_TYPE_B)) {
+    if (info->BiosConnector[index].ConnectorType == CONNECTOR_HDMI_TYPE_A) {
 	if (info->BiosConnector[index].devices & (ATOM_DEVICE_CRT_SUPPORT)) {
 	    info->BiosConnector[index].devices &= ~(ATOM_DEVICE_DFP_SUPPORT);
 	    info->BiosConnector[index].ConnectorType = CONNECTOR_VGA;
diff --git a/src/radeon_output.c b/src/radeon_output.c
index e453cc2..e307bf0 100644
--- a/src/radeon_output.c
+++ b/src/radeon_output.c
@@ -234,7 +234,6 @@ radeon_ddc_connected(xf86OutputPtr output)
 	    break;
 	case CONNECTOR_DVI_D:
 	case CONNECTOR_HDMI_TYPE_A:
-	case CONNECTOR_HDMI_TYPE_B:
 	    if (radeon_output->shared_ddc) {
 		if (MonInfo->rawData[0x14] & 0x80) /* if it's digital and DVI/HDMI/etc. */
 		    MonType = MT_DFP;
@@ -249,6 +248,7 @@ radeon_ddc_connected(xf86OutputPtr output)
 	     * or AUXCH.
 	     */
 	    MonType = MT_DFP;
+	case CONNECTOR_HDMI_TYPE_B:
 	case CONNECTOR_DVI_I:
 	    if (MonInfo->rawData[0x14] & 0x80) /* if it's digital and DVI */
 		MonType = MT_DFP;