diff options
| author | Adam Jackson <ajax@redhat.com> | 2011-12-19 17:16:44 -0500 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2011-12-19 17:16:44 -0500 |
| commit | 1aa3e0413bcf89734083649c2057fc4065c8348d (patch) | |
| tree | bdee574223b99874c92bce5e177c8e438573588c | |
| parent | 381ace93a17da291d4149fe0f98ee4b7386f67ee (diff) | |
Fall back to shadowfb if XAA is unavailable
Signed-off-by: Adam Jackson <ajax@redhat.com>
| -rw-r--r-- | src/s3_driver.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/s3_driver.c b/src/s3_driver.c index 4519b33..ec7e7ee 100644 --- a/src/s3_driver.c +++ b/src/s3_driver.c @@ -441,6 +441,15 @@ static Bool S3PreInit(ScrnInfoPtr pScrn, int flags) vbeFree(pVBE); } + xf86LoadSubModule(pScrn, "fb"); + + if (!xf86LoadSubModule(pScrn, "xaa")) { + xf86DrvMsg(pScrn->scrnIndex, X_INFO, + "Falling back to shadowfb\n"); + pS3->NoAccel = TRUE; + pS3->shadowFB = TRUE; + } + if (pS3->shadowFB) { if (!xf86LoadSubModule(pScrn, "shadowfb")) { S3FreeRec(pScrn); @@ -728,11 +737,6 @@ static Bool S3PreInit(ScrnInfoPtr pScrn, int flags) xf86PrintModes(pScrn); xf86SetDpi(pScrn, 0, 0); - xf86LoadSubModule(pScrn, "fb"); - - if (!xf86LoadSubModule(pScrn, "xaa")) - return FALSE; - return TRUE; } |