diff -urN xf86-video-intel-2.5.96.0/src/i830_driver.c xf86-video-intel-2.5.96.0.new/src/i830_driver.c
--- xf86-video-intel-2.5.96.0/src/i830_driver.c	2008-09-13 06:58:45.000000000 +0800
+++ xf86-video-intel-2.5.96.0.new/src/i830_driver.c	2008-09-25 21:22:08.000000000 +0800
@@ -1782,7 +1782,7 @@
       return FALSE;
 
    pI830 = I830PTR(pScrn);
-   pI830->SaveGeneration = -1;
+   pI830->SaveGeneration = serverGeneration;
    pI830->pEnt = pEnt;
    pI830->use_drm_mode = drm_mode_setting;