diff options
| author | Adam Jackson <ajax@redhat.com> | 2011-12-19 16:55:30 -0500 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2011-12-19 16:55:30 -0500 |
| commit | 5b7f07f8171dd5ca4f13d7da25d7d91140b036e1 (patch) | |
| tree | 2654ad0a1dbc61d38fc9eb1c9301a03fea2594eb | |
| parent | 4b03459a835ee43d940054cbdaefa7c330bff385 (diff) | |
Make failure to XAA non-fatal
Fall back to NoAccel on G80 since there's no shadowfb support there,
otherwise fall to shadowfb.
Signed-off-by: Adam Jackson <ajax@redhat.com>
| -rw-r--r-- | src/g80_driver.c | 4 | ||||
| -rw-r--r-- | src/nv_driver.c | 6 | ||||
| -rw-r--r-- | src/riva_driver.c | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/g80_driver.c b/src/g80_driver.c index 551abe3..35e5d7e 100644 --- a/src/g80_driver.c +++ b/src/g80_driver.c @@ -429,10 +429,10 @@ G80PreInit(ScrnInfoPtr pScrn, int flags) if(!pNv->NoAccel) { switch(pNv->AccelMethod) { case XAA: - if(!xf86LoadSubModule(pScrn, "xaa")) goto fail; + if(!xf86LoadSubModule(pScrn, "xaa")) pNv->NoAccel = 1; break; case EXA: - if(!xf86LoadSubModule(pScrn, "exa")) goto fail; + if(!xf86LoadSubModule(pScrn, "exa")) pNv->NoAccel = 1; break; } } diff --git a/src/nv_driver.c b/src/nv_driver.c index 3031f8b..195299a 100644 --- a/src/nv_driver.c +++ b/src/nv_driver.c @@ -2048,9 +2048,9 @@ NVPreInit(ScrnInfoPtr pScrn, int flags) /* Load XAA if needed */ if (!pNv->NoAccel) { if (!xf86LoadSubModule(pScrn, "xaa")) { - xf86FreeInt10(pNv->pInt); - NVFreeRec(pScrn); - return FALSE; + xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Falling back to shadwwfb\n"); + pNv->NoAccel = 1; + pNv->ShadowFB = 1; } } diff --git a/src/riva_driver.c b/src/riva_driver.c index e33a7f3..f0fcab4 100644 --- a/src/riva_driver.c +++ b/src/riva_driver.c @@ -769,9 +769,9 @@ RivaPreInit(ScrnInfoPtr pScrn, int flags) /* Load XAA if needed */ if (!pRiva->NoAccel) { if (!xf86LoadSubModule(pScrn, "xaa")) { - xf86FreeInt10(pRiva->pInt); - RivaFreeRec(pScrn); - return FALSE; + xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Falling back to shadowfb\n"); + pRiva->NoAccel = 1; + pRiva->ShadowFB = 1; } } |