diff -r -c xf86-video-intel-2.5.1/src/i830_crt.c xf86-video-intel-2.5.1-new/src/i830_crt.c
*** xf86-video-intel-2.5.1/src/i830_crt.c	2008-11-14 05:18:50.000000000 +0900
--- xf86-video-intel-2.5.1-new/src/i830_crt.c	2008-12-01 11:16:30.000000000 +0900
***************
*** 385,395 ****
--- 385,397 ----
      xf86OutputStatus	    status;
      Bool		    connected;
  
+     xf86DrvMsg(pScrn->scrnIndex, X_INFO, "*** [BEGIN] i830_crtc_detect()\n");
      /*
       * Try hotplug detection where supported
       */
      if (IS_I945G(pI830) || IS_I945GM(pI830) || IS_I965G(pI830) ||
  	    IS_G33CLASS(pI830)) {
+         xf86DrvMsg(pScrn->scrnIndex, X_INFO, "*** call i830_crt_detect_hotplug()\n");
  	if (i830_crt_detect_hotplug(output))
  	    status = XF86OutputStatusConnected;
  	else
***************
*** 421,426 ****
--- 423,429 ----
      i830ReleaseLoadDetectPipe (output, dpms_mode);
  
  done:
+     xf86DrvMsg(pScrn->scrnIndex, X_INFO, "*** [END]   i830_crtc_detect()\n");
      return status;
  }
  
diff -r -c xf86-video-intel-2.5.1/src/i830_display.c xf86-video-intel-2.5.1-new/src/i830_display.c
*** xf86-video-intel-2.5.1/src/i830_display.c	2008-11-14 05:18:50.000000000 +0900
--- xf86-video-intel-2.5.1-new/src/i830_display.c	2008-11-28 17:52:00.000000000 +0900
***************
*** 799,804 ****
--- 799,806 ----
      int dspbase_reg = (plane == 0) ? DSPABASE : DSPBBASE;
      uint32_t temp;
  
+     xf86DrvMsg(pScrn->scrnIndex, X_INFO, "*** [BEGIN] i830_crtc_dpms().\n");
+ 
      /* XXX: When our outputs are all unaware of DPMS modes other than off and
       * on, we should map those modes to DPMSModeOff in the CRTC.
       */
***************
*** 864,877 ****
--- 866,889 ----
  	 * - Disable VGA display
  	 */
  
+         xf86DrvMsg(pScrn->scrnIndex, X_INFO, "*** before INREG(dspcntr_reg).\n");
+ 
  	/* Disable display plane */
  	temp = INREG(dspcntr_reg);
+ 
+         xf86DrvMsg(pScrn->scrnIndex, X_INFO, "*** after  INREG(dspcntr_reg).\n");
  	if ((temp & DISPLAY_PLANE_ENABLE) != 0)
  	{
+             xf86DrvMsg(pScrn->scrnIndex, X_INFO, "*** before  OUTREG(dspcntr_reg, temp &~DISPLAY_PLANE_ENABLE).\n");
  	    OUTREG(dspcntr_reg, temp & ~DISPLAY_PLANE_ENABLE);
+             xf86DrvMsg(pScrn->scrnIndex, X_INFO, "*** after   OUTREG(dspcntr_reg, temp &~DISPLAY_PLANE_ENABLE).\n");
  	    /* Flush the plane changes */
+             xf86DrvMsg(pScrn->scrnIndex, X_INFO, "*** before  OUTREG(dspcntr_reg, INREG(dspbase_reg)).\n");
  	    OUTREG(dspbase_reg, INREG(dspbase_reg));
+             xf86DrvMsg(pScrn->scrnIndex, X_INFO, "*** after   OUTREG(dspcntr_reg, INREG(dspbase_reg)).\n");
+             xf86DrvMsg(pScrn->scrnIndex, X_INFO, "*** before  POSTING_READ(dspbase_reg).\n");
  	    POSTING_READ(dspbase_reg);
+             xf86DrvMsg(pScrn->scrnIndex, X_INFO, "*** after   POSTING_READ(dspbase_reg).\n");
  	}
  
  	if (!IS_I9XX(pI830)) {
***************
*** 937,942 ****
--- 949,955 ----
  	}
      }
  #endif
+     xf86DrvMsg(pScrn->scrnIndex, X_INFO, "*** [END]   i830_crtc_dpms().\n");
  }
  
  static Bool
