---

yaml --- r: 361191 b: refs/heads/master c: 2b77c1c h: refs/heads/master i: 361189: 5ae06da 361187: 6eb28a0 361183: 9f26bc2 v: v3
git-mirror · Mar 10, 2013 · 20f19be · 20f19be
1 parent 6ace585
commit 20f19be
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c8f28f89566321842afb81d3ddd79d611e3587ce
+refs/heads/master: 2b77c1c01b556045c451f034389932efb5b71c58
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_abi16.c b/trunk/drivers/gpu/drm/nouveau/nouveau_abi16.c
@@ -116,6 +116,11 @@ nouveau_abi16_chan_fini(struct nouveau_abi16 *abi16,
 {
 	struct nouveau_abi16_ntfy *ntfy, *temp;
 
+	/* wait for all activity to stop before releasing notify object, which
+	 * may be still in use */
+	if (chan->chan && chan->ntfy)
+		nouveau_channel_idle(chan->chan);
+
 	/* cleanup notifier state */
 	list_for_each_entry_safe(ntfy, temp, &chan->notifiers, head) {
 		nouveau_abi16_ntfy_fini(chan, ntfy);