[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

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

 debian/apport-gpu-error-intel.py                                           |   13 -
 debian/changelog                                                           |   18 ++
 debian/patches/108_undo_dmg_trans_before_append.patch                      |   28 +++
 debian/patches/109_dont_reconstruct_glyph_cache_on_rotate.patch            |   79 ++++++++++
 debian/patches/110_from_git_da990536eca09c6de74627541cd56ecfad925eda.patch |   28 ---
 debian/patches/series                                                      |    4 
 6 files changed, 133 insertions(+), 37 deletions(-)

New commits:
commit 78fe4f6bdc0a96d0337f57bc0acb1f661f4758dd
Author: Bryce Harrington <bryce@canonical.com>
Date:   Mon Feb 14 11:58:50 2011 -0800

    Include 110

diff --git a/debian/patches/series b/debian/patches/series
index 7ca8bfe..050224c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 107_solid_nullptr_check.patch
 108_undo_dmg_trans_before_append.patch
 109_dont_reconstruct_glyph_cache_on_rotate.patch
+110_warnings_cleanup.patch

commit 10143186b1516078f8755648e9b58db01a8cae59
Author: Bryce Harrington <bryce@canonical.com>
Date:   Fri Feb 11 17:04:16 2011 -0800

    * Add 109_dont_reconstruct_glyph_cache_on_rotate.patch: Fixes font
      corruption (missing glyphs) on rotated screens.  Cherrypick of
      upstream commit c6dc2756.
      (fdo #33412)
    * Add 110_warnings_cleanup.patch:  Tidy up a few build warnings.
      Cherrypicks from upstream tree.
    * apport-gpu-error-intel.py:
      + Include a couple more error codes for GPU freezes
      + Take any matched error code, not just the first seen
      + Improve matching of hexadecimal numbers
      + Strip out appending MachineType to title (it's never set)

diff --git a/debian/apport-gpu-error-intel.py b/debian/apport-gpu-error-intel.py
index c7521d8..4135f91 100644
--- a/debian/apport-gpu-error-intel.py
+++ b/debian/apport-gpu-error-intel.py
@@ -69,14 +69,13 @@ def get_dump_signature(text):
         return None
     m = hashlib.md5()
     m.update(text)
-    errmsg = m.hexdigest()[:8]
-    for k in ["EIR", "PGTBL_ER"]:
-        regex = re.compile(k+": 0x(\d+)")
+    codes = []
+    for k in ["EIR", "ESR", "PGTBL_ER", "IPEHR"]:
+        regex = re.compile(k+": 0x([0-9a-fA-F]+)")
         match = regex.search(text)
         if match and match.group(1) != "00000000":
-            errmsg += " (%s: 0x%s)" %(k, match.group(1))
-            break
-    return errmsg
+            codes.append("%s: 0x%s" %(k, match.group(1)))
+    return "%s (%s)" %( m.hexdigest()[:8], string.join(codes, " ") )
 
 def main(argv=None):
     if argv is None:
@@ -107,8 +106,6 @@ def main(argv=None):
     if dump_signature:
         report['DumpSignature'] = dump_signature
         report['Title'] += " " + report['DumpSignature']
-    if 'MachineType' in report and report['MachineType']:
-        report['Title'] += " on " + report['MachineType']
 
     attach_hardware(report)
     attach_related_packages(report, ["xserver-xorg", "libdrm2", "xserver-xorg-video-intel"])
diff --git a/debian/changelog b/debian/changelog
index 66a0c18..4cf328c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,9 +3,18 @@ xserver-xorg-video-intel (2:2.14.0-1ubuntu7) natty; urgency=low
   * Rename 110_from_git_da990536eca09c6de74627541cd56ecfad925eda.patch
     to 108_undo_dmg_trans_before_append.patch for clarity.
   * Add 109_dont_reconstruct_glyph_cache_on_rotate.patch: Fixes font
-    corruption (missing glyphs) on rotated screens.  (fdo #33412)
-
- -- Bryce Harrington <bryce@ubuntu.com>  Fri, 11 Feb 2011 14:03:11 -0800
+    corruption (missing glyphs) on rotated screens.  Cherrypick of
+    upstream commit c6dc2756.
+    (fdo #33412)
+  * Add 110_warnings_cleanup.patch:  Tidy up a few build warnings.
+    Cherrypicks from upstream tree.
+  * apport-gpu-error-intel.py:
+    + Include a couple more error codes for GPU freezes
+    + Take any matched error code, not just the first seen
+    + Improve matching of hexadecimal numbers
+    + Strip out appending MachineType to title (it's never set)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Fri, 11 Feb 2011 15:57:19 -0800
 
 xserver-xorg-video-intel (2:2.14.0-1ubuntu6) natty; urgency=low
 

commit 4d3d19bdc46b2e4561ed4cc224daa726069388b9
Author: Bryce Harrington <bryce@bryceharrington.org>
Date:   Fri Feb 11 15:46:28 2011 -0800

    * Rename 110_from_git_da990536eca09c6de74627541cd56ecfad925eda.patch
      to 108_undo_dmg_trans_before_append.patch for clarity.
    * Add 109_dont_reconstruct_glyph_cache_on_rotate.patch: Fixes font
      corruption (missing glyphs) on rotated screens.  (fdo #33412)

diff --git a/debian/changelog b/debian/changelog
index 77ba408..66a0c18 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xserver-xorg-video-intel (2:2.14.0-1ubuntu7) natty; urgency=low
+
+  * Rename 110_from_git_da990536eca09c6de74627541cd56ecfad925eda.patch
+    to 108_undo_dmg_trans_before_append.patch for clarity.
+  * Add 109_dont_reconstruct_glyph_cache_on_rotate.patch: Fixes font
+    corruption (missing glyphs) on rotated screens.  (fdo #33412)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Fri, 11 Feb 2011 14:03:11 -0800
+
 xserver-xorg-video-intel (2:2.14.0-1ubuntu6) natty; urgency=low
 
   * 110_from_git_da990536eca09c6de74627541cd56ecfad925eda.patch:
diff --git a/debian/patches/108_undo_dmg_trans_before_append.patch b/debian/patches/108_undo_dmg_trans_before_append.patch
new file mode 100644
index 0000000..57caa67
--- /dev/null
+++ b/debian/patches/108_undo_dmg_trans_before_append.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/109_dont_reconstruct_glyph_cache_on_rotate.patch b/debian/patches/109_dont_reconstruct_glyph_cache_on_rotate.patch
new file mode 100644
index 0000000..0917a26
--- /dev/null
+++ b/debian/patches/109_dont_reconstruct_glyph_cache_on_rotate.patch
@@ -0,0 +1,79 @@
+From c6dc27562abbc8ca9e873ad502ca49ae010461d2 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon, 24 Jan 2011 20:25:27 +0000
+Subject: uxa: Only recreate the glyph cache on *generational* updates
+
+The screen resources are recreated when the screen is rotated as well,
+without being finalized. In this case, we do not need to reconstuct the
+cache (or if we did, we would need to tear it down first).
+
+Reported-by: Till Matthiesen <entropy@everymail.net>
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=33412
+Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+---
+diff --git a/uxa/uxa-glyphs.c b/uxa/uxa-glyphs.c
+index 420e891..0f5ddda 100644
+--- a/uxa/uxa-glyphs.c
++++ b/uxa/uxa-glyphs.c
+@@ -111,6 +111,9 @@ static void uxa_unrealize_glyph_caches(ScreenPtr pScreen)
+ 	uxa_screen_t *uxa_screen = uxa_get_screen(pScreen);
+ 	int i;
+ 
++	if (!uxa_screen->glyph_cache_initialized)
++		return;
++
+ 	for (i = 0; i < UXA_NUM_GLYPH_CACHE_FORMATS; i++) {
+ 		uxa_glyph_cache_t *cache = &uxa_screen->glyphCaches[i];
+ 
+@@ -120,6 +123,7 @@ static void uxa_unrealize_glyph_caches(ScreenPtr pScreen)
+ 		if (cache->glyphs)
+ 			free(cache->glyphs);
+ 	}
++	uxa_screen->glyph_cache_initialized = FALSE;
+ }
+ 
+ void uxa_glyphs_fini(ScreenPtr pScreen)
+@@ -145,6 +149,10 @@ static Bool uxa_realize_glyph_caches(ScreenPtr pScreen)
+ 	};
+ 	int i;
+ 
++	if (uxa_screen->glyph_cache_initialized)
++		return TRUE;
++
++	uxa_screen->glyph_cache_initialized = TRUE;
+ 	memset(uxa_screen->glyphCaches, 0, sizeof(uxa_screen->glyphCaches));
+ 
+ 	for (i = 0; i < sizeof(formats)/sizeof(formats[0]); i++) {
+@@ -214,17 +222,7 @@ Bool uxa_glyphs_init(ScreenPtr pScreen)
+ 	if (uxa_get_screen(pScreen)->force_fallback)
+ 		return TRUE;
+ 
+-	/* We are trying to initialise per screen resources prior to the
+-	 * complete initialisation of the screen. So ensure the components
+-	 * that we depend upon are initialsed prior to our use.
+-	 */
+-	if (!CreateScratchPixmapsForScreen(pScreen->myNum))
+-		return FALSE;
+-
+-	if (!uxa_realize_glyph_caches(pScreen))
+-		return FALSE;
+-
+-	return TRUE;
++	return uxa_realize_glyph_caches(pScreen);
+ }
+ 
+ /* The most efficient thing to way to upload the glyph to the screen
+diff --git a/uxa/uxa-priv.h b/uxa/uxa-priv.h
+index 92536cc..ac206af 100644
+--- a/uxa/uxa-priv.h
++++ b/uxa/uxa-priv.h
+@@ -139,6 +139,7 @@ typedef struct {
+ 	unsigned offScreenCounter;
+ 
+ 	uxa_glyph_cache_t glyphCaches[UXA_NUM_GLYPH_CACHE_FORMATS];
++	Bool glyph_cache_initialized;
+ 
+ 	PicturePtr solid_clear, solid_black, solid_white;
+ 	uxa_solid_cache_t solid_cache[UXA_NUM_SOLID_CACHE];
+--
+cgit v0.8.3-6-g21f6
diff --git a/debian/patches/110_from_git_da990536eca09c6de74627541cd56ecfad925eda.patch b/debian/patches/110_from_git_da990536eca09c6de74627541cd56ecfad925eda.patch
deleted file mode 100644
index 57caa67..0000000
--- a/debian/patches/110_from_git_da990536eca09c6de74627541cd56ecfad925eda.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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 fe6d90c..7ca8bfe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 101_copy-fb.patch
 107_solid_nullptr_check.patch
-110_from_git_da990536eca09c6de74627541cd56ecfad925eda.patch
+108_undo_dmg_trans_before_append.patch
+109_dont_reconstruct_glyph_cache_on_rotate.patch
Reply to: