debian/changelog | 8
++
debian/patches/04_git_nouveau_fix_sigsegv_in_nouveau_bo_new_tile.patch | 27
++++++++++
debian/patches/series | 1
3 files changed, 36 insertions(+)
New commits:
commit 81d02451389f814eae81eec578ea84f36e79e6ac
Author: Christopher James Halse Rogers <r...@ubuntu.com>
Date: Mon Apr 12 18:18:21 2010 +1000
* Cherry pick fix for LP: #547124 from upstream.
* Edit to also fix the 0.0.15 API path dropped in the 0.0.16 API
diff --git a/debian/changelog b/debian/changelog
index f63398c..a80aff9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libdrm (2.4.18-1ubuntu3) lucid; urgency=low
+
+ * debian/patches/04_git_nouveau_fix_sigsegv_in_nouveau_bo_new_tile.patch:
+ + Cherry pick from upstream git. Fixes a segfault in libdrm_nouveau on
+ X start for some cards (LP: #547124)
+
+ -- Christopher James Halse Rogers <r...@ubuntu.com> Mon, 12 Apr 2010
11:14:11 +1000
+
libdrm (2.4.18-1ubuntu2) lucid; urgency=low
* libdrm-nouveau1.symbols: Add a missing symbol introduced in 2.4.18.
diff --git
a/debian/patches/04_git_nouveau_fix_sigsegv_in_nouveau_bo_new_tile.patch
b/debian/patches/04_git_nouveau_fix_sigsegv_in_nouveau_bo_new_tile.patch
new file mode 100644
index 0000000..731b52c
--- /dev/null
+++ b/debian/patches/04_git_nouveau_fix_sigsegv_in_nouveau_bo_new_tile.patch
@@ -0,0 +1,27 @@
+commit df32c307e8f81b46ee8aa4dd7222fc18f175bbb3
+Author: Ben Skeggs <bske...@redhat.com>
+Date: Fri Mar 19 10:17:19 2010 +1000
+
+ nouveau: fix segfault in nouveau_bo_new_tile() failure path
+
+Index: libdrm/nouveau/nouveau_bo.c
+===================================================================
+--- libdrm.orig/nouveau/nouveau_bo.c 2010-04-12 16:25:05.273755445 +1000
++++ libdrm/nouveau/nouveau_bo.c 2010-04-12 16:27:51.000000000 +1000
+@@ -198,14 +198,14 @@
+ if (flags & (NOUVEAU_BO_VRAM | NOUVEAU_BO_GART)) {
+ ret = nouveau_bo_kalloc(nvbo, NULL);
+ if (ret) {
+- nouveau_bo_ref(NULL, (void *)nvbo);
++ nouveau_bo_ref(NULL, (void *)&nvbo);
+ return ret;
+ }
+
+ if (flags & NOUVEAU_BO_PIN) {
+ ret = nouveau_bo_pin((void *)nvbo, nvbo->flags);
+ if (ret) {
+- nouveau_bo_ref(NULL, (void *)nvbo);
++ nouveau_bo_ref(NULL, (void *)&nvbo);
+ return ret;
+ }
+ }
diff --git a/debian/patches/series b/debian/patches/series
index bf7b2ff..c834409 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
01_default_perms.diff
02_fix_kms_detection_with_linux_backport_modules.diff
03_revert_abi_change.diff
+04_git_nouveau_fix_sigsegv_in_nouveau_bo_new_tile.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/e1o1eqw-0005or...@alioth.debian.org
