summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu.herrb@laas.fr>2013-06-10 21:51:08 +0200
committerMatthieu Herrb <matthieu.herrb@laas.fr>2013-06-10 22:02:47 +0200
commit181b60190c1f81fc9b9b5deb07d536b78f2536ab (patch)
tree56088148de83d83db7f86bbafcfad55415d7dfe7
parent46e71051e0eb879a3d08ceb5675afbfdbff1f57b (diff)
Unbreak when XAA is not present.
Turn accel off if loading XAA fails. Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--src/ffb_driver.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/ffb_driver.c b/src/ffb_driver.c
index af13484..7f17d64 100644
--- a/src/ffb_driver.c
+++ b/src/ffb_driver.c
@@ -413,9 +413,12 @@ FFBPreInit(ScrnInfoPtr pScrn, int flags)
return FALSE;
}
- if (xf86LoadSubModule(pScrn, "xaa") == NULL) {
- FFBFreeRec(pScrn);
- return FALSE;
+ if (!pFfb->NoAccel) {
+ if (xf86LoadSubModule(pScrn, "xaa") == NULL) {
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ "Loading XAA failed, acceleration disabled\n");
+ pFfb->NoAccel = TRUE;
+ }
}
if (pFfb->HWCursor && xf86LoadSubModule(pScrn, "ramdac") == NULL) {