diff options
Diffstat (limited to 'src/apm_driver.c')
| -rw-r--r-- | src/apm_driver.c | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/src/apm_driver.c b/src/apm_driver.c index cdfde87..aeaba94 100644 --- a/src/apm_driver.c +++ b/src/apm_driver.c @@ -986,18 +986,9 @@ ApmPreInit(ScrnInfoPtr pScrn, int flags) return FALSE; } - /* Load XAA if needed */ if (!pApm->NoAccel) { -#ifdef HAVE_XAA_H - if (!xf86LoadSubModule(pScrn, "xaa")) { - xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Falling back to shadowfb\n"); - pApm->NoAccel = TRUE; - pApm->ShadowFB = TRUE; - } -#else pApm->NoAccel = TRUE; pApm->ShadowFB = TRUE; -#endif } /* Load ramdac if needed */ @@ -1772,15 +1763,6 @@ ApmScreenInit(SCREEN_INIT_ARGS_DECL) } } - /* - * Initialize the acceleration interface. - */ -#ifdef HAVE_XAA_H - if (!pApm->NoAccel) { - ApmAccelInit(pScreen); /* set up XAA interface */ - } -#endif - xf86SetBackingStore(pScreen); xf86SetSilkenMouse(pScreen); @@ -2000,13 +1982,6 @@ ApmCloseScreen(CLOSE_SCREEN_ARGS_DECL) vgaHWLock(hwp); ApmUnmapMem(pScrn); } -#ifdef HAVE_XAA_H - if(pApm->AccelInfoRec) - XAADestroyInfoRec(pApm->AccelInfoRec); - if(pApm->DGAXAAInfo) - XAADestroyInfoRec(pApm->DGAXAAInfo); - pApm->AccelInfoRec = NULL; -#endif if(pApm->CursorInfoRec) xf86DestroyCursorInfoRec(pApm->CursorInfoRec); pApm->CursorInfoRec = NULL; |