diff -u xserver-xorg-video-intel-2.1.1/debian/changelog xserver-xorg-video-intel-2.1.1/debian/changelog
--- xserver-xorg-video-intel-2.1.1/debian/changelog
+++ xserver-xorg-video-intel-2.1.1/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-intel (2:2.1.1-0ubuntu3) gutsy; urgency=low
+
+  * make overlay mode work with compiz
+
+ -- egon <egon@sam.localnet>  Sun, 16 Sep 2007 11:23:25 +0200
+
 xserver-xorg-video-intel (2:2.1.1-0ubuntu2) gutsy; urgency=low
 
   * debian/patches/01_fix_compiz_video.diff:
only in patch2:
unchanged:
--- xserver-xorg-video-intel-2.1.1.orig/src/i830_video.c
+++ xserver-xorg-video-intel-2.1.1/src/i830_video.c
@@ -569,8 +569,12 @@
     /* Set up textured video if we can do it at this depth and we are on
      * supported hardware.
      */
+#if 0
     if (pScrn->bitsPerPixel >= 16 && (IS_I9XX(pI830) || IS_I965G(pI830)) &&
 	!(!IS_I965G(pI830) && pScrn->displayWidth > 2048))
+#endif
+    if (pScrn->bitsPerPixel >= 16 && IS_I965G(pI830) &&
+	!(!IS_I965G(pI830) && pScrn->displayWidth > 2048))
     {
 	texturedAdaptor = I830SetupImageVideoTextured(pScreen);
 	if (texturedAdaptor != NULL) {
@@ -2301,10 +2305,10 @@
     else
 	overlay = I830OVERLAYREG(pI830);
 
-#if 0
+#if 1
     ErrorF("I830PutImage: src: (%d,%d)(%d,%d), dst: (%d,%d)(%d,%d)\n"
-	   "width %d, height %d\n", src_x, src_y, src_w, src_h, drw_x, drw_y,
-	   drw_w, drw_h, width, height);
+	   "width %d, height %d, textured: %d\n", src_x, src_y, src_w, src_h, drw_x, drw_y,
+	   drw_w, drw_h, width, height, pPriv->textured);
 #endif
 
     if (pI830->entityPrivate) {
@@ -2486,7 +2490,8 @@
     }
 #endif
 
-    if (((char *)pPixmap->devPrivate.ptr < (char *)pI830->FbBase) ||
+    if (pPriv->textured &&
+	((char *)pPixmap->devPrivate.ptr < (char *)pI830->FbBase) ||
 	((char *)pPixmap->devPrivate.ptr >= (char *)pI830->FbBase +
 	 pI830->FbMapSize)) {
 	/* If the pixmap wasn't in framebuffer, then we have no way in XAA to
@@ -2504,6 +2509,7 @@
 	if (!RegionsEqual(&pPriv->clip, clipBoxes)) {
 	    REGION_COPY(pScrn->pScreen, &pPriv->clip, clipBoxes);
 	    i830_fill_colorkey (pScreen, pPriv->colorKey, clipBoxes);
+	    xf86XVFillKeyHelperDrawable(pDraw, pPriv->colorKey, clipBoxes);
 	}
     } else if (IS_I965G(pI830)) {
 	I965DisplayVideoTextured(pScrn, pPriv, destId, clipBoxes, width, height,