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

[Christopher Halse Rogers <raof-guest@alioth.debian.org>]

 debian/changelog          |    7 +++++++
 debian/patches/xmir.patch |   11 +++++++++++
 2 files changed, 18 insertions(+)

New commits:
commit 436b6f2ed89514bf9c6c97924b49451ecd619d84
Author: Christopher James Halse Rogers <raof@ubuntu.com>
Date:   Fri Sep 20 12:00:23 2013 -0400

    Fix XMir vertical-line-corruption

diff --git a/debian/changelog b/debian/changelog
index 04fac10..bc99c40 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-ati (1:7.2.0-0ubuntu8) saucy; urgency=low
+
+  * xmir.patch: Fix detection of linear tiling in Evergreen EXA copy path.
+    Fixes vertical-bar-corruption on some Evergreen cards (LP: #1218815)
+
+ -- Christopher James Halse Rogers <raof@ubuntu.com>  Fri, 20 Sep 2013 11:59:52 -0400
+
 xserver-xorg-video-ati (1:7.2.0-0ubuntu7) saucy; urgency=low
 
   * control, rules: Build against libglamor, add depends on xserver-
diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index ecfb241..5cbbf72 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -628,3 +628,14 @@ Date:   Mon Jul 22 17:02:17 2013 +1000
      box.x1 = x1;
      box.x2 = x2;
      box.y1 = y1;
+--- a/src/evergreen_exa.c
++++ b/src/evergreen_exa.c
+@@ -378,7 +378,7 @@
+     if (accel_state->planemask & 0xff000000)
+ 	cb_conf.pmask |= 8; /* A */
+     cb_conf.rop = accel_state->rop;
+-    if (accel_state->dst_obj.tiling_flags == 0) {
++    if ((accel_state->dst_obj.tiling_flags & 0xff) == 0) {
+ 	cb_conf.array_mode = 0;
+ 	cb_conf.non_disp_tiling = 1;
+     }