debian/changelog | 7 +++++++
debian/patches/07_fix_i915_dri1.patch | 31 +++++++++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 39 insertions(+)
New commits:
commit 9392dd615c6945955e0ace5f951fca697759dafa
Author: Brice Goglin <bgog...@debian.org>
Date: Tue Jul 13 22:22:39 2010 +0200
Add 07_fix_i915_dri1.patch
diff --git a/debian/changelog b/debian/changelog
index 722b102..d5c9a1f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (7.7.1-4) UNRELEASED; urgency=low
+
+ * Add 07_fix_i915_dri1.patch to fix X server crash when starting Compiz
+ on i8xx when using legacy UMS/DRI1.
+
+ -- Brice Goglin <bgog...@debian.org> Tue, 13 Jul 2010 22:21:06 +0200
+
mesa (7.7.1-3) unstable; urgency=medium
* Pull from mesa_7_7_branch to get the fix for a regression introduced in
diff --git a/debian/patches/07_fix_i915_dri1.patch
b/debian/patches/07_fix_i915_dri1.patch
new file mode 100644
index 0000000..71ccc0d
--- /dev/null
+++ b/debian/patches/07_fix_i915_dri1.patch
@@ -0,0 +1,31 @@
+Fix crash when starting Compiz on i865 when using DRI1/UMS
+legacy support (by Chris Wilson for i8xx support).
+
+#0 0xaeefb6e2 in i830_update_tex_unit (intel=0x8b7be70, unit=<value optimized
out>, ss3=0) at i830_texstate.c:186
+#1 0xaeefbcf3 in i830UpdateTextureState (intel=0x8b7be70) at
i830_texstate.c:343
+#2 0xaef42339 in intelRunPipeline (ctx=0x8b7be70) at intel_tris.c:1067
+#3 0xaefebaf6 in _tnl_draw_prims (ctx=0x8b7be70, arrays=0x8b1ff24,
prim=0xbfd3ac20, nr_prims=1, ib=0x0, min_index=0, max_index=3) at
tnl/t_draw.c:467
+#4 0xaefebf59 in _tnl_vbo_draw_prims (ctx=0x8b7be70, arrays=0x8b1ff24,
prim=0xbfd3ac20, nr_prims=1, ib=0x0, index_bounds_valid=1 '\001', min_index=0,
max_index=3) at tnl/t_draw.c:376
+#5 0xaefe3641 in vbo_exec_DrawArrays (mode=7, start=0, count=4) at
vbo/vbo_exec_array.c:524
+#6 0xaefda327 in neutral_DrawArrays (mode=7, start=0, count=4) at
main/vtxfmt_tmp.h:327
+#7 0xb7324289 in __glXDisp_DrawArrays (pc=0x89ebb8c "") at
../../glx/render2.c:242
+#8 0xb731e0e4 in __glXDisp_Render (cl=0x8986f20, pc=0x89ebb5c "x") at
../../glx/glxcmds.c:1823
+#9 0xb73229e2 in __glXDispatch (client=0x8b2b528) at ../../glx/glxext.c:578
+#10 0x080740d7 in Dispatch () at ../../dix/dispatch.c:439
+#11 0x080668fa in main (argc=12, argv=0xbfd3aee4, envp=0xbfd3af18) at
../../dix/main.c:285
+
+---
+ src/mesa/drivers/dri/i915/i830_texstate.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/src/mesa/drivers/dri/i915/i830_texstate.c
++++ b/src/mesa/drivers/dri/i915/i830_texstate.c
+@@ -183,7 +183,7 @@ i830_update_tex_unit(struct intel_contex
+ (((firstImage->Height - 1) << TM0S1_HEIGHT_SHIFT) |
+ ((firstImage->Width - 1) << TM0S1_WIDTH_SHIFT) | format);
+
+- if (intelObj->mt->region->tiling != I915_TILING_NONE) {
++ if (intelObj->mt && intelObj->mt->region->tiling != I915_TILING_NONE) {
+ state[I830_TEXREG_TM0S1] |= TM0S1_TILED_SURFACE;
+ if (intelObj->mt->region->tiling == I915_TILING_Y)
+ state[I830_TEXREG_TM0S1] |= TM0S1_TILE_WALK;
diff --git a/debian/patches/series b/debian/patches/series
index 1f29aca..8cf687d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
04_osmesa_version.diff
05_hurd-ftbfs.diff
06_kfreebsd-ftbfs.diff
+07_fix_i915_dri1.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/e1oym0m-0001wp...@alioth.debian.org
