diff --git a/src/i830_driver.c b/src/i830_driver.c
index abe6932..4d7524d 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -1831,11 +1831,12 @@ SetHWOperatingState(ScrnInfoPtr pScrn)
 
    /* Disable clock gating reported to work incorrectly according to the specs.
     */
-   if (IS_I965GM(pI830)) {
-      OUTREG(RENCLK_GATE_D1, I965_RCC_CLOCK_GATE_DISABLE);
-   } else if (IS_I965G(pI830)) {
-      OUTREG(RENCLK_GATE_D1,
-	     I965_RCC_CLOCK_GATE_DISABLE | I965_ISC_CLOCK_GATE_DISABLE);
+   if (IS_I965G(pI830)) {
+      OUTREG(RENCLK_GATE_D1, I965_RCZ_CLOCK_GATE_DISABLE |
+	     I965_RCC_CLOCK_GATE_DISABLE |
+	     I965_RCPB_CLOCK_GATE_DISABLE |
+	     I965_ISC_CLOCK_GATE_DISABLE |
+	     I965_FBC_CLOCK_GATE_DISABLE);
    } else if (IS_I855(pI830) || IS_I865G(pI830)) {
       OUTREG(RENCLK_GATE_D1, SV_CLOCK_GATE_DISABLE);
    } else if (IS_I830(pI830)) {
diff --git a/src/i830_memory.c b/src/i830_memory.c
index 1ad4438..52d62b8 100644
--- a/src/i830_memory.c
+++ b/src/i830_memory.c
@@ -1698,8 +1698,9 @@ i830_set_tiling(ScrnInfoPtr pScrn, unsigned int offset,
     unsigned int max_fence;
     unsigned int fence_nr;
 
-    DPRINTF(PFX, "i830_set_tiling(): 0x%08x, %d, %d kByte\n",
-	    offset, pitch, size / 1024);
+    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+	       "i830_set_tiling(): 0x%08x, %d, %d kByte\n",
+	       offset, pitch, size / 1024);
 
     assert(tile_format != TILE_NONE);