xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/radeon_bios.c |   17 +++++++++++++++++
 1 file changed, 17 insertions(+)

New commits:
diff-tree 47ef583b993607bc3a372dd125c6e5228c4ec7bf (from c9264aa53bf1470ad9104d1e7c4a8ce13c49c270)
Author: Alex Deucher <alex at botch2.(none)>
Date:   Wed Oct 10 19:35:31 2007 -0400

    RADEON: more XPRESS connector table hacks
    
    Seems XPRESS desktop chips with DVI-D list a proprietary
    connector type rather than DVI-D.  try and do the right thing.
    Also, XPRESS chips seem to include connector type 8 and ddc
    type 8 which are unknown at this time.

diff --git a/src/radeon_bios.c b/src/radeon_bios.c
index cb61428..1b46746 100644
--- a/src/radeon_bios.c
+++ b/src/radeon_bios.c
@@ -257,6 +257,23 @@ static Bool RADEONGetLegacyConnectorInfo
 		info->BiosConnector[i].DDCType = DDC_MONID;
 	    }
 
+	    /* XPRESS desktop chips seem to have a proprietary connector listed for
+	     * DVI-D, try and do the right thing here.
+	    */
+	    if ((!info->IsMobility) &&
+		(info->BiosConnector[i].ConnectorType == CONNECTOR_PROPRIETARY)) {
+		xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+			   "Proprietary connector found, assuming DVI-D\n");
+		info->BiosConnector[i].DACType = DAC_NONE;
+		info->BiosConnector[i].TMDSType = TMDS_EXT;
+		info->BiosConnector[i].ConnectorType = CONNECTOR_DVI_D;
+	    }
+
+	    if (info->BiosConnector[i].ConnectorType >= CONNECTOR_UNSUPPORTED) {
+		xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Unknown connector type: %d!\n",
+			   info->BiosConnector[i].ConnectorType);
+		info->BiosConnector[i].valid = FALSE;
+	    }
 
 	}
     } else {