xf86-video-ati: Branch 'master'

[Alex Deucher]

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

New commits:
commit 4af825f7b13cba8c3b204e72a07cab5009331240
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Fri Sep 19 00:29:20 2008 -0400

    radeon: Add quirk for macbook
    
    - should fix bug 17625

diff --git a/src/radeon_atombios.c b/src/radeon_atombios.c
index f0a3a31..e96bba3 100644
--- a/src/radeon_atombios.c
+++ b/src/radeon_atombios.c
@@ -1734,6 +1734,21 @@ static void RADEONApplyATOMQuirks(ScrnInfoPtr pScrn, int index)
 	}
     }
 
+    /* Funky macbooks */
+    if ((info->Chipset == PCI_CHIP_RV530_71C5) &&
+	(PCI_SUB_VENDOR_ID(info->PciInfo) == 0x106b) &&
+	(PCI_SUB_DEVICE_ID(info->PciInfo) == 0x0080)) {
+	if ((info->BiosConnector[index].ConnectorType == CONNECTOR_DVI_D) &&
+	    (info->BiosConnector[index].TMDSType == TMDS_EXT)) {
+	    info->BiosConnector[index].valid = FALSE;
+	}
+	if ((info->BiosConnector[index].ConnectorType == CONNECTOR_DVI_D) &&
+	    (info->BiosConnector[index].DACType == DAC_NONE)) {
+	    info->BiosConnector[index].DACType = DAC_TVDAC;
+	    info->BiosConnector[index].devices |= (1 << ATOM_DEVICE_CRT2_INDEX);
+	}
+    }
+
 }
 
 Bool