xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/radeon_atombios.c |    6 +++++-
 src/radeon_output.c   |    3 ++-
 src/radeon_probe.h    |    3 ++-
 3 files changed, 9 insertions(+), 3 deletions(-)

New commits:
commit a7b5c3bb74fc4de5e38a75ac31656445ce823464
Author: Alex Deucher <alex at cube.(none)>
Date:   Fri Feb 22 19:35:11 2008 -0500

    RS6xx: fix DDC on DDIA output (usually HDMI port)

diff --git a/src/radeon_atombios.c b/src/radeon_atombios.c
index ddd332f..fbe937d 100644
--- a/src/radeon_atombios.c
+++ b/src/radeon_atombios.c
@@ -1759,6 +1759,10 @@ RADEONGetATOMConnectorInfoFromBIOSConnectorTable (ScrnInfoPtr pScrn)
 	    (i == ATOM_DEVICE_TV2_INDEX) ||
 	    (i == ATOM_DEVICE_CV_INDEX))
 	    info->BiosConnector[i].ddc_i2c.valid = FALSE;
+	else if ((i == ATOM_DEVICE_DFP3_INDEX) && info->IsIGP)
+	    /* DDIA port uses gpio entry 3 */
+	    info->BiosConnector[i].ddc_i2c =
+		RADEONLookupGPIOLineForDDC(pScrn, 3);
 	else
 	    info->BiosConnector[i].ddc_i2c =
 		RADEONLookupGPIOLineForDDC(pScrn, ci.sucI2cId.sbfAccess.bfI2C_LineMux);
@@ -1772,7 +1776,7 @@ RADEONGetATOMConnectorInfoFromBIOSConnectorTable (ScrnInfoPtr pScrn)
 		info->BiosConnector[i].TMDSType = TMDS_EXT;
 	} else if (i == ATOM_DEVICE_DFP3_INDEX) {
 	    if (info->IsIGP)
-		info->BiosConnector[i].TMDSType = TMDS_EXT;
+		info->BiosConnector[i].TMDSType = TMDS_DDIA;
 	    else
 		info->BiosConnector[i].TMDSType = TMDS_LVTMA;
 	} else
diff --git a/src/radeon_output.c b/src/radeon_output.c
index 48cac7d..62cc5d4 100644
--- a/src/radeon_output.c
+++ b/src/radeon_output.c
@@ -74,11 +74,12 @@ const RADEONMonitorType MonTypeID[10] = {
   MT_DP
 };
 
-const char *TMDSTypeName[4] = {
+const char *TMDSTypeName[5] = {
   "None",
   "Internal",
   "External",
   "LVTMA",
+  "DDIA"
 };
 
 const char *DACTypeName[4] = {
diff --git a/src/radeon_probe.h b/src/radeon_probe.h
index a3cf1fc..9c1bdc5 100644
--- a/src/radeon_probe.h
+++ b/src/radeon_probe.h
@@ -103,7 +103,8 @@ typedef enum
     TMDS_NONE    = 0,
     TMDS_INT     = 1,
     TMDS_EXT     = 2,
-    TMDS_LVTMA   = 3
+    TMDS_LVTMA   = 3,
+    TMDS_DDIA    = 4
 } RADEONTmdsType;
 
 typedef enum