xf86-video-r128: Branch 'master'

[Connor Behan]

 src/r128_driver.c |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 4efc87f41d770c753ddf7f54fe334b6dbd7daf79
Author: Connor Behan <connor.behan at gmail.com>
Date:   Mon Apr 28 21:26:44 2014 -0700

    Fix ScreenInit with noAccel
    
    Now that EXA is on by default, we must remember to turn it off again if
    acceleration is disabled.
    
    Signed-off-by: Connor Behan <connor.behan at gmail.com>

diff --git a/src/r128_driver.c b/src/r128_driver.c
index 0a0b82b..f425c3b 100644
--- a/src/r128_driver.c
+++ b/src/r128_driver.c
@@ -2314,6 +2314,7 @@ Bool R128ScreenInit(SCREEN_INIT_ARGS_DECL)
     miSetPixmapDepths ();
 
     noAccel = xf86ReturnOptValBool(info->Options, OPTION_NOACCEL, FALSE);
+    if (noAccel) info->useEXA = FALSE;
 
 #ifdef R128DRI
 				/* Setup DRI after visuals have been