summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2011-12-19 17:28:33 -0500
committerAdam Jackson <ajax@redhat.com>2011-12-19 17:28:33 -0500
commit3e0d8e11927b8c68f6531eef39eb5bca557e887b (patch)
treeec05c5016b80317e218be2382b9ea8f0b2a8a0b4
parent2b459f385dc2f1b5e769e2ce84b6f4ec099c0a23 (diff)
Fall back to shadowfb if XAA is unavailable
Signed-off-by: Adam Jackson <ajax@redhat.com>
-rw-r--r--src/sis_driver.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/sis_driver.c b/src/sis_driver.c
index 7ac9487..6f7a15e 100644
--- a/src/sis_driver.c
+++ b/src/sis_driver.c
@@ -6858,8 +6858,10 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
#ifdef SIS_USE_XAA
if(!pSiS->useEXA) {
if (!xf86LoadSubModule(pScrn, "xaa")) {
- SISErrorLog(pScrn, "Could not load xaa module\n");
- goto my_error_1;
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ "Falling back to shadowfb\n");
+ pSiS->NoAccel = 1;
+ pSiS->ShadowFB = 1;
}
}
#endif
@@ -6878,7 +6880,6 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
}
}
#endif
- xf86DrvMsg(pScrn->scrnIndex, X_INFO, "2D acceleration enabled\n");
}
/* Load shadowfb (if needed) */