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

[Dave Airlie]

 configure.ac      |    2 +-
 src/r128_driver.c |    5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit e0222a5f5e7cad482044a542e4b1ebc32f774648
Author: Dave Airlie <airlied at redhat.com>
Date:   Fri Sep 28 11:22:40 2012 +1000

    r128: bump release to 6.9.0
    
    Signed-off-by: Dave Airlie <airlied at redhat.com>

diff --git a/configure.ac b/configure.ac
index edb65a3..c5cbc69 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-r128],
-        [6.8.4],
+        [6.9.0],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         [xf86-video-r128])
 AC_CONFIG_SRCDIR([Makefile.am])
commit e8b741e8fd4acebd79ee495cdd5437746ae80c39
Author: Dave Airlie <airlied at redhat.com>
Date:   Fri Sep 28 11:20:41 2012 +1000

    r128: enable EXA by default if XAA isn't available at build time.
    
    Signed-off-by: Dave Airlie <airlied at redhat.com>

diff --git a/src/r128_driver.c b/src/r128_driver.c
index ae16e97..a062a60 100644
--- a/src/r128_driver.c
+++ b/src/r128_driver.c
@@ -2251,6 +2251,11 @@ Bool R128ScreenInit(SCREEN_INIT_ARGS_DECL)
 
     R128TRACE(("R128ScreenInit %x %d\n", pScrn->memPhysBase, pScrn->fbOffset));
     info->useEXA = FALSE;
+#ifdef USE_EXA
+#ifndef HAVE_XAA_H
+    info->useEXA = TRUE;
+#endif
+#endif
 
 #ifdef USE_EXA
     optstr = (char *)xf86GetOptValString(info->Options, OPTION_ACCELMETHOD);