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

[Alex Deucher]

 src/radeon_exa.c |    2 +-
 src/radeon_kms.c |    6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 428125c095b18c2a2864c1aef24ac0f384b6be54
Author: Marek Olšák <maraeo at gmail.com>
Date:   Sun May 16 20:11:17 2010 +0000

    r3xx-r5xx: enable color tiling by default on KMS
    
    Signed-off-by: Marek Olšák <maraeo at gmail.com>

diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index 1ba320b..e4c1c0b 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -424,6 +424,7 @@ Bool RADEONPreInit_KMS(ScrnInfoPtr pScrn, int flags)
     RADEONEntPtr pRADEONEnt;
     DevUnion* pPriv;
     Gamma  zeros = { 0.0, 0.0, 0.0 };
+    Bool colorTilingDefault;
 
     xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
 		   "RADEONPreInit_KMS\n");
@@ -480,8 +481,11 @@ Bool RADEONPreInit_KMS(ScrnInfoPtr pScrn, int flags)
     if (!radeon_alloc_dri(pScrn))
 	return FALSE;
 
+    colorTilingDefault = info->ChipFamily >= CHIP_FAMILY_R300 &&
+                         info->ChipFamily <= CHIP_FAMILY_RS740;
+
     info->allowColorTiling = xf86ReturnOptValBool(info->Options,
-                                        OPTION_COLOR_TILING, FALSE);
+                                        OPTION_COLOR_TILING, colorTilingDefault);
     if (info->ChipFamily >= CHIP_FAMILY_R600) {
 	    xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Color tiling is not yet supported on R600/R700\n");
 	    info->allowColorTiling = FALSE;
commit 6712ce4f4715c8ce7c2fcddb52ca9b103bdd634c
Author: Marek Olšák <maraeo at gmail.com>
Date:   Sun May 16 20:09:31 2010 +0000

    rs740: follow macro-switch too
    
    Signed-off-by: Marek Olšák <maraeo at gmail.com>

diff --git a/src/radeon_exa.c b/src/radeon_exa.c
index b285f65..4f974c3 100644
--- a/src/radeon_exa.c
+++ b/src/radeon_exa.c
@@ -454,7 +454,7 @@ void *RADEONEXACreatePixmap2(ScreenPtr pScreen, int width, int height,
     /* Small pixmaps must not be macrotiled on R300, hw cannot sample them
      * correctly because samplers automatically switch to macrolinear. */
     if (info->ChipFamily >= CHIP_FAMILY_R300 &&
-        info->ChipFamily <= CHIP_FAMILY_RS690 &&
+        info->ChipFamily <= CHIP_FAMILY_RS740 &&
         (tiling & RADEON_TILING_MACRO) &&
         !RADEONMacroSwitch(width, height, bitsPerPixel, tiling,
                            info->ChipFamily >= CHIP_FAMILY_RV350)) {