---

yaml --- r: 307546 b: refs/heads/master c: f51ee65 h: refs/heads/master v: v3
git-mirror · May 24, 2012 · 6f71fff · 6f71fff
1 parent dfe9294
commit 6f71fff
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5e120f6e4b3f35b741c5445dfc755f50128c3c44
+refs/heads/master: f51ee65c75d42633e693dd1704772ad241d9748a
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_channel.c b/trunk/drivers/gpu/drm/nouveau/nouveau_channel.c
@@ -307,8 +307,7 @@ nouveau_channel_put_unlocked(struct nouveau_channel **pchan)
 	pfifo->reassign(dev, false);
 
 	/* destroy the engine specific contexts */
-	pfifo->destroy_context(chan);
-	for (i = 0; i < NVOBJ_ENGINE_NR; i++) {
+	for (i = NVOBJ_ENGINE_NR - 1; i >= 0; i--) {
 		if (chan->engctx[i])
 			dev_priv->eng[i]->context_del(chan, i);
 		/*XXX: clean this up later, order is important */