xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/radeon_kms.c |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit f0d9d80fee4176eaba9435a9539f29d0eefe2a87
Author: Luca Tettamanti <kronos.it at gmail.com>
Date:   Sat Oct 24 16:45:23 2009 -0400

    Disable color tiling on r600/r700
    
    Not supported yet.

diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index b3fe20c..8e46a8a 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -411,6 +411,10 @@ Bool RADEONPreInit_KMS(ScrnInfoPtr pScrn, int flags)
 
     info->allowColorTiling = xf86ReturnOptValBool(info->Options,
                                         OPTION_COLOR_TILING, FALSE);
+    if (info->ChipFamily >= CHIP_FAMILY_R600) {
+	    xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Color tiling is not yet supported on R600/R700\n");
+	    info->allowColorTiling = FALSE;
+    }
     xf86DrvMsg(pScrn->scrnIndex, X_INFO,
 	 "KMS Color Tiling: %sabled\n", info->allowColorTiling ? "en" : "dis");