debian/changelog | 14 ++++
debian/patches/117_i965_only_set_last_render_target_last.patch | 30
++++++++++
debian/patches/series | 1
3 files changed, 44 insertions(+), 1 deletion(-)
New commits:
commit 72f52a6cfba231df90b60792e9d701ea52eb4b8a
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Sat Mar 17 19:21:01 2012 +0200
merge changes from the real -0u4
diff --git a/debian/changelog b/debian/changelog
index ad05b2a..070792e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,22 @@
-mesa (8.0.1-0ubuntu4) precise; urgency=low
+mesa (8.0.1-0ubuntu5) precise; urgency=low
* control: libegl1-mesa-dev should depend on -drivers so that the
symlinks work.
-- Timo Aaltonen <tjaal...@ubuntu.com> Sat, 17 Mar 2012 18:56:24 +0200
+mesa (8.0.1-0ubuntu4) precise; urgency=low
+
+ * Add 117_i965_only_set_last_render_target_last.patch: Fix GPU lockups
+ on Intel when playing certain games (Ski Challenge 2012, OilRush,
+ Trine, and possibly others). These games use MRT (multiple render
+ targets), and mesa was not setting the Last Render Target Select
+ properly. Cherrypick from upstream, will be included in the upcoming
+ 8.0.2 release.
+ (LP: #899159)
+
+ -- Bryce Harrington <br...@ubuntu.com> Tue, 13 Mar 2012 14:26:30 -0700
+
mesa (8.0.1-0ubuntu3) precise; urgency=low
* Ship libwayland-egl.so.* only in libegl1-mesa-drivers, replace
diff --git a/debian/patches/117_i965_only_set_last_render_target_last.patch
b/debian/patches/117_i965_only_set_last_render_target_last.patch
new file mode 100644
index 0000000..a2abf84
--- /dev/null
+++ b/debian/patches/117_i965_only_set_last_render_target_last.patch
@@ -0,0 +1,30 @@
+commit 172bb92db1a3c317867d9cfec6f15c09c37a0f6c
+Author: Kenneth Graunke <kenn...@whitecape.org>
+Date: Sat Feb 18 21:29:29 2012 -0800
+
+ i965: Only set Last Render Target Select on the last FB write.
+
+ Fixes GPU hangs in OilRush, Trine, and Amnesia: The Dark Descent,
+ which all use MRT (multiple render targets).
+
+ NOTE: This is a candidate for release branches.
+
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=38720
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=40059
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=45216
+ Reviewed-by: Eric Anholt <e...@anholt.net>
+ Signed-off-by: Kenneth Graunke <kenn...@whitecape.org>
+
+diff --git a/src/mesa/drivers/dri/i965/brw_eu_emit.c
b/src/mesa/drivers/dri/i965/brw_eu_emit.c
+index 839f6c3..179b59a 100644
+--- a/src/mesa/drivers/dri/i965/brw_eu_emit.c
++++ b/src/mesa/drivers/dri/i965/brw_eu_emit.c
+@@ -2270,7 +2270,7 @@ void brw_fb_WRITE(struct brw_compile *p,
+ msg_type,
+ msg_length,
+ header_present,
+- 1, /* last render target write */
++ eot, /* last render target write */
+ response_length,
+ eot,
+ 0 /* send_commit_msg */);
diff --git a/debian/patches/series b/debian/patches/series
index 50aa029..70992ed 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,4 @@
113_fix_tls.diff
115_llvm_dynamic_linking.diff
116_use_shared_galliumcore.diff
+117_i965_only_set_last_render_target_last.patch
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1s8xk6-0005uu...@vasks.debian.org
