From: Ben Skeggs Date: Thu, 3 May 2012 06:54:15 +0000 (+1000) Subject: drm/nouveau: fix engine context destructor ordering X-Git-Tag: v3.5-rc1~100^2^2~25 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=f51ee65c75d42633e693dd1704772ad241d9748a;p=~emulex%2Finfiniband.git drm/nouveau: fix engine context destructor ordering Signed-off-by: Ben Skeggs --- diff --git a/drivers/gpu/drm/nouveau/nouveau_channel.c b/drivers/gpu/drm/nouveau/nouveau_channel.c index d25dc249535..5762547ed8a 100644 --- a/drivers/gpu/drm/nouveau/nouveau_channel.c +++ b/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 */