summaryrefslogtreecommitdiff
path: root/src/g80_driver.c
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2011-12-19 16:55:30 -0500
committerAdam Jackson <ajax@redhat.com>2011-12-19 16:55:30 -0500
commit5b7f07f8171dd5ca4f13d7da25d7d91140b036e1 (patch)
tree2654ad0a1dbc61d38fc9eb1c9301a03fea2594eb /src/g80_driver.c
parent4b03459a835ee43d940054cbdaefa7c330bff385 (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/g80_driver.c')
-rw-r--r--src/g80_driver.c4
1 files changed, 2 insertions, 2 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;
}
}