debian/changelog | 6 ++++++ src/i965_render.c | 2 +- src/i965_video.c | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-)
New commits: commit 29c1e5fe54d3c282448d706b6cefbabb36e77e61 Author: Julien Cristau <jcris...@debian.org> Date: Fri Jul 27 10:54:39 2012 +0200 Upload to unstable diff --git a/debian/changelog b/debian/changelog index 9c97d52..31df6c9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-video-intel (2:2.19.0-5) unstable; urgency=high + + * Reduce maximum thread count for IVB GT1 to avoid spontaneous combustion + + -- Julien Cristau <jcris...@debian.org> Fri, 27 Jul 2012 10:54:27 +0200 + xserver-xorg-video-intel (2:2.19.0-4) unstable; urgency=medium [ Julien Cristau ] commit b45db236c2ce520d356efe9530e66b07568d8c78 Author: Chris Wilson <ch...@chris-wilson.co.uk> Date: Thu Jul 26 10:50:31 2012 +0100 Reduce maximum thread count for IVB GT1 to avoid spontaneous combustion Somewhere along the way it seems that IVB GT1 was reduced to only allow a maximum of 48 threads, as revealed in the lastest bspecs. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=52473 Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk> (cherry picked from commit 1ced4f1ddcf30b518e1760c7aa4a5ed4f934b9f5) Conflicts: src/sna/gen7_render.c diff --git a/src/i965_render.c b/src/i965_render.c index b981ecc..2faf085 100644 --- a/src/i965_render.c +++ b/src/i965_render.c @@ -2644,7 +2644,7 @@ gen7_composite_wm_state(intel_screen_private *intel, OUT_BATCH((1 << GEN7_PS_SAMPLER_COUNT_SHIFT) | (num_surfaces << GEN7_PS_BINDING_TABLE_ENTRY_COUNT_SHIFT)); OUT_BATCH(0); /* scratch space base offset */ - OUT_BATCH(((86 - 1) << GEN7_PS_MAX_THREADS_SHIFT) | + OUT_BATCH(((48 - 1) << GEN7_PS_MAX_THREADS_SHIFT) | GEN7_PS_ATTRIBUTE_ENABLE | GEN7_PS_16_DISPATCH_ENABLE); OUT_BATCH((6 << GEN7_PS_DISPATCH_START_GRF_SHIFT_0)); diff --git a/src/i965_video.c b/src/i965_video.c index c94f530..f56bef4 100644 --- a/src/i965_video.c +++ b/src/i965_video.c @@ -1656,7 +1656,7 @@ gen7_upload_wm_state(ScrnInfoPtr scrn, Bool is_packed) OUT_BATCH(0); /* scratch space base offset */ OUT_BATCH( - ((86 - 1) << GEN7_PS_MAX_THREADS_SHIFT) | + ((48 - 1) << GEN7_PS_MAX_THREADS_SHIFT) | GEN7_PS_ATTRIBUTE_ENABLE | GEN7_PS_16_DISPATCH_ENABLE); OUT_BATCH( -- 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/e1sugpy-0008c6...@vasks.debian.org