diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2013-06-10 19:49:41 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2013-06-10 19:49:41 +0000 |
| commit | 25f131d2267b5085b33f5d13c4972a7b66e9d8f0 (patch) | |
| tree | 4aa002a747fbd363e4839db18f530c85b04d3a38 /driver | |
| parent | f7c00089e4a73c3e1898b932a9af9e321334d32c (diff) | |
Unbreak the sunffb driver. No acceleration for now, since XAA was
removed from X server 1.14.
Diffstat (limited to 'driver')
| -rw-r--r-- | driver/xf86-video-sunffb/src/ffb_driver.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/driver/xf86-video-sunffb/src/ffb_driver.c b/driver/xf86-video-sunffb/src/ffb_driver.c index 4eab3c895..24371a933 100644 --- a/driver/xf86-video-sunffb/src/ffb_driver.c +++ b/driver/xf86-video-sunffb/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) { |