diff options
Diffstat (limited to 'src/ffb_driver.c')
| -rw-r--r-- | src/ffb_driver.c | 55 |
1 files changed, 3 insertions, 52 deletions
diff --git a/src/ffb_driver.c b/src/ffb_driver.c index a720612..5e329e8 100644 --- a/src/ffb_driver.c +++ b/src/ffb_driver.c @@ -432,22 +432,6 @@ FFBPreInit(ScrnInfoPtr pScrn, int flags) return FALSE; } -#if 0 -/*#ifdef XF86DRI*/ -/* - * Loading this automatically isn't compatible - * to the behavior of other drivers - */ - if (xf86LoadSubModule(pScrn, "drm") == NULL) { - FFBFreeRec(pScrn); - return FALSE; - } - - if (xf86LoadSubModule(pScrn, "dri") == NULL) { - FFBFreeRec(pScrn); - return FALSE; - } -#endif /********************* set up clock and mode stuff @@ -740,21 +724,6 @@ FFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) if (!miSetPixmapDepths()) return FALSE; -#if 0 /*def XF86DRI*/ - if (pFfb->ffb_type != afb_m3 && pFfb->ffb_type != afb_m6 && - pFfb->NoAccel == FALSE) { - pFfb->dri_enabled = FFBDRIScreenInit(pScreen); - if (pFfb->dri_enabled == TRUE) - xf86Msg(X_INFO, "%s: DRM initialized\n", - pFfb->psdp->device); - else - xf86Msg(X_INFO, "%s: DRM setup failed\n", - pFfb->psdp->device); - } else { - pFfb->dri_enabled = FALSE; - } -#endif - /* * Call the framebuffer layer's ScreenInit function, and fill in other * pScreen fields. @@ -832,21 +801,6 @@ FFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) if (!pFfb->NoAccel) FFB_InitDGA(pScreen); -#if 0 /*def XF86DRI*/ - if (pFfb->dri_enabled) { - /* Now that mi, fb, drm and others have done their thing, - * complete the DRI setup. - */ - pFfb->dri_enabled = FFBDRIFinishScreenInit(pScreen); - if (pFfb->dri_enabled) - xf86Msg(X_INFO, "%s: DRM finish setup complete\n", - pFfb->psdp->device); - else - xf86Msg(X_INFO, "%s: DRM finish setup failed\n", - pFfb->psdp->device); - } -#endif - xf86DPMSInit(pScreen, FFBDPMSSet, 0); pFfb->CloseScreen = pScreen->CloseScreen; @@ -948,11 +902,6 @@ FFBCloseScreen(int scrnIndex, ScreenPtr pScreen) ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; FFBPtr pFfb = GET_FFB_FROM_SCRN(pScrn); -#if 0 /*def XF86DRI*/ - if (pFfb->dri_enabled) - FFBDRICloseScreen(pScreen); -#endif - /* Restore kernel ramdac state before we unmap registers. */ FFBDacFini(pFfb); @@ -1010,7 +959,9 @@ FFBSaveScreen(ScreenPtr pScreen, int mode) done in "ffb_dac.c" `for aesthetic reasons.' */ { - return FFBDacSaveScreen(GET_FFB_FROM_SCREEN(pScreen), mode); + ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; + + return FFBDacSaveScreen(GET_FFB_FROM_SCRN(pScrn), mode); } static void |