debian/changelog | 10 +++++++ debian/patches/120_fix_tfp_texture_free.patch | 37 ++++++++++++++++++++++++++ debian/patches/series | 1 3 files changed, 48 insertions(+)
New commits: commit 41ea52abb2198581d7530340044c469fddf1fd28 Author: Bryce Harrington <[email protected]> Date: Fri Feb 17 10:06:43 2012 -0800 * Add 120_fix_tfp_texture_free.patch: Fixes segmentation fault in nv50_screen_fence_update when running nouveau with the egl_dri2 driver or running the /usr/bin/es2_info utility. This is an upstream backport of a patch from mesa 8.0. (LP: #926918) diff --git a/debian/changelog b/debian/changelog index 9770c22..e3cc9f8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +mesa (7.11-0ubuntu3.1) oneiric-proposed; urgency=low + + * Add 120_fix_tfp_texture_free.patch: Fixes segmentation fault in + nv50_screen_fence_update when running nouveau with the egl_dri2 driver + or running the /usr/bin/es2_info utility. This is an upstream + backport of a patch from mesa 8.0. + (LP: #926918) + + -- Bryce Harrington <[email protected]> Thu, 16 Feb 2012 12:07:57 -0800 + mesa (7.11-0ubuntu3) oneiric; urgency=low [ Christopher James Halse Rogers ] diff --git a/debian/patches/120_fix_tfp_texture_free.patch b/debian/patches/120_fix_tfp_texture_free.patch new file mode 100644 index 0000000..f9e97ae --- /dev/null +++ b/debian/patches/120_fix_tfp_texture_free.patch @@ -0,0 +1,37 @@ +commit b2f1366c2825aeee3411c88db5c8e6b426191487 +Author: Bryce Harrington <[email protected]> +Date: Thu Jan 26 15:30:24 2012 -0800 + + Backport of the following patch to oneiric: + + commit d430e81c3287eba4ee84ca1639a23f92bbe22c8e + Author: Eric Anholt <[email protected]> + Date: Wed Sep 21 15:17:36 2011 -0700 + + intel: Fix improper freeing of texture data in TFP. + + If there happened to be ->Data present, we assertion failed instead + of handling it correctly. + + Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=35234 + Acked-by: Kenneth Graunke <[email protected]> + + Most of the surrounding code has changed, so it's unclear if this change + alone is sufficient to resolve the problem. + +diff --git a/src/mesa/drivers/dri/intel/intel_tex_image.c b/src/mesa/drivers/dri/intel/intel_tex_image.c +index 269faef..4d0968e 100644 +--- a/src/mesa/drivers/dri/intel/intel_tex_image.c ++++ b/src/mesa/drivers/dri/intel/intel_tex_image.c +@@ -822,10 +822,7 @@ intelSetTexBuffer2(__DRIcontext *pDRICtx, GLint target, + texImage = _mesa_get_tex_image(&intel->ctx, texObj, target, level); + intelImage = intel_texture_image(texImage); + +- if (intelImage->mt) { +- intel_miptree_release(intel, &intelImage->mt); +- assert(!texImage->Data); +- } ++ ctx->Driver.FreeTextureImageBuffer(ctx, image); + if (intelObj->mt) + intel_miptree_release(intel, &intelObj->mt); + diff --git a/debian/patches/series b/debian/patches/series index ec47260..f8fe42b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -17,3 +17,4 @@ 117_handle_dri2connect_errors_when_indirect.diff 118_fix_24bpp_software_renering.diff 119_r600g_gnome_shell_rendering_fix.diff +120_fix_tfp_texture_free.patch -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
