diff options
author | Adam Jackson <ajax@redhat.com> | 2011-12-19 17:31:45 -0500 |
---|---|---|
committer | Adam Jackson <ajax@redhat.com> | 2011-12-19 17:31:45 -0500 |
commit | 92cb819839a2f37c3e3db4831aa45e5bb9b00651 (patch) | |
tree | c7fac411755ac7a3c6908ae182f34cb5ec710d61 | |
parent | 4ea96c222ad0900ad53f506e485588e2a49a22f4 (diff) |
Make failure to XAA non-fatal
Signed-off-by: Adam Jackson <ajax@redhat.com>
-rw-r--r-- | src/tdfx_driver.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/tdfx_driver.c b/src/tdfx_driver.c index 8225c6f..a86d9e8 100644 --- a/src/tdfx_driver.c +++ b/src/tdfx_driver.c @@ -1103,10 +1103,11 @@ TDFXPreInit(ScrnInfoPtr pScrn, int flags) return FALSE; } - if (!xf86ReturnOptValBool(pTDFX->Options, OPTION_NOACCEL, FALSE)) { + pTDFX->NoAccel = xf86ReturnOptValBool(pTDFX->Options, OPTION_NOACCEL, FALSE); + if (!pTDFX->NoAccel) { if (!xf86LoadSubModule(pScrn, "xaa")) { - TDFXFreeRec(pScrn); - return FALSE; + xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "No acceleration available\n"); + pTDFX->NoAccel = TRUE; } } @@ -2306,7 +2307,6 @@ TDFXScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) { miSetPixmapDepths (); - pTDFX->NoAccel=xf86ReturnOptValBool(pTDFX->Options, OPTION_NOACCEL, FALSE); #ifdef XF86DRI /* * Setup DRI after visuals have been established, but before fbScreenInit |