diff -Nru 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	2009-05-12 13:49:49.000000000 -0700
+++ xserver-xorg-video-intel-2.6.3/debian/changelog	2009-05-12 13:49:50.000000000 -0700
@@ -1,3 +1,11 @@
+xserver-xorg-video-intel (2:2.6.3-0ubuntu9.3) jaunty-proposed; urgency=low
+
+  * Add 122_dont_fixup_mtrrs_in_gem_config.patch:  Don't remove MTRRs
+    that the kernel installed.
+    (LP: #314928)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Mon, 11 May 2009 11:06:49 -0700
+
 xserver-xorg-video-intel (2:2.6.3-0ubuntu9.2) jaunty-proposed; urgency=low
 
   * Update 121_i965_default_to_virtual_2048_2048.patch to check more
diff -Nru xserver-xorg-video-intel-2.6.3/debian/patches/122_dont_fixup_mtrrs_in_gem_config.patch xserver-xorg-video-intel-2.6.3/debian/patches/122_dont_fixup_mtrrs_in_gem_config.patch
--- xserver-xorg-video-intel-2.6.3/debian/patches/122_dont_fixup_mtrrs_in_gem_config.patch	1969-12-31 16:00:00.000000000 -0800
+++ xserver-xorg-video-intel-2.6.3/debian/patches/122_dont_fixup_mtrrs_in_gem_config.patch	2009-05-12 13:49:50.000000000 -0700
@@ -0,0 +1,14 @@
+diff -Nurp xserver-xorg-video-intel-2.6.3-jaunty/src/i830_driver.c working/src/i830_driver.c
+--- xserver-xorg-video-intel-2.6.3-jaunty/src/i830_driver.c	2009-03-02 11:21:07.000000000 -0800
++++ working/src/i830_driver.c	2009-05-11 11:04:50.000000000 -0700
+@@ -3248,7 +3248,9 @@ I830ScreenInit(int scrnIndex, ScreenPtr 
+ 
+    I830UnmapMMIO(pScrn);
+ 
+-   i830_fixup_mtrrs(pScrn);
++   /* In a GEM config, the kernel manages MTRRs */
++   if (!pI830->memory_manager)
++       i830_fixup_mtrrs(pScrn);
+ 
+    pI830->starting = TRUE;
+ 
diff -Nru 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	2009-05-12 13:49:49.000000000 -0700
+++ xserver-xorg-video-intel-2.6.3/debian/patches/series	2009-05-12 13:49:50.000000000 -0700
@@ -14,3 +14,4 @@
 119_drm_bo_unreference_needs_null.patch
 120_fix_vt_switch.patch
 121_i965_default_virtual_to_2048_2048.patch
+122_dont_fixup_mtrrs_in_gem_config.patch