openbsd/xenocara
1
0
Fork 0
mirror of https://github.com/openbsd/xenocara.git synced 2025-12-08 18:28:43 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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@
This commit is contained in:
kettenis
2010-12-06 21:58:03 +00:00
parent b450b9d00e
commit 0e9fe79926
1 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
driver/xf86-video-sunffb/src/ffb_driver.c
View File

@@ -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);
}