From 2baefa10c8fcdf217e75646bd6a0d120aa5c231b2bd4fb570a606e58280b4ed4 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 8 Aug 2012 14:26:07 +0000 Subject: [PATCH] Accepting request 130415 from home:tiwai:branches:X11:XOrg - U_i965-gen7-Reduce-GT1-WM-thread-count-according-to-up.patch * Fix GPU hang with IVB GT1 desktop (bnc#775048) OBS-URL: https://build.opensuse.org/request/show/130415 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=235 --- Mesa.changes | 6 ++++ Mesa.spec | 2 ++ ...-GT1-WM-thread-count-according-to-up.patch | 30 +++++++++++++++++++ 3 files changed, 38 insertions(+) create mode 100644 U_i965-gen7-Reduce-GT1-WM-thread-count-according-to-up.patch diff --git a/Mesa.changes b/Mesa.changes index eaeb7bc..dfd8f60 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Aug 8 15:43:20 CEST 2012 - tiwai@suse.de + +- U_i965-gen7-Reduce-GT1-WM-thread-count-according-to-up.patch + * Fix GPU hang with IVB GT1 desktop (bnc#775048) + ------------------------------------------------------------------- Tue Jul 10 23:42:04 UTC 2012 - tobias.johannes.klausmann@mni.thm.de diff --git a/Mesa.spec b/Mesa.spec index b398e27..8c245e4 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -95,6 +95,7 @@ Patch12: upstream-llvm-patch.diff Patch13: u_mesa-8.0.1-fix-16bpp.patch # Patch to remove OS ABI tag from libGL, so it is no longer preferred over libGLs without OS ABI tag Patch14: u_remove-os-abi-tag.patch +Patch15: U_i965-gen7-Reduce-GT1-WM-thread-count-according-to-up.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -477,6 +478,7 @@ rm -rf docs/README.{VMS,WIN32,OS2} %patch12 -p1 %patch13 -p1 %patch14 -p1 +%patch15 -p1 %build diff --git a/U_i965-gen7-Reduce-GT1-WM-thread-count-according-to-up.patch b/U_i965-gen7-Reduce-GT1-WM-thread-count-according-to-up.patch new file mode 100644 index 0000000..151fbf3 --- /dev/null +++ b/U_i965-gen7-Reduce-GT1-WM-thread-count-according-to-up.patch @@ -0,0 +1,30 @@ +From 539a02b9a73276a6d012436e296cfab55d5257a3 Mon Sep 17 00:00:00 2001 +From: Eric Anholt +Date: Fri, 27 Jul 2012 11:34:07 -0700 +Subject: [PATCH 03/11] i965/gen7: Reduce GT1 WM thread count according to + updated BSpec. + +Acked-by: Kenneth Graunke + +https://bugs.freedesktop.org/show_bug.cgi?id=52382 +(cherry picked from commit fbf86c7f0f1f12e52b927e3870535073879d0a4d) +--- + src/mesa/drivers/dri/i965/brw_context.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c +index a66ccc7..78bc6f9 100644 +--- a/src/mesa/drivers/dri/i965/brw_context.c ++++ b/src/mesa/drivers/dri/i965/brw_context.c +@@ -240,7 +240,7 @@ brwCreateContext(int api, + /* WM maximum threads is number of EUs times number of threads per EU. */ + if (intel->gen >= 7) { + if (intel->gt == 1) { +- brw->max_wm_threads = 86; ++ brw->max_wm_threads = 48; + brw->max_vs_threads = 36; + brw->max_gs_threads = 36; + brw->urb.size = 128; +-- +1.7.11.4 +