diff -u xserver-xorg-video-intel-2.6.3/debian/changelog xserver-xorg-video-intel-2.6.3/debian/changelog
--- xserver-xorg-video-intel-2.6.3/debian/changelog
+++ xserver-xorg-video-intel-2.6.3/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-intel (2:2.6.3-0ubuntu9aperture1) UNRELEASED; urgency=low
+
+  * Add patch 200_reserve-unused-memory-at-end-of-aperture.patch. This reserves
+    a block of unused memory between the exa offscreen buffer and end of aperture,
+    to prevent freeze with EXA on GM965 cards (LP: #359392).
+
+ -- Albert Damen <albrt@gmx.net>  Tue, 19 May 2009 22:22:41 +0200
+
 xserver-xorg-video-intel (2:2.6.3-0ubuntu9) jaunty; urgency=low
 
   * Add 120_fix_vt_switch.patch: Fix null pointer deref in
diff -u xserver-xorg-video-intel-2.6.3/debian/patches/series xserver-xorg-video-intel-2.6.3/debian/patches/series
--- xserver-xorg-video-intel-2.6.3/debian/patches/series
+++ xserver-xorg-video-intel-2.6.3/debian/patches/series
@@ -15,0 +16 @@
+200_reserve-unused-memory-at-end-of-aperture.patch
only in patch2:
unchanged:
--- xserver-xorg-video-intel-2.6.3.orig/debian/patches/200_reserve-unused-memory-at-end-of-aperture.patch
+++ xserver-xorg-video-intel-2.6.3/debian/patches/200_reserve-unused-memory-at-end-of-aperture.patch
@@ -0,0 +1,17 @@
+For GM965, reserve a buffer of unused memory between the exa offscreen buffer and end of aperture
+Prevents freeze with exa on the GM965, LP: #359392
+Index: xserver-xorg-video-intel-2.6.3/src/i830_memory.c
+===================================================================
+--- xserver-xorg-video-intel-2.6.3.orig/src/i830_memory.c	2009-05-19 22:07:40.000000000 +0200
++++ xserver-xorg-video-intel-2.6.3/src/i830_memory.c	2009-05-19 22:13:36.000000000 +0200
+@@ -501,6 +501,10 @@
+ 	 */
+ 	mmsize = size;
+ 
++	/* GM965 needs some unused memory above the exa offscreen buffer */
++	if ((pI830->accel == ACCEL_EXA) && IS_I965G(pI830)) {
++	    mmsize -= ROUND_TO_PAGE(512 * pI830->cpp * pScrn->virtualY);
++	}
+ 	/* EXA area is fixed. */
+ 	if (pI830->accel == ACCEL_EXA) {
+ 	    mmsize -= ROUND_TO_PAGE(3 * pScrn->displayWidth * pI830->cpp *