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 /src/riva_driver.c | |
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>
Diffstat (limited to 'src/riva_driver.c')
-rw-r--r-- | src/riva_driver.c | 6 |
1 files changed, 3 insertions, 3 deletions
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; } } |