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

[Dave Airlie]

 configure.ac         |    2 +-
 src/radeon_driver.c  |    7 ++-----
 src/radeon_version.h |    2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

New commits:
diff-tree 64b18e246586b1043a12f381a9d4c834464ed9b5 (from be229d97e1f0282f2099c7ace7cb257a2738a58f)
Author: Dave Airlie <airlied at linux.ie>
Date:   Fri Aug 25 09:40:04 2006 +1000

    update version numbers for release

diff --git a/configure.ac b/configure.ac
index ddb9dca..3a13629 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-ati],
-        6.6.1,
+        6.6.2,
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         xf86-video-ati)
 AC_DEFINE_UNQUOTED([ATI_VERSION_MAJOR],
diff --git a/src/radeon_version.h b/src/radeon_version.h
index ca84bdb..a0f87e6 100644
--- a/src/radeon_version.h
+++ b/src/radeon_version.h
@@ -42,7 +42,7 @@
 
 #define RADEON_VERSION_MAJOR 4
 #define RADEON_VERSION_MAJOR_TILED 5
-#define RADEON_VERSION_MINOR 1
+#define RADEON_VERSION_MINOR 2
 #define RADEON_VERSION_PATCH 0
 
 #ifndef RADEON_VERSION_EXTRA
diff-tree be229d97e1f0282f2099c7ace7cb257a2738a58f (from 750ed51bc3d5119e2d2a91a05ae5a971dcd3b88a)
Author: Dave Airlie <airlied at linux.ie>
Date:   Fri Aug 25 09:39:46 2006 +1000

    make colortiling default to on all cards

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 8601113..53a3d4a 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -4642,15 +4642,12 @@ static void RADEONPreInitColorTiling(Scr
 {
     RADEONInfoPtr  info = RADEONPTR(pScrn);
 
+    info->allowColorTiling = xf86ReturnOptValBool(info->Options,
+				        OPTION_COLOR_TILING, TRUE);
     if (IS_R300_VARIANT) {
-        /* false by default on R3/4xx */
-        info->allowColorTiling = xf86ReturnOptValBool(info->Options,
-					        OPTION_COLOR_TILING, FALSE);
 	info->MaxSurfaceWidth = 3968; /* one would have thought 4096...*/
 	info->MaxLines = 4096;
     } else {
-        info->allowColorTiling = xf86ReturnOptValBool(info->Options,
-						OPTION_COLOR_TILING, TRUE);
 	info->MaxSurfaceWidth = 2048;
 	info->MaxLines = 2048;
     }