***************
*** 1733,1738 ****
--- 1746,1753 ----
      xf86CrtcPtr		    crtc = NULL;
      int			    i;
  
+     xf86DrvMsg(pScrn->scrnIndex, X_INFO, "*** [BEGIN] i830GetLoadDetectPipe().\n");
+ 
      if (output->crtc) 
      {
  	crtc = output->crtc;
***************
*** 1794,1799 ****
--- 1809,1816 ----
      /* let the output get through one full cycle before testing */
      i830WaitForVblank (pScrn);
  
+     xf86DrvMsg(pScrn->scrnIndex, X_INFO, "*** [END]   i830GetLoadDetectPipe().\n");
+ 
      return crtc;
  }
  
diff -r -c xf86-video-intel-2.5.1/src/i830_driver.c xf86-video-intel-2.5.1-new/src/i830_driver.c
*** xf86-video-intel-2.5.1/src/i830_driver.c	2008-11-14 05:36:10.000000000 +0900
--- xf86-video-intel-2.5.1-new/src/i830_driver.c	2008-11-28 18:13:08.000000000 +0900
***************
*** 1508,1513 ****
--- 1508,1515 ----
      char *s;
      int i, num_pipe;
  
+     xf86DrvMsg(pScrn->scrnIndex, X_INFO, "*** [BEGIN] I830AccelMethodInit()\n");
+ 
      if (xf86ReturnOptValBool(pI830->Options, OPTION_NOACCEL, FALSE)) {
  	pI830->accel = ACCEL_NONE;
      }
***************
*** 1612,1619 ****
--- 1614,1626 ----
  	PreInitCleanup(pScrn);
  	return FALSE;
      }
+ 
+     xf86DrvMsg(pScrn->scrnIndex, X_INFO, "*** after xf86InitialConfiguration()\n");
+ 
      RestoreHWState(pScrn);
  
+     xf86DrvMsg(pScrn->scrnIndex, X_INFO, "*** after RestoreHWState()\n");
+ 
      /* XXX This should go away, replaced by xf86Crtc.c support for it */
      pI830->rotation = RR_Rotate_0;
  
***************
*** 1638,1645 ****
--- 1645,1656 ----
      } else
  	pI830->checkDevices = FALSE;
  
+     xf86DrvMsg(pScrn->scrnIndex, X_INFO, "*** before I830DetectMemory()\n");
+ 
      pI830->stolen_size = I830DetectMemory(pScrn);
  
+     xf86DrvMsg(pScrn->scrnIndex, X_INFO, "*** [END]   I830AccelMethodInit()\n");
+ 
      return TRUE;
  }
  
***************
*** 2299,2320 ****
--- 2310,2339 ----
     vgaRegPtr vgaReg = &hwp->SavedReg;
     int i;
  
+    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "*** [BEGIN] RestoreHWState().\n");
+ 
     DPRINTF(PFX, "RestoreHWState\n");
  
+    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "*** before I830DRISetVBlankInterrupt().\n");
+ 
  #ifdef XF86DRI
     I830DRISetVBlankInterrupt (pScrn, FALSE);
  #endif
     /* Disable outputs */
     for (i = 0; i < xf86_config->num_output; i++) {
        xf86OutputPtr   output = xf86_config->output[i];
+       xf86DrvMsg(pScrn->scrnIndex, X_INFO, "*** before i830_crt_dpms().\n");
        output->funcs->dpms(output, DPMSModeOff);
+       xf86DrvMsg(pScrn->scrnIndex, X_INFO, "*** after  i830_crt_dpms().\n");
     }
     i830WaitForVblank(pScrn);
     
     /* Disable pipes */
     for (i = 0; i < xf86_config->num_crtc; i++) {
        xf86CrtcPtr crtc = xf86_config->crtc[i];
+       xf86DrvMsg(pScrn->scrnIndex, X_INFO, "*** before i830_crtc_dpms().\n");
        crtc->funcs->dpms(crtc, DPMSModeOff);
+       xf86DrvMsg(pScrn->scrnIndex, X_INFO, "*** after  i830_crtc_dpms().\n");
     }
     i830WaitForVblank(pScrn);
  
***************
*** 2528,2533 ****
--- 2547,2554 ----
     vgaHWRestore(pScrn, vgaReg, VGA_SR_FONTS);
     vgaHWLock(hwp);
  
+    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "*** [END]   RestoreHWState().\n");
+ 
     return TRUE;
  }