Don't call xf86DPMSInit() twice. Since it wraps CloseScreen(), this has

disastrous effects.  Gets rid of some duplicated code as a bonus.  Fixes
X server crashes that appeared with the xserver 1.9.2 import.

ok miod@

1 files changed, 0 insertions, 13 deletions

diff --git a/driver/xf86-video-sunffb/src/ffb_driver.c b/driver/xf86-video-sunffb/src/ffb_driver.c
index 68e4dbc27..ec9e35225 100644
--- a/driver/xf86-video-sunffb/src/ffb_driver.c
+++ b/driver/xf86-video-sunffb/src/ffb_driver.c
@@ -59,7 +59,6 @@ static void	FFBAdjustFrame(int scrnIndex, int x, int y, int flags);
 static void	FFBFreeScreen(int scrnIndex, int flags);
 static ModeStatus FFBValidMode(int scrnIndex, DisplayModePtr mode,
 			       Bool verbose, int flags);
-static void     FFBDPMSMode(ScrnInfoPtr pScrn, int DPMSMode, int flags);
 /* ffb_dga.c */
 extern void FFB_InitDGA(ScreenPtr pScreen);
 
@@ -805,8 +804,6 @@ FFBScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
     pScreen->CloseScreen = FFBCloseScreen;
     pScreen->SaveScreen = FFBSaveScreen;
 
-    (void) xf86DPMSInit(pScreen, FFBDPMSMode, 0);
-
     /* Report any unused options (only for the first generation) */
     if (serverGeneration == 1) {
 	xf86ShowUnusedOptions(pScrn->scrnIndex, pScrn->options);
@@ -981,13 +978,3 @@ FFBSync(ScrnInfoPtr pScrn)
 {
     return;
 }
-
-/*
-  Hook for DPMS Mode.
-*/
-
-static void
-FFBDPMSMode(ScrnInfoPtr pScrn, int DPMSMode, int flags)
-{
-  FFBDacDPMSMode(GET_FFB_FROM_SCRN(pScrn), DPMSMode, flags);
-}