Make failure to XAA non-fatal

No shadowfb support in this driver yet.

Signed-off-by: Adam Jackson <ajax@redhat.com>

2 files changed, 6 insertions, 4 deletions

diff --git a/src/i740.h b/src/i740.h
index 12a5597..7da7ebc 100644
--- a/src/i740.h
+++ b/src/i740.h
@@ -140,6 +140,7 @@ typedef struct _I740Rec {
   /*-*/
 
   Bool usevgacompat;
+  Bool NoAccel;
 } I740Rec;
 
 #define I740PTR(p) ((I740Ptr)((p)->driverPrivate))
diff --git a/src/i740_driver.c b/src/i740_driver.c
index 6e6b0fa..d24fa3c 100644
--- a/src/i740_driver.c
+++ b/src/i740_driver.c
@@ -725,10 +725,11 @@ I740PreInit(ScrnInfoPtr pScrn, int flags) {
     return FALSE;
   }
 
-  if (!xf86ReturnOptValBool(pI740->Options, OPTION_NOACCEL, FALSE)) {
+  pI740->NoAccel = xf86ReturnOptValBool(pI740->Options, OPTION_NOACCEL, FALSE);
+  if (!pI740->NoAccel) {
     if (!xf86LoadSubModule(pScrn, "xaa")) {
-      I740FreeRec(pScrn);
-      return FALSE;
+      xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "No acceleration available\n");
+      pI740->NoAccel = 1;
     }
   }
 
@@ -1535,7 +1536,7 @@ I740ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) {
     return FALSE;
   }
 
-  if (!xf86ReturnOptValBool(pI740->Options, OPTION_NOACCEL, FALSE)) {
+  if (!pI740->NoAccel) {
     if (!I740AccelInit(pScreen)) {
       xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
 		 "Hardware acceleration initialization failed\n");