debian/changelog | 7 ++--
debian/patches/112_fix_segfault_on_nvAF.diff | 47 +++++++++++++++++++++++++++
debian/patches/series | 1
3 files changed, 53 insertions(+), 2 deletions(-)
New commits:
commit bbc6a63899f967fc1656477358809a1c2af210e3
Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com>
Date: Tue Mar 8 16:05:44 2011 +1100
Release to natty
diff --git a/debian/changelog b/debian/changelog
index 64cccad..91e5407 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (7.10.1-0ubuntu1) UNRELEASED; urgency=low
+mesa (7.10.1-0ubuntu1) natty; urgency=low
* New upstream bugfix release.
- Drop cherry-picks now upstream:
commit 872294983f4b41f4eeb09181d866d3cc9a0f1e06
Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com>
Date: Tue Mar 8 16:05:23 2011 +1100
Add patch fixing X segfault on startup with nvAF chips
diff --git a/debian/changelog b/debian/changelog
index 27f2cba..64cccad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,11 @@ mesa (7.10.1-0ubuntu1) UNRELEASED; urgency=low
- Drop cherry-picks now upstream:
+ 110_nv50_fix_tgsi_sign_mode.diff
+ 109_fix_length_of_glxgetfbconfigssgix.patch
+ * 112_fix_segfault_on_nvAF.diff:
+ - Fix from nouveau ML for segfault on X startup with nvAF cards.
+ Fixed differently in upstream/master, so drop after 7.10 (LP: #723012)
- -- Christopher James Halse Rogers <r...@ubuntu.com> Thu, 03 Mar 2011
12:50:41 +1100
+ -- Christopher James Halse Rogers <r...@ubuntu.com> Tue, 08 Mar 2011
16:04:56 +1100
mesa (7.10.1~git20110215.cc1636b6-0ubuntu2) natty; urgency=low
diff --git a/debian/patches/112_fix_segfault_on_nvAF.diff
b/debian/patches/112_fix_segfault_on_nvAF.diff
new file mode 100644
index 0000000..0fc1619
--- /dev/null
+++ b/debian/patches/112_fix_segfault_on_nvAF.diff
@@ -0,0 +1,47 @@
+Subject: [Nouveau] [PATCH] gallium/nv50: use 0x8697 class on NVAF
+Upstream: No (but fixed in mesa master, so drop after 7.10)
+Addresses:
https://bugs.launchpad.net/ubuntu/+source/xserver-xorg-video-nouveau/+bug/723012
+
+Reported-and-tested-by: Alan Pope
+---
+ src/gallium/drivers/nv50/nv50_reg.h | 4 ++++
+ src/gallium/drivers/nv50/nv50_screen.c | 3 +++
+ 2 files changed, 7 insertions(+), 0 deletions(-)
+
+diff --git a/src/gallium/drivers/nv50/nv50_reg.h
b/src/gallium/drivers/nv50/nv50_reg.h
+index 949838b..90d77e5 100644
+--- a/src/gallium/drivers/nv50/nv50_reg.h
++++ b/src/gallium/drivers/nv50/nv50_reg.h
+@@ -1685,6 +1685,10 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
+
+
+
++#define NVAFTCL
0x00008697
++
++
++
+ #define NV50_COMPUTE
0x000050c0
+
+ #define NV50_COMPUTE_NOP
0x00000100
+diff --git a/src/gallium/drivers/nv50/nv50_screen.c
b/src/gallium/drivers/nv50/nv50_screen.c
+index edc3d54..8069509 100644
+--- a/src/gallium/drivers/nv50/nv50_screen.c
++++ b/src/gallium/drivers/nv50/nv50_screen.c
+@@ -389,6 +389,9 @@ nv50_screen_create(struct pipe_winsys *ws, struct
nouveau_device *dev)
+ case 0xac:
+ tesla_class = NVA0TCL;
+ break;
++ case 0xaf:
++ tesla_class = NVAFTCL;
++ break;
+ default:
+ tesla_class = NVA8TCL;
+ break;
+--
+1.7.4.rc3
+
+_______________________________________________
+Nouveau mailing list
+nouv...@lists.freedesktop.org
+http://lists.freedesktop.org/mailman/listinfo/nouveau
+
diff --git a/debian/patches/series b/debian/patches/series
index 7047e2b..e285b21 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@
105_use_shared_libdricore.patch
108_fix_leaks_dri2_screen_creation.patch
111_export_searchdirs_in_dripc.diff
+112_fix_segfault_on_nvAF.diff
--
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/e1pxsqk-00076u...@alioth.debian.org
