VERSION | 2
bin/get-pick-list.sh | 2
debian/changelog | 13 ++-
debian/patches/fix-gpu-hangs-on-bdw.diff | 89 ++++++++++++++++++++++
debian/patches/series | 1
docs/relnotes/10.1.2.html | 3
docs/relnotes/10.1.3.html | 87 +++++++++++++++++++++
src/gallium/state_trackers/xa/xa_context.c | 2
src/glsl/glsl_parser.yy | 11 +-
src/mesa/drivers/dri/i965/gen7_wm_surface_state.c | 2
src/mesa/drivers/dri/i965/gen8_surface_state.c | 3
src/mesa/main/fbobject.c | 2
12 files changed, 209 insertions(+), 8 deletions(-)
New commits:
commit 9039a4c5137710b1a192959a6c20ad783bf2cda6
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Mon May 12 12:42:42 2014 +0300
fix-gpu-hangs-on-bdw.diff: Upstream commit to fix various GPU hangs on
Broadwell.
diff --git a/debian/changelog b/debian/changelog
index 37c7fd0..e45f05d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,12 @@
mesa (10.1.3-0ubuntu1) UNRELEASED; urgency=low
+ [ Maarten Lankhorst ]
* Merge from released debian-unstable.
+ [ Timo Aaltonen ]
+ * fix-gpu-hangs-on-bdw.diff: Upstream commit to fix various GPU hangs
+ on Broadwell.
+
-- Maarten Lankhorst <maarten.lankho...@ubuntu.com> Thu, 08 May 2014
12:32:52 +0200
mesa (10.1.3-1) UNRELEASED; urgency=medium
diff --git a/debian/patches/fix-gpu-hangs-on-bdw.diff
b/debian/patches/fix-gpu-hangs-on-bdw.diff
new file mode 100644
index 0000000..37a564a
--- /dev/null
+++ b/debian/patches/fix-gpu-hangs-on-bdw.diff
@@ -0,0 +1,89 @@
+commit 9584959123b0453cf5313722357e3abb9f736aa7
+Author: Kenneth Graunke <kenn...@whitecape.org>
+Date: Thu May 8 16:44:37 2014 -0700
+
+ i965: Fix GPU hangs on Broadwell in shaders with some control flow.
+
+ According to the documentation, we need to set the source 0 register
+ type to IMM for flow control instructions that have both JIP and UIP.
+
+ Fixes GPU hangs in approximately 10 Piglit tests, 5 es3conform tests,
+ Unigine Crypt, a WebGL raytracer demo, and several Steam titles.
+
+ Cc: "10.2" <mesa-sta...@lists.freedesktop.org>
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=75478
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=75878
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=76939
+ Signed-off-by: Kenneth Graunke <kenn...@whitecape.org>
+ Tested-by: Topi Pohjolainen <topi.pohjolai...@intel.com>
+ Tested-by: Kristian Høgsberg <k...@bitplanet.net>
+ Reviewed-by: Jordan Justen <jordan.l.jus...@intel.com>
+ Reviewed-by: Matt Turner <matts...@gmail.com>
+
+diff --git a/src/mesa/drivers/dri/i965/gen8_generator.cpp
b/src/mesa/drivers/dri/i965/gen8_generator.cpp
+index dd434a7..faca9c0 100644
+--- a/src/mesa/drivers/dri/i965/gen8_generator.cpp
++++ b/src/mesa/drivers/dri/i965/gen8_generator.cpp
+@@ -422,6 +422,7 @@ gen8_generator::IF(unsigned predicate)
+ {
+ gen8_instruction *inst = next_inst(BRW_OPCODE_IF);
+ gen8_set_dst(brw, inst, vec1(retype(brw_null_reg(), BRW_REGISTER_TYPE_D)));
++ gen8_set_src0(brw, inst, brw_imm_d(0));
+ gen8_set_exec_size(inst, default_state.exec_size);
+ gen8_set_pred_control(inst, predicate);
+ gen8_set_mask_control(inst, BRW_MASK_ENABLE);
+@@ -435,6 +436,7 @@ gen8_generator::ELSE()
+ {
+ gen8_instruction *inst = next_inst(BRW_OPCODE_ELSE);
+ gen8_set_dst(brw, inst, retype(brw_null_reg(), BRW_REGISTER_TYPE_D));
++ gen8_set_src0(brw, inst, brw_imm_d(0));
+ gen8_set_mask_control(inst, BRW_MASK_ENABLE);
+ push_if_stack(inst);
+ return inst;
+@@ -456,6 +458,7 @@ gen8_generator::ENDIF()
+
+ gen8_instruction *endif_inst = next_inst(BRW_OPCODE_ENDIF);
+ gen8_set_mask_control(endif_inst, BRW_MASK_ENABLE);
++ gen8_set_src0(brw, endif_inst, brw_imm_d(0));
+ patch_IF_ELSE(if_inst, else_inst, endif_inst);
+
+ return endif_inst;
+@@ -577,8 +580,7 @@ gen8_generator::BREAK()
+ {
+ gen8_instruction *inst = next_inst(BRW_OPCODE_BREAK);
+ gen8_set_dst(brw, inst, retype(brw_null_reg(), BRW_REGISTER_TYPE_D));
+- gen8_set_src0(brw, inst, retype(brw_null_reg(), BRW_REGISTER_TYPE_D));
+- gen8_set_src1(brw, inst, brw_imm_d(0));
++ gen8_set_src0(brw, inst, brw_imm_d(0));
+ gen8_set_exec_size(inst, default_state.exec_size);
+ return inst;
+ }
+@@ -588,8 +590,7 @@ gen8_generator::CONTINUE()
+ {
+ gen8_instruction *inst = next_inst(BRW_OPCODE_CONTINUE);
+ gen8_set_dst(brw, inst, brw_ip_reg());
+- gen8_set_src0(brw, inst, brw_ip_reg());
+- gen8_set_src1(brw, inst, brw_imm_d(0));
++ gen8_set_src0(brw, inst, brw_imm_d(0));
+ gen8_set_exec_size(inst, default_state.exec_size);
+ return inst;
+ }
+@@ -601,8 +602,7 @@ gen8_generator::WHILE()
+ gen8_instruction *while_inst = next_inst(BRW_OPCODE_WHILE);
+
+ gen8_set_dst(brw, while_inst, retype(brw_null_reg(), BRW_REGISTER_TYPE_D));
+- gen8_set_src0(brw, while_inst, retype(brw_null_reg(),
BRW_REGISTER_TYPE_D));
+- gen8_set_src1(brw, while_inst, brw_imm_ud(0));
++ gen8_set_src0(brw, while_inst, brw_imm_d(0));
+ gen8_set_jip(while_inst, 16 * (do_inst - while_inst));
+ gen8_set_exec_size(while_inst, default_state.exec_size);
+
+@@ -614,7 +614,7 @@ gen8_generator::HALT()
+ {
+ gen8_instruction *inst = next_inst(BRW_OPCODE_HALT);
+ gen8_set_dst(brw, inst, retype(brw_null_reg(), BRW_REGISTER_TYPE_D));
+- gen8_set_src0(brw, inst, retype(brw_null_reg(), BRW_REGISTER_TYPE_D));
++ gen8_set_src0(brw, inst, brw_imm_d(0));
+ gen8_set_exec_size(inst, default_state.exec_size);
+ gen8_set_mask_control(inst, BRW_MASK_DISABLE);
+ return inst;
diff --git a/debian/patches/series b/debian/patches/series
index 9d2b8c1..4a26137 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,3 +15,4 @@ fix-kwin.diff
i965-dont-call-abort-on-unknown-dev.diff
enable-bdw.diff
fix-unity-on-bdw.diff
+fix-gpu-hangs-on-bdw.diff
commit cf84149315b24374f152d1a7dc24e073768e5ad9
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Sat May 10 01:21:40 2014 +0300
update the changelog
diff --git a/debian/changelog b/debian/changelog
index 362977c..961e936 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (10.1.3-1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+
+ -- Timo Aaltonen <tjaal...@ubuntu.com> Sat, 10 May 2014 01:20:18 +0300
+
mesa (10.1.2-1) unstable; urgency=medium
[ Andreas Boll ]
commit 0028eb1083e6adc110a23a5f02c993cda217067a
Author: Carl Worth <cwo...@cworth.org>
Date: Fri May 9 07:38:16 2014 -0700
docs: Add release notes for Mesa 10.1.3.
This is an emergencyt release to make a performance-regression fix
available.
diff --git a/docs/relnotes/10.1.3.html b/docs/relnotes/10.1.3.html
new file mode 100644
index 0000000..7c25cac
--- /dev/null
+++ b/docs/relnotes/10.1.3.html
@@ -0,0 +1,87 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
+<html lang="en">
+<head>
+ <meta http-equiv="content-type" content="text/html; charset=utf-8">
+ <title>Mesa Release Notes</title>
+ <link rel="stylesheet" type="text/css" href="../mesa.css">
+</head>
+<body>
+
+<div class="header">
+ <h1>The Mesa 3D Graphics Library</h1>
+</div>
+
+<iframe src="../contents.html"></iframe>
+<div class="content">
+
+<h1>Mesa 10.1.3 Release Notes / (May 9, 2014)</h1>
+
+<p>
+Mesa 10.1.3 is a bug fix release which fixes bugs found since the 10.1.2
release.
+</p>
+
+<p>
+Note: Mesa 10.1.3 is being released sooner than originally scheduled to make
+available a fix for a performance rgression that was inadvertently introduced
+to Mesa 10.1.2. The performance regression is reported to make vmware
+swapbuffers fall back to software.
+</p>
+
+<p>
+Mesa 10.1.3 implements the OpenGL 3.3 API, but the version reported by
+glGetString(GL_VERSION) or glGetIntegerv(GL_MAJOR_VERSION) /
+glGetIntegerv(GL_MINOR_VERSION) depends on the particular driver being used.
+Some drivers don't support all the features required in OpenGL 3.3. OpenGL
+3.3 is <strong>only</strong> available if requested at context creation
+because compatibility contexts are not supported.
+</p>
+
+
+<h2>MD5 checksums</h2>
+<pre>
+</pre>
+
+
+<h2>New features</h2>
+<p>None</p>
+
+<h2>Bug fixes</h2>
+
+<p>This list is likely incomplete.</p>
+
+<ul>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=77245";>Bug 77245</a>
- Bogus GL_ARB_explicit_attrib_location layout identifier warnings</li>
+
+</ul>
+
+
+<h2>Changes</h2>
+
+<p>Carl Worth (3):</p>
+<ul>
+ <li>docs: Add MD5 sums for Mesa 10.1.2</li>
+ <li>get-pick-list.sh: Require explicit "10.1" for nominating stable
patches</li>
+ <li>VERSION: Update to 10.1.3</li>
+</ul>
+
+<p>Kenneth Graunke (2):</p>
+<ul>
+ <li>mesa: Fix MaxNumLayers for 1D array textures.</li>
+ <li>i965: Fix depth (array slices) computation for 1D_ARRAY render
targets.</li>
+</ul>
+
+<p>Tapani Pälli (1):</p>
+<ul>
+ <li>glsl: fix bogus layout qualifier warnings</li>
+</ul>
+
+<p>Thomas Hellstrom (1):</p>
+<ul>
+ <li>st/xa: Fix performance regression introduced by commit "Cache render
target surface"</li>
+</ul>
+
+
+</div>
+</body>
+</html>
commit d4c7ca04c192eaf4dba6fdb18f9efaf201e413dc
Author: Carl Worth <cwo...@cworth.org>
Date: Fri May 9 07:17:36 2014 -0700
VERSION: Update to 10.1.3
For the emergency 10.1.3 release.
diff --git a/VERSION b/VERSION
index b613254..c8d7efc 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-10.1.2
+10.1.3
commit e16de70a90a5a5a651e677b78f146382394c0d4b
Author: Thomas Hellstrom <thellst...@vmware.com>
Date: Thu May 8 09:08:10 2014 +0200
st/xa: Fix performance regression introduced by commit "Cache render target
surface"
The mentioned commit has the nasty side-effect of turning off accelerated
copies.
Cc: "10.1 10.2" <mesa-sta...@lists.freedesktop.org>
Signed-off-by: Thomas Hellstrom <thellst...@vmware.com>
Reviewed-by: Jakob Bornecrantz <ja...@vmware.com>
Reviewed-by: Rob Clark <robdcl...@gmail.com>
(cherry picked from commit 9306b7c171b29ac99f837e9efcd0281caf1d332e)
diff --git a/src/gallium/state_trackers/xa/xa_context.c
b/src/gallium/state_trackers/xa/xa_context.c
index 71d3ddb..7fba2a7 100644
--- a/src/gallium/state_trackers/xa/xa_context.c
+++ b/src/gallium/state_trackers/xa/xa_context.c
@@ -223,7 +223,7 @@ XA_EXPORT int
xa_copy_prepare(struct xa_context *ctx,
struct xa_surface *dst, struct xa_surface *src)
{
- if (src == dst || ctx->srf != NULL)
+ if (src == dst)
return -XA_ERR_INVAL;
if (src->tex->format != dst->tex->format) {
commit f7b949723a1ebcc04a57f8ca5b52d340ffc04d84
Author: Kenneth Graunke <kenn...@whitecape.org>
Date: Wed May 7 14:35:43 2014 -0700
i965: Fix depth (array slices) computation for 1D_ARRAY render targets.
1D array targets store the number of slices in the Height field.
Fixes Piglit's spec/!OpenGL 3.2/layered-rendering/clear-color-all-types
1d_array single_level, at least when used with Meta clears.
Cc: "10.2 10.1 10.0" <mesa-sta...@lists.freedesktop.org>
Signed-off-by: Kenneth Graunke <kenn...@whitecape.org>
Reviewed-by: Jordan Justen <jordan.l.jus...@intel.com>
(cherry picked from commit e6967270c75a5b669152127bb7a746d55f4407a6)
diff --git a/src/mesa/drivers/dri/i965/gen7_wm_surface_state.c
b/src/mesa/drivers/dri/i965/gen7_wm_surface_state.c
index 12d0fa9..dad3b0c 100644
--- a/src/mesa/drivers/dri/i965/gen7_wm_surface_state.c
+++ b/src/mesa/drivers/dri/i965/gen7_wm_surface_state.c
@@ -452,6 +452,8 @@ gen7_update_renderbuffer_surface(struct brw_context *brw,
const uint8_t mocs = GEN7_MOCS_L3;
GLenum gl_target = rb->TexImage ?
rb->TexImage->TexObject->Target : GL_TEXTURE_2D;
+ if (gl_target == GL_TEXTURE_1D_ARRAY)
+ depth = MAX2(rb->Height, 1);
uint32_t surf_index =
brw->wm.prog_data->binding_table.render_target_start + unit;
diff --git a/src/mesa/drivers/dri/i965/gen8_surface_state.c
b/src/mesa/drivers/dri/i965/gen8_surface_state.c
index 22ffa78..efadb0d 100644
--- a/src/mesa/drivers/dri/i965/gen8_surface_state.c
+++ b/src/mesa/drivers/dri/i965/gen8_surface_state.c
@@ -266,6 +266,9 @@ gen8_update_renderbuffer_surface(struct brw_context *brw,
GLenum gl_target =
rb->TexImage ? rb->TexImage->TexObject->Target : GL_TEXTURE_2D;
+ if (gl_target == GL_TEXTURE_1D_ARRAY)
+ depth = MAX2(rb->Height, 1);
+
uint32_t surf_index =
brw->wm.prog_data->binding_table.render_target_start + unit;
commit 558c20fa95f97166c1b452d822856b48ed59f307
Author: Kenneth Graunke <kenn...@whitecape.org>
Date: Wed May 7 14:35:42 2014 -0700
mesa: Fix MaxNumLayers for 1D array textures.
1D array targets store the number of slices in the Height field.
Cc: "10.2 10.1 10.0" <mesa-sta...@lists.freedesktop.org>
Signed-off-by: Kenneth Graunke <kenn...@whitecape.org>
Reviewed-by: Brian Paul <bri...@vmware.com>
Reviewed-by: Marek Olšák <marek.ol...@amd.com>
Reviewed-by: Jordan Justen <jordan.l.jus...@intel.com>
(cherry picked from commit 5c399ca8e4ccae509a5116b3b9f41634a7ca4322)
diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index 42f78cc..8090a63 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -1055,6 +1055,8 @@ _mesa_test_framebuffer_completeness(struct gl_context
*ctx,
if (att->Layered) {
if (att_tex_target == GL_TEXTURE_CUBE_MAP)
att_layer_count = 6;
+ else if (att_tex_target == GL_TEXTURE_1D_ARRAY)
+ att_layer_count = att->Renderbuffer->Height;
else
att_layer_count = att->Renderbuffer->Depth;
} else {
commit 31462dc748b3c08cf7cad3df834388791a789248
Author: Tapani Pälli <tapani.pa...@intel.com>
Date: Wed Apr 30 10:56:59 2014 +0300
glsl: fix bogus layout qualifier warnings
Print out GL_ARB_explicit_attrib_location warnings only
when parsing attribute that uses "location" qualifier.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=77245
Signed-off-by: Tapani Pälli <tapani.pa...@intel.com>
Reviewed-by: Anuj Phogat <anuj.pho...@gmail.com>
Cc: "10.1 10.2" <mesa-sta...@lists.freedesktop.org>
(cherry picked from commit e65917f94e5fd13eb75f874fac4d77a29737e808)
diff --git a/src/glsl/glsl_parser.yy b/src/glsl/glsl_parser.yy
index f939fe8..a9d4942 100644
--- a/src/glsl/glsl_parser.yy
+++ b/src/glsl/glsl_parser.yy
@@ -1242,6 +1242,13 @@ layout_qualifier_id:
if (match_layout_qualifier("location", $1, state) == 0) {
$$.flags.q.explicit_location = 1;
+ if ($$.flags.q.attribute == 1 &&
+ state->ARB_explicit_attrib_location_warn) {
+ _mesa_glsl_warning(& @1, state,
+ "GL_ARB_explicit_attrib_location layout "
+ "identifier `%s' used", $1);
+ }
+
if ($3 >= 0) {
$$.location = $3;
} else {
@@ -1298,10 +1305,6 @@ layout_qualifier_id:
_mesa_glsl_error(& @1, state, "unrecognized layout identifier "
"`%s'", $1);
YYERROR;
- } else if (state->ARB_explicit_attrib_location_warn) {
- _mesa_glsl_warning(& @1, state,
- "GL_ARB_explicit_attrib_location layout "
- "identifier `%s' used", $1);
}
}
| interface_block_layout_qualifier
commit 994203bf5e4098da31401b86782b6037016b51d0
Author: Carl Worth <cwo...@cworth.org>
Date: Mon May 5 13:27:11 2014 -0700
get-pick-list.sh: Require explicit "10.1" for nominating stable patches
A nomination unadorned with a specific version is now interpreted as being
aimed at the 10.2 branch, (which was recently opened).
diff --git a/bin/get-pick-list.sh b/bin/get-pick-list.sh
index 0902fd0..840f5fb 100755
--- a/bin/get-pick-list.sh
+++ b/bin/get-pick-list.sh
@@ -14,7 +14,7 @@ git log --reverse --grep="cherry picked from commit"
origin/master..HEAD |\
sed -e 's/^[[:space:]]*(cherry picked from commit[[:space:]]*//' -e
's/)//' > already_picked
# Grep for commits that were marked as a candidate for the stable tree.
-git log --reverse --pretty=%H -i --grep='^\([[:space:]]*NOTE:
.*[Cc]andidate\|CC:.*mesa-stable\)' HEAD..origin/master |\
+git log --reverse --pretty=%H -i --grep='^\([[:space:]]*NOTE:
.*[Cc]andidate\|CC:.*10\.1.*mesa-stable\)' HEAD..origin/master |\
while read sha
do
# Check to see whether the patch is on the ignore list.
commit 08da743a97884ef8a5031f37f91a7f45ffc1a258
Author: Carl Worth <cwo...@cworth.org>
Date: Mon May 5 11:30:13 2014 -0700
docs: Add MD5 sums for Mesa 10.1.2
Immediately after creating the 10.1.2 tar files.
diff --git a/docs/relnotes/10.1.2.html b/docs/relnotes/10.1.2.html
index 035d9e6..ebc9aad 100644
--- a/docs/relnotes/10.1.2.html
+++ b/docs/relnotes/10.1.2.html
@@ -31,6 +31,9 @@ because compatibility contexts are not supported.
<h2>MD5 checksums</h2>
<pre>
+37d79f94b1f41852a89d1fc3900bea76 MesaLib-10.1.2.tar.gz
+28b60d15ac9f364da1e0155911eaf44e MesaLib-10.1.2.tar.bz2
+05300039085a65fc53c5472c4bb5747a MesaLib-10.1.2.zip
</pre>
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1wjml2-0002zs...@moszumanska.debian.org
