From f66da557eb7773856081bda2465973dfabf3eaa0 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Mon, 19 Dec 2011 16:09:34 -0500
Subject: Fall back to shadowfb if XAA fails to load

Signed-off-by: Adam Jackson <ajax@redhat.com>
---
 src/apm_driver.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/apm_driver.c b/src/apm_driver.c
index 4e548a4..2471478 100644
--- a/src/apm_driver.c
+++ b/src/apm_driver.c
@@ -992,8 +992,9 @@ ApmPreInit(ScrnInfoPtr pScrn, int flags)
     /* Load XAA if needed */
     if (!pApm->NoAccel) {
 	if (!xf86LoadSubModule(pScrn, "xaa")) {
-	    ApmFreeRec(pScrn);
-	    return FALSE;
+	    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Falling back to shadowfb\n");
+	    pApm->NoAccel = TRUE;
+	    pApm->ShadowFB = TRUE;
 	}
     }
 
-- 
cgit v1.2.3