xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/radeon_kms.c |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

New commits:
commit e142e55c56d8440d7185b594c696ec9eeb699cda
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Tue Nov 30 15:51:21 2010 -0500

    evergreen: set default group_bytes to 256
    
    512 seems to cause issues on certain cards.
    
    Fixes:
    https://bugs.freedesktop.org/show_bug.cgi?id=31724

diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index 0cd419f..f4c54b3 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -603,11 +603,8 @@ Bool RADEONPreInit_KMS(ScrnInfoPtr pScrn, int flags)
                          info->ChipFamily <= CHIP_FAMILY_RS740;
 
     if (info->ChipFamily >= CHIP_FAMILY_R600) {
-	/* set default group bytes, overriden by kernel info below */
-	if (info->ChipFamily >= CHIP_FAMILY_CEDAR)
-	    info->group_bytes = 512;
-	else
-	    info->group_bytes = 256;
+	/* set default group bytes, overridden by kernel info below */
+	info->group_bytes = 256;
 	if (info->dri->pKernelDRMVersion->version_minor >= 6) {
 	    info->allowColorTiling = xf86ReturnOptValBool(info->Options,
 							  OPTION_COLOR_TILING, colorTilingDefault);