[kernel] r16522 - in dists/sid/linux-2.6/debian: . patches/bugfix/all patches/series

[Maximilian Attems]

Author: maks
Date: Tue Nov  2 09:29:59 2010
New Revision: 16522

Log:
add ttm bugfix that can cause nouveau crash

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/all/drm-ttm-Clear-the-ghost-cpu_writers-flag-on-ttm_buff.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/28

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Sun Oct 31 16:15:20 2010	(r16521)
+++ dists/sid/linux-2.6/debian/changelog	Tue Nov  2 09:29:59 2010	(r16522)
@@ -4,6 +4,7 @@
   * drm/i915: set DIDL using the ACPI video output device _ADR method return.
   * images: Nuke modules.devname on removal. (closes: #590607)
   * Newer Standards-Version 3.9.1 without changes.
+  * drm/ttm: Clear the ghost cpu_writers flag on ttm_buffer_object_transfer.
 
  -- maximilian attems <maks at debian.org>  Sat, 30 Oct 2010 14:14:37 +0200
 

Added: dists/sid/linux-2.6/debian/patches/bugfix/all/drm-ttm-Clear-the-ghost-cpu_writers-flag-on-ttm_buff.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/drm-ttm-Clear-the-ghost-cpu_writers-flag-on-ttm_buff.patch	Tue Nov  2 09:29:59 2010	(r16522)
@@ -0,0 +1,39 @@
+From 0fbecd400dd0a82d465b3086f209681e8c54cb0f Mon Sep 17 00:00:00 2001
+From: Francisco Jerez <currojerez at riseup.net>
+Date: Tue, 21 Sep 2010 02:15:15 +0200
+Subject: [PATCH] drm/ttm: Clear the ghost cpu_writers flag on ttm_buffer_object_transfer.
+
+It makes sense for a BO to move after a process has requested
+exclusive RW access on it (e.g. because the BO used to be located in
+unmappable VRAM and we intercepted the CPU access from the fault
+handler).
+
+If we let the ghost object inherit cpu_writers from the original
+object, ttm_bo_release_list() will raise a kernel BUG when the ghost
+object is destroyed. This can be reproduced with the nouveau driver on
+nv5x.
+
+Reported-by: Marcin Slusarz <marcin.slusarz at gmail.com>
+Reviewed-by: Jerome Glisse <jglisse at redhat.com>
+Tested-by: Marcin Slusarz <marcin.slusarz at gmail.com>
+Signed-off-by: Francisco Jerez <currojerez at riseup.net>
+Signed-off-by: Dave Airlie <airlied at redhat.com>
+---
+ drivers/gpu/drm/ttm/ttm_bo_util.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c
+index 7cffb3e..3451a82 100644
+--- a/drivers/gpu/drm/ttm/ttm_bo_util.c
++++ b/drivers/gpu/drm/ttm/ttm_bo_util.c
+@@ -351,6 +351,7 @@ static int ttm_buffer_object_transfer(struct ttm_buffer_object *bo,
+ 	INIT_LIST_HEAD(&fbo->lru);
+ 	INIT_LIST_HEAD(&fbo->swap);
+ 	fbo->vm_node = NULL;
++	atomic_set(&fbo->cpu_writers, 0);
+ 
+ 	fbo->sync_obj = driver->sync_obj_ref(bo->sync_obj);
+ 	kref_init(&fbo->list_kref);
+-- 
+1.7.2.3
+

Modified: dists/sid/linux-2.6/debian/patches/series/28
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/28	Sun Oct 31 16:15:20 2010	(r16521)
+++ dists/sid/linux-2.6/debian/patches/series/28	Tue Nov  2 09:29:59 2010	(r16522)
@@ -1,2 +1,3 @@
 + bugfix/all/ipc_initialize_structure_memory_to_zero.patch
 + bugfix/all/drm-i915-set-DIDL-using-the-ACPI-video-output-device.patch
++ bugfix/all/drm-ttm-Clear-the-ghost-cpu_writers-flag-on-ttm_buff.patch