xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/radeon_accel.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 1ad41054989f7c3edec373ccf09dceda6d7c94b4
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Thu Apr 22 16:48:21 2010 -0400

    r3xx: fix gb pipe setup for SE cards
    
    Noticed by Tormod Volden

diff --git a/src/radeon_accel.c b/src/radeon_accel.c
index 823f91d..92503d9 100644
--- a/src/radeon_accel.c
+++ b/src/radeon_accel.c
@@ -499,9 +499,11 @@ void RADEONEngineInit(ScrnInfoPtr pScrn)
 	    }
 	}
 
-	/* RV410 SE cards only have 1 quadpipe */
+	/* SE cards only have 1 quadpipe */
 	if ((info->Chipset == PCI_CHIP_RV410_5E4C) ||
-	    (info->Chipset == PCI_CHIP_RV410_5E4F))
+	    (info->Chipset == PCI_CHIP_RV410_5E4F) ||
+	    (info->Chipset == PCI_CHIP_R300_AD) ||
+	    (info->Chipset == PCI_CHIP_R350_AH))
 	    info->accel_state->num_gb_pipes = 1;
 
 	if (IS_R300_3D || IS_R500_3D)