diff -u xserver-xorg-video-intel-2.1.1/debian/patches/01_fix_compiz_video.diff xserver-xorg-video-intel-2.1.1/debian/patches/01_fix_compiz_video.diff
--- xserver-xorg-video-intel-2.1.1/debian/patches/01_fix_compiz_video.diff
+++ xserver-xorg-video-intel-2.1.1/debian/patches/01_fix_compiz_video.diff
@@ -20,0 +21,33 @@
+--- 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) {
+@@ -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,
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,11 @@
+xserver-xorg-video-intel (2:2.1.1-0ubuntu3) gutsy; urgency=low
+
+  * debian/patches/01_fix_compiz_video.diff:
+    - default to overlay mode on hardware that supports it to
+      make compiz video work
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 18 Sep 2007 09:48:45 +0100
+
 xserver-xorg-video-intel (2:2.1.1-0ubuntu2) gutsy; urgency=low
 
   * debian/patches/01_fix_compiz_video.diff: