[mesa/f15] nouveau: fix shell segfault on pre-gallium drivers

[Ben Skeggs]

commit 3b26e3f924f449f077d7a8c35c4b78b76add33ef
Author: Ben Skeggs <bskeggs at redhat.com>
Date:   Mon Jun 6 10:52:28 2011 +1000

    nouveau: fix shell segfault on pre-gallium drivers

 mesa-7.11-nouveau-old-gs.patch |   26 ++++++++++++++++++++++++++
 mesa.spec                      |    8 ++++++++
 2 files changed, 34 insertions(+), 0 deletions(-)
---
diff --git a/mesa-7.11-nouveau-old-gs.patch b/mesa-7.11-nouveau-old-gs.patch
new file mode 100644
index 0000000..dbd8a1b
--- /dev/null
+++ b/mesa-7.11-nouveau-old-gs.patch
@@ -0,0 +1,26 @@
+From 1d24e6ec1d13c2b88b858997900aa8b69de92b13 Mon Sep 17 00:00:00 2001
+From: Ben Skeggs <bskeggs at redhat.com>
+Date: Mon, 6 Jun 2011 10:17:59 +1000
+Subject: [PATCH] dri/nouveau: fix gnome-shell segfault
+
+Signed-off-by: Ben Skeggs <bskeggs at redhat.com>
+---
+ src/mesa/drivers/dri/nouveau/nouveau_context.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/mesa/drivers/dri/nouveau/nouveau_context.c b/src/mesa/drivers/dri/nouveau/nouveau_context.c
+index 71dde41..22b9957 100644
+--- a/src/mesa/drivers/dri/nouveau/nouveau_context.c
++++ b/src/mesa/drivers/dri/nouveau/nouveau_context.c
+@@ -261,7 +261,7 @@ nouveau_update_renderbuffers(__DRIcontext *dri_ctx, __DRIdrawable *draw)
+ 		assert(!ret);
+ 	}
+ 
+-	_mesa_resize_framebuffer(NULL, fb, draw->w, draw->h);
++	_mesa_resize_framebuffer(ctx, fb, draw->w, draw->h);
+ }
+ 
+ static void
+-- 
+1.7.5.2
+
diff --git a/mesa.spec b/mesa.spec
index 2d1e999..55e8aca 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -44,6 +44,9 @@ Patch31: mesa-7.10-swrastg.patch
 # build fix
 Patch40: mesa-20110525-gallium-config.patch
 
+# fix gnome-shell on pre-nv30 chipsets
+Patch41: mesa-7.11-nouveau-old-gs.patch
+
 BuildRequires: pkgconfig autoconf automake libtool
 %if %{with_hardware}
 BuildRequires: kernel-headers >= 2.6.27-0.305.rc5.git6
@@ -230,6 +233,8 @@ Requires: Xorg %(xserver-sdk-abi-requires ansic) %(xserver-sdk-abi-requires vide
 
 %patch40 -p1 -b .header-order
 
+%patch41 -p1 -b .vieux-gs
+
 %build
 
 autoreconf --install  
@@ -493,6 +498,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libOSMesa.so
 
 %changelog
+* Mon Jul 06 2011 Ben Skeggs <bskeggs at redhat.com> 7.11-0.13.20110525.0
+- nouveau: fix shell segfault on pre-gallium drivers (#708004)
+
 * Mon May 30 2011 Dan Horák <dan[at]danny.cz> 7.11-0.12.20110525.0
 - fix the gallium p_config header for non-x86 arches (Dave Airlie)