diff options
| author | Adam Jackson <ajax@redhat.com> | 2011-12-19 17:06:11 -0500 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2011-12-19 17:06:11 -0500 |
| commit | 4ad32624b2f1344168e0083d33227021c87fee60 (patch) | |
| tree | 54ebcf21cafed6de0212f41cc1c6baca0b3a780d | |
| parent | 67aaa4698586d75242627b7ce8f4815eeb08f853 (diff) | |
Make failure to XAA non-fatal
No shadowfb support in this driver yet
Signed-off-by: Adam Jackson <ajax@redhat.com>
| -rw-r--r-- | src/r128_accel.c | 3 | ||||
| -rw-r--r-- | src/r128_driver.c | 20 |
2 files changed, 8 insertions, 15 deletions
diff --git a/src/r128_accel.c b/src/r128_accel.c index eeb2bfc..e383cfa 100644 --- a/src/r128_accel.c +++ b/src/r128_accel.c @@ -1866,6 +1866,9 @@ Bool R128AccelInit(ScreenPtr pScreen) R128InfoPtr info = R128PTR(pScrn); XAAInfoRecPtr a; + if (!xf86LoadSubModule(pScrn, "xaa")) + return FALSE; + if (!(a = info->accel = XAACreateInfoRec())) return FALSE; #ifdef XF86DRI diff --git a/src/r128_driver.c b/src/r128_driver.c index eb1d978..f5b3abf 100644 --- a/src/r128_driver.c +++ b/src/r128_driver.c @@ -1753,17 +1753,6 @@ static Bool R128PreInitCursor(ScrnInfoPtr pScrn) return TRUE; } -/* This is called by R128PreInit to initialize hardware acceleration. */ -static Bool R128PreInitAccel(ScrnInfoPtr pScrn) -{ - R128InfoPtr info = R128PTR(pScrn); - - if (!xf86ReturnOptValBool(info->Options, OPTION_NOACCEL, FALSE)) { - if (!xf86LoadSubModule(pScrn, "xaa")) return FALSE; - } - return TRUE; -} - static Bool R128PreInitInt10(ScrnInfoPtr pScrn, xf86Int10InfoPtr *ppInt10) { R128InfoPtr info = R128PTR(pScrn); @@ -2074,8 +2063,6 @@ Bool R128PreInit(ScrnInfoPtr pScrn, int flags) if (!R128PreInitCursor(pScrn)) goto fail; - if (!R128PreInitAccel(pScrn)) goto fail; - #ifdef XF86DRI if (!R128PreInitDRI(pScrn)) goto fail; #endif @@ -2204,6 +2191,7 @@ Bool R128ScreenInit(int scrnIndex, ScreenPtr pScreen, R128InfoPtr info = R128PTR(pScrn); BoxRec MemBox; int y2; + Bool noAccel; R128TRACE(("R128ScreenInit %x %d\n", pScrn->memPhysBase, pScrn->fbOffset)); @@ -2243,6 +2231,8 @@ Bool R128ScreenInit(int scrnIndex, ScreenPtr pScreen, pScrn->defaultVisual)) return FALSE; miSetPixmapDepths (); + noAccel = xf86ReturnOptValBool(info->Options, OPTION_NOACCEL, FALSE); + #ifdef XF86DRI /* Setup DRI after visuals have been established, but before fbScreenInit is @@ -2257,7 +2247,7 @@ Bool R128ScreenInit(int scrnIndex, ScreenPtr pScreen, info->CurrentLayout.pixel_bytes); int maxy = info->FbMapSize / width_bytes; - if (xf86ReturnOptValBool(info->Options, OPTION_NOACCEL, FALSE)) { + if (noAccel) { xf86DrvMsg(scrnIndex, X_WARNING, "Acceleration disabled, not initializing the DRI\n"); info->directRenderingEnabled = FALSE; @@ -2541,7 +2531,7 @@ Bool R128ScreenInit(int scrnIndex, ScreenPtr pScreen, } /* Acceleration setup */ - if (!xf86ReturnOptValBool(info->Options, OPTION_NOACCEL, FALSE)) { + if (!noAccel) { if (R128AccelInit(pScreen)) { xf86DrvMsg(scrnIndex, X_INFO, "Acceleration enabled\n"); info->accelOn = TRUE; |