diff options
| author | Adam Jackson <ajax@redhat.com> | 2011-12-19 16:15:49 -0500 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2011-12-19 16:15:49 -0500 |
| commit | d5f706dc5a2b6665e2b57a547781f2b9364d4d83 (patch) | |
| tree | b9baff55250f3486add1e19f6fa3ad57218bbaae | |
| parent | 706f4931bfa8ade57b3fca119fd788fc9163dd43 (diff) | |
Make failure to XAA non-fatal
No shadowfb support in this driver yet.
Signed-off-by: Adam Jackson <ajax@redhat.com>
| -rw-r--r-- | src/ast_driver.c | 12 |
1 files 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 */ |