xf86-video-intel: src/i830_driver.c

[Keith Packard]

 src/i830_driver.c |    3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 33f98e4056706f4c30bb4327677ac49e82058231
Author: Keith Packard <keithp at keithp.com>
Date:   Thu Sep 17 18:16:02 2009 -0700

    Don't destroy bufmgr at CloseScreen time
    
    Under KMS, the bufmgr is not initialized at InitOutput time and so it
    won't be re-initialized during server regen. Thus we must leave the
    bufmgr running during regen and cannot destroy it in CloseScreen.
    
    Under UMS, each place the bufmgr is initialized, it checks to see if
    it has already happened. Hence, we can safely leave the bufmgr running
    across server regen for UMS too.
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/src/i830_driver.c b/src/i830_driver.c
index e3e1ed2..2863e45 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -3135,9 +3135,6 @@ I830CloseScreen(int scrnIndex, ScreenPtr pScreen)
    pScreen->CloseScreen = pI830->CloseScreen;
    (*pScreen->CloseScreen) (scrnIndex, pScreen);
 
-   dri_bufmgr_destroy(pI830->bufmgr);
-   pI830->bufmgr = NULL;
-
    if (pI830->directRenderingOpen && pI830->directRenderingType == DRI_DRI2) {
       pI830->directRenderingOpen = FALSE;
       I830DRI2CloseScreen(pScreen);