Aurelien
/
xf86-video-intel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Leave allocator running until lower-level CloseScreens are done" 

Uh, oops -- the FD used to talk to the kernel is closed before the
allocator_fini function is called now.

This reverts commit 1872869e6f.
This commit is contained in:
Keith Packard 2009-05-01 12:23:32 -07:00
parent 11a853bd8e
commit cfb98f3da9
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/i830_driver.c
View File

@ -3079,6 +3079,7 @@ I830CloseScreen(int scrnIndex, ScreenPtr pScreen)
xf86_cursors_fini (pScreen);
i830_allocator_fini(pScrn);
i965_free_video(pScrn);
free(pI830->offscreenImages);
@ -3098,9 +3099,7 @@ I830CloseScreen(int scrnIndex, ScreenPtr pScreen)
pScrn->vtSema = FALSE;
pI830->closing = FALSE;
pScreen->CloseScreen = pI830->CloseScreen;
(*pScreen->CloseScreen) (scrnIndex, pScreen);
i830_allocator_fini(pScrn);
return TRUE;
return (*pScreen->CloseScreen) (scrnIndex, pScreen);
}
static ModeStatus