xf86-video-ati: Branch '6.12-branch' - 2 commits

[Alex Deucher]

 src/radeon_dri.c |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 1dd67e5bcd4ee760926fb5bd90fa519060a22577
Author: Bryce Harrington <bryce at canonical.com>
Date:   Sat Aug 1 16:50:43 2009 -0400

    radeon: AGPMode quirk needed for SiS
    
    fixes bug 23065

diff --git a/src/radeon_dri.c b/src/radeon_dri.c
index a98e2ab..a359bc4 100644
--- a/src/radeon_dri.c
+++ b/src/radeon_dri.c
@@ -775,6 +775,9 @@ static radeon_agpmode_quirk radeon_agpmode_quirk_list[] = {
     /* Ali Corp M1671 Super P4 Northbridge / Mobility M6 LY Needs AGPMode 1 (lp #146303)*/
     { 0x10b9,0x1671,           PCI_VENDOR_ATI,0x4c59,   0x103c,0x0027,           1 },
 
+    /* SiS Host Bridge 655 / R420 [Radeon X800] Needs AGPMode 4 (lp #371296) */
+    { 0x1039,0x0655,            PCI_VENDOR_ATI,0x4a4b,  PCI_VENDOR_ATI,0x4422,   4 },
+
     /* ASRock K7VT4A+ AGP 8x / ATI Radeon 9250 AGP Needs AGPMode 4 (lp #133192) */
     { 0x1849,0x3189,            PCI_VENDOR_ATI,0x5960,  0x1787,0x5960,           4 },
 
commit 35a44bfa8fd6f2e5c7d45162c38a5c9f50c61452
Author: Bryce Harrington <bryce at canonical.com>
Date:   Sat Aug 1 16:48:48 2009 -0400

    radeon: AGPMode quirk needed for IBM Thinkpad T40 with Mobility M7 LW
    
    fixes bug 23064

diff --git a/src/radeon_dri.c b/src/radeon_dri.c
index 5feb27b..a98e2ab 100644
--- a/src/radeon_dri.c
+++ b/src/radeon_dri.c
@@ -745,6 +745,8 @@ static radeon_agpmode_quirk radeon_agpmode_quirk_list[] = {
     { PCI_VENDOR_INTEL,0x2570,  PCI_VENDOR_ATI,0x4a4e,  PCI_VENDOR_DELL,0x5106,  4 },
     /* Intel 82865G/PE/P DRAM Controller/Host-Hub / RV280 [Radeon 9200 SE] Needs AGPMode 4 (lp #300304) */
     { PCI_VENDOR_INTEL,0x2570,  PCI_VENDOR_ATI,0x5964,  0x148c,0x2073,           4 },
+    /* Intel 82855PM host bridge / Mobility M7 LW Needs AGPMode 4 (lp: #353996) */
+    { PCI_VENDOR_INTEL,0x3340,  PCI_VENDOR_ATI,0x4c57, PCI_VENDOR_IBM,0x0530,    4 },
     /* Intel 82855PM Processor to I/O Controller / Mobility M6 LY Needs AGPMode 1 (deb #467235) */
     { PCI_VENDOR_INTEL,0x3340,  PCI_VENDOR_ATI,0x4c59,  PCI_VENDOR_IBM,0x052f,   1 },
     /* Intel 82855PM host bridge / Mobility 9600 M10 RV350 Needs AGPMode 1 (lp #195051) */