xf86-video-ati: Branch 'master' - 3 commits

[Alex Deucher]

 src/radeon_dri.c    |    5 +++++
 src/radeon_driver.c |   17 ++++++++++++++---
 2 files changed, 19 insertions(+), 3 deletions(-)

New commits:
commit f564460e94c9d0f1cf3ff4b8535481b2b8b4e9c1
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Sat Aug 1 16:53:47 2009 -0400

    radeon: use XAA in some cases
    
    Use XAA in low memory situations or when the DRI is disabled.
    Using shadowfb might also be a viable option, maybe even a better option...
    fixes bug 21683

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 3f79917..29c0b11 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -2083,6 +2083,7 @@ static Bool RADEONPreInitAccel(ScrnInfoPtr pScrn)
 #if defined(USE_EXA) && defined(USE_XAA)
     char *optstr;
 #endif
+    int maxy = info->FbMapSize / (pScrn->displayWidth * info->CurrentLayout.pixel_bytes);
 
     if (!(info->accel_state = xcalloc(1, sizeof(struct radeon_accel_state)))) {
 	xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Unable to allocate accel_state rec!\n");
@@ -2109,7 +2110,16 @@ static Bool RADEONPreInitAccel(ScrnInfoPtr pScrn)
 	return TRUE;
     }
 
-    info->useEXA = TRUE;
+#ifdef XF86DRI
+    if ((!info->directRenderingEnabled) ||
+	(maxy <= pScrn->virtualY * 3) ||
+	(pScrn->videoRam <= 32768))
+	info->useEXA = FALSE;
+    else
+	info->useEXA = TRUE;
+#else
+	info->useEXA = FALSE;
+#endif
 
     if (!xf86ReturnOptValBool(info->Options, OPTION_NOACCEL, FALSE)) {
 	int errmaj = 0, errmin = 0;
@@ -2119,9 +2129,10 @@ static Bool RADEONPreInitAccel(ScrnInfoPtr pScrn)
 #if defined(USE_XAA)
 	optstr = (char *)xf86GetOptValString(info->Options, OPTION_ACCELMETHOD);
 	if (optstr != NULL) {
-	    if (xf86NameCmp(optstr, "EXA") == 0)
+	    if (xf86NameCmp(optstr, "EXA") == 0) {
 		from = X_CONFIG;
-	    else if (xf86NameCmp(optstr, "XAA") == 0) {
+		info->useEXA = TRUE;
+	    } else if (xf86NameCmp(optstr, "XAA") == 0) {
 		from = X_CONFIG;
 		if (info->ChipFamily < CHIP_FAMILY_R600)
 		    info->useEXA = FALSE;
commit c71b2f050e8996787eae463eddbfdb5864ffa65a
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 e3659ed06fc5bb8817f1dbd7c2d6bc94c67b30f7
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) */