xf86-video-ati: Branch 'master'

[Dave Airlie]

 src/radeon_bios.c |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+)

New commits:
diff-tree 5337e7bd0069a3f2c4ab22b21a19471427ad3d81 (from bff809dc8ed07ac39e9b576a87916486a5e37156)
Author: Dave Airlie <airlied at nx6125b.(none)>
Date:   Wed May 30 08:10:44 2007 +1000

    radeon: add bios quirk for nx6125 monid

diff --git a/src/radeon_bios.c b/src/radeon_bios.c
index dd3d0a7..e62fb25 100644
--- a/src/radeon_bios.c
+++ b/src/radeon_bios.c
@@ -34,12 +34,28 @@
 #include "xf86.h"
 #include "xf86_OSproc.h"
 
+#include "xf86PciInfo.h"
 #include "radeon.h"
 #include "radeon_reg.h"
 #include "radeon_macros.h"
 #include "radeon_probe.h"
 #include "vbe.h"
 
+int RADEONBIOSApplyConnectorQuirks(ScrnInfoPtr pScrn, int connector_found)
+{
+    RADEONInfoPtr  info   = RADEONPTR(pScrn);
+    RADEONEntPtr pRADEONEnt = RADEONEntPriv(pScrn);
+
+    /* quirk for compaq nx6125 - the bios lies about the VGA DDC */
+    if (info->PciInfo->subsysVendor == PCI_VENDOR_HP) {
+      if (info->PciInfo->subsysCard == 0x308b) {
+	if (pRADEONEnt->PortInfo[1]->DDCType == DDC_CRT2)
+	  pRADEONEnt->PortInfo[1]->DDCType        = DDC_MONID;
+      }
+    }
+    return connector_found;
+}
+
 /* Read the Video BIOS block and the FP registers (if applicable). */
 Bool RADEONGetBIOSInfo(ScrnInfoPtr pScrn, xf86Int10InfoPtr  pInt10)
 {
@@ -313,6 +329,8 @@ Bool RADEONGetConnectorInfoFromBIOS (Scr
 	    connector_found = 1;
 	}
 
+	connector_found = RADEONBIOSApplyConnectorQuirks(pScrn, connector_found);
+	
 	if (connector_found == 0) {
 	    xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "No connector found in Connector Info Table.\n");
 	} else {