From 6f71fffd5b9bb5bb7884153f705e0d0f20a4aba7 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Thu, 3 May 2012 16:54:15 +1000 Subject: [PATCH] --- yaml --- r: 307546 b: refs/heads/master c: f51ee65c75d42633e693dd1704772ad241d9748a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_channel.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index beaf6fa7b2f2..6b049e9fc1c9 100644 --- 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 index d25dc249535b..5762547ed8af 100644 --- 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 */