xserver-xorg-video-intel: Changes to 'ubuntu'
debian/changelog | 7 ++++++-
debian/patches/fix-glamor-check.diff | 29 +++++++++++++++++++++++++++++
debian/patches/series | 2 +-
3 files changed, 36 insertions(+), 2 deletions(-)
New commits:
commit 15003153c9500ea977c53827f2c033769b365528
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Mon Oct 1 14:21:40 2012 +0200
Add patch to fix a valgrind error.
* Add patch to fix a valgrind error.
- fix-glamor-check.diff
diff --git a/debian/changelog b/debian/changelog
index 4fb7b75..215bf33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
xserver-xorg-video-intel (2:2.20.9-1) UNRELEASED; urgency=low
+ [ Timo Aaltonen ]
* New upstream bugfix release.
- Fixes a long-standing bug in UXA pageflip code that was the
source of many GPU hangs.
+ [ Maarten Lankhorst ]
+ * Add patch to fix a valgrind error.
+ - fix-glamor-check.diff
+
-- Timo Aaltonen <tjaalton@ubuntu.com> Wed, 05 Sep 2012 17:07:07 +0300
xserver-xorg-video-intel (2:2.20.5-1) experimental; urgency=low
diff --git a/debian/patches/fix-glamor-check.diff b/debian/patches/fix-glamor-check.diff
new file mode 100644
index 0000000..9192a5f
--- /dev/null
+++ b/debian/patches/fix-glamor-check.diff
@@ -0,0 +1,29 @@
+commit 51202798862c79ad417936cfe2d1847b1da4ab87
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Mon Oct 1 13:06:42 2012 +0100
+
+ uxa: Remove USE_GLAMOR check from unrealize glyph caches
+
+ In an interesting twist during teardown, the driver info structure is
+ freed long before the caches. However, the glyph cache teardown was
+ checking to see if glamor was enabled to see if it could skip the
+ teardown. In fact, since we won't have created the glyph caches in that
+ circumstances it was safe any way.
+
+ Reported-by: Maarten Lankhorst <m.b.lankhorst@gmail.com>
+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+diff --git a/uxa/uxa-glyphs.c b/uxa/uxa-glyphs.c
+index 527942a..f5d4d08 100644
+--- a/uxa/uxa-glyphs.c
++++ b/uxa/uxa-glyphs.c
+@@ -112,9 +112,6 @@ static void uxa_unrealize_glyph_caches(ScreenPtr pScreen)
+ uxa_screen_t *uxa_screen = uxa_get_screen(pScreen);
+ int i;
+
+- if (uxa_screen->info->flags & UXA_USE_GLAMOR)
+- return;
+-
+ if (!uxa_screen->glyph_cache_initialized)
+ return;
+
diff --git a/debian/patches/series b/debian/patches/series
index a82d1b4..b5a308d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-#placeholder
+fix-glamor-check.diff
commit e77c1a9bd61777f6fee35942924d6ce07ece2a42
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Sun Sep 30 00:13:51 2012 +0300
fix the changelog entry
diff --git a/debian/changelog b/debian/changelog
index befb455..4fb7b75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@ xserver-xorg-video-intel (2:2.20.9-1) UNRELEASED; urgency=low
* New upstream bugfix release.
- Fixes a long-standing bug in UXA pageflip code that was the
- source of many GPU and application crashes.
+ source of many GPU hangs.
-- Timo Aaltonen <tjaalton@ubuntu.com> Wed, 05 Sep 2012 17:07:07 +0300
Reply to: