xserver-xorg-video-intel: Changes to 'ubuntu'

[Bryce Harrington <bryce-guest@alioth.debian.org>]

 debian/changelog                                                           |    8 ++
 debian/patches/110_from_git_da990536eca09c6de74627541cd56ecfad925eda.patch |   28 ++++++++++
 debian/patches/series                                                      |    1 
 3 files changed, 37 insertions(+)

New commits:
commit 1d74cbe5f724ff74eeed1656911266b3b151f5c4
Author: Bryce Harrington <bryce@bryceharrington.org>
Date:   Fri Feb 11 13:42:49 2011 -0800

    * 110_from_git_da990536eca09c6de74627541cd56ecfad925eda.patch:
      - cherry-pick fix from upstream git to fix graphics corruption
        (LP: #707236)

diff --git a/debian/changelog b/debian/changelog
index 134f7e1..77ba408 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-intel (2:2.14.0-1ubuntu6) natty; urgency=low
+
+  * 110_from_git_da990536eca09c6de74627541cd56ecfad925eda.patch:
+    - cherry-pick fix from upstream git to fix graphics corruption
+      (LP: #707236)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 03 Feb 2011 14:49:50 +0100
+
 xserver-xorg-video-intel (2:2.14.0-1ubuntu5) natty; urgency=low
 
   * control: For apport hook, depend on apport, intel-gpu-tools, and
diff --git a/debian/patches/110_from_git_da990536eca09c6de74627541cd56ecfad925eda.patch b/debian/patches/110_from_git_da990536eca09c6de74627541cd56ecfad925eda.patch
new file mode 100644
index 0000000..57caa67
--- /dev/null
+++ b/debian/patches/110_from_git_da990536eca09c6de74627541cd56ecfad925eda.patch
@@ -0,0 +1,28 @@
+From da990536eca09c6de74627541cd56ecfad925eda Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu, 03 Feb 2011 09:41:48 +0000
+Subject: uxa: Undo damage translation before appending
+
+The region is used to paint onto the backing pixmap (and thus
+translated) prior to being passed to the damage layer (wrt to the
+drawable). So the local translation needs to be undone first.
+
+Identified by Christopher James Halse Rogers.
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=33650
+Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+---
+diff --git a/uxa/uxa-render.c b/uxa/uxa-render.c
+index cf8b8ea..02bfa03 100644
+--- a/uxa/uxa-render.c
++++ b/uxa/uxa-render.c
+@@ -1090,6 +1090,7 @@ try_solid:
+ 	/* XXX xserver-1.8: CompositeRects is not tracked by Damage, so we must
+ 	 * manually append the damaged regions ourselves.
+ 	 */
++	pixman_region_translate(&region, -dst_x, -dst_y);
+ 	DamageRegionAppend(dst->pDrawable, &region);
+ 
+ 	pixman_region_fini(&region);
+--
+cgit v0.8.3-6-g21f6
diff --git a/debian/patches/series b/debian/patches/series
index 004eef1..fe6d90c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 101_copy-fb.patch
 107_solid_nullptr_check.patch
+110_from_git_da990536eca09c6de74627541cd56ecfad925eda.patch