From d5f706dc5a2b6665e2b57a547781f2b9364d4d83 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Mon, 19 Dec 2011 16:15:49 -0500 Subject: Make failure to XAA non-fatal No shadowfb support in this driver yet. Signed-off-by: Adam Jackson --- src/ast_driver.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ast_driver.c b/src/ast_driver.c index 1f85816..024a0c3 100644 --- a/src/ast_driver.c +++ b/src/ast_driver.c @@ -692,11 +692,11 @@ ASTPreInit(ScrnInfoPtr pScrn, int flags) pAST->pCMDQPtr = NULL; pAST->CMDQInfo.ulCMDQSize = 0; #ifdef Accel_2D - if (!xf86ReturnOptValBool(pAST->Options, OPTION_NOACCEL, FALSE)) - { - if (!xf86LoadSubModule(pScrn, "xaa")) { - ASTFreeRec(pScrn); - return FALSE; + if (!xf86ReturnOptValBool(pAST->Options, OPTION_NOACCEL, FALSE)) do { + if (!xf86LoadSubModule(pScrn, "xaa")) {\ + xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "XAA not available\n"); + pAST->noAccel = TRUE; + break; } pAST->noAccel = FALSE; @@ -718,7 +718,7 @@ ASTPreInit(ScrnInfoPtr pScrn, int flags) if (!xf86GetOptValInteger(pAST->Options, OPTION_DBG_SELECT, &pAST->DBGSelect)) { xf86DrvMsg(pScrn->scrnIndex, X_INFO, "No DBG Seleclt options found\n"); } - } + } while (0); #endif /* HW Cursor Check */ -- cgit v1.2.3