xf86-video-mach64: Branch 'master'

[Adam Jackson]

 src/atiload.c |   18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

New commits:
commit fa20f8f2408ac81ff04d81196a56c907fba01c45
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Dec 19 16:45:25 2011 -0500

    Fall back to shadowfb if XAA is unavailable
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>

diff --git a/src/atiload.c b/src/atiload.c
index 621b0b0..b96ed4b 100644
--- a/src/atiload.c
+++ b/src/atiload.c
@@ -43,11 +43,6 @@ ATILoadModules
 {
     pointer fbPtr = NULL;
 
-    /* Load shadow frame buffer code if needed */
-    if (pATI->OptionShadowFB &&
-        !xf86LoadSubModule(pScreenInfo, "shadowfb"))
-        return NULL;
-
     /* Load depth-specific entry points */
     switch (pATI->bitsPerPixel)
     {
@@ -90,9 +85,18 @@ ATILoadModules
 #ifdef USE_XAA
     /* Load XAA if needed */
     if (!pATI->useEXA && pATI->OptionAccel &&
-        !xf86LoadSubModule(pScreenInfo, "xaa"))
-        return NULL;
+        !xf86LoadSubModule(pScreenInfo, "xaa")) {
+	xf86DrvMsg(pScreenInfo->scrnIndex, X_INFO,
+		   "Falling back to shadowfb\n");
+	pATI->OptionAccel = 0;
+	pATI->OptionShadowFB = 1;
+    }
 #endif
 
+    /* Load shadow frame buffer code if needed */
+    if (pATI->OptionShadowFB &&
+        !xf86LoadSubModule(pScreenInfo, "shadowfb"))
+        return NULL;
+
     return fbPtr;
 }