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

[Michel Dänzer]

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

New commits:
commit 4853ab2cdc3b97948c7cd69eaf4fff54f59774fc
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Fri Nov 4 12:15:53 2011 +0100

    Turn compile time check into runtime check.
    
    Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>

diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index e470617..1604f25 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -678,12 +678,9 @@ Bool RADEONPreInit_KMS(ScrnInfoPtr pScrn, int flags)
     /* don't enable tiling if accel is not enabled */
     if (!info->r600_shadow_fb) {
 	Bool colorTilingDefault =
-#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,9,4,901,0)
+	    xorgGetVersion() >= XORG_VERSION_NUMERIC(1,9,4,901,0) &&
 	    info->ChipFamily >= CHIP_FAMILY_R300 &&
 	    info->ChipFamily <= CHIP_FAMILY_CAYMAN;
-#else
-	FALSE;
-#endif
 
 	if (info->ChipFamily >= CHIP_FAMILY_R600) {
 	    /* set default group bytes, overridden by kernel info below */
commit bcdb54fe16ebf2e239b84eebf20e8adfe5094bff
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Thu Oct 20 11:11:35 2011 -0400

    check for xserver 1.9.4.901 to enable tiling by default
    
    Previous xservers had a bug in the EXA code which caused
    display corruption in some cases.
    
    See:
    https://bugs.freedesktop.org/show_bug.cgi?id=33929
    
    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>

diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index 32065fb..e470617 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -677,8 +677,13 @@ Bool RADEONPreInit_KMS(ScrnInfoPtr pScrn, int flags)
 #ifdef EXA_MIXED_PIXMAPS
     /* don't enable tiling if accel is not enabled */
     if (!info->r600_shadow_fb) {
-	Bool colorTilingDefault = info->ChipFamily >= CHIP_FAMILY_R300 &&
+	Bool colorTilingDefault =
+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,9,4,901,0)
+	    info->ChipFamily >= CHIP_FAMILY_R300 &&
 	    info->ChipFamily <= CHIP_FAMILY_CAYMAN;
+#else
+	FALSE;
+#endif
 
 	if (info->ChipFamily >= CHIP_FAMILY_R600) {
 	    /* set default group bytes, overridden by kernel info below */