do not enable color tiling on r300 chips and newer, since it doesn't work

    (yet) (Bugzilla #2504)

1 files changed, 14 insertions, 10 deletions

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index b02c8d9..f2c026b 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -4572,7 +4572,16 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
 		       "Couldn't load fbdevhw module, not using framebuffer device\n");
 	}
     }
-    
+
+    if (!info->FBDev)
+	if (!RADEONPreInitInt10(pScrn, &pInt10))
+	    goto fail;
+
+    RADEONPostInt10Check(pScrn, int10_save);
+
+    if (!RADEONPreInitConfig(pScrn))
+	goto fail;
+
     info->allowColorTiling = xf86ReturnOptValBool(info->Options,
 						OPTION_COLOR_TILING, TRUE);
     if ((info->allowColorTiling) && (info->IsSecondary)) {
@@ -4581,6 +4590,10 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
 	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Color tiling disabled for 2nd head\n");
 	info->allowColorTiling = FALSE;
     }
+    else if ((info->allowColorTiling) && (info->ChipFamily >= CHIP_FAMILY_R300)) {
+	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Color tiling disabled for r300 and newer chips\n");
+	info->allowColorTiling = FALSE;
+    }
     else if ((info->allowColorTiling) && (info->FBDev)) {
 	xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
 		   "Color tiling not supported with UseFBDev option\n");
@@ -4592,15 +4605,6 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
 	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Color tiling disabled\n");
     }
 
-    if (!info->FBDev)
-	if (!RADEONPreInitInt10(pScrn, &pInt10))
-	    goto fail;
-
-    RADEONPostInt10Check(pScrn, int10_save);
-
-    if (!RADEONPreInitConfig(pScrn))
-	goto fail;
-
     RADEONPreInitDDC(pScrn);
 
     RADEONGetBIOSInfo(pScrn, pInt10);