diff options
| author |   Ben Skeggs <bskeggs@redhat.com> | 2012-05-03 16:54:15 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2012-05-24 16:55:55 +1000 |
| commit | f51ee65c75d42633e693dd1704772ad241d9748a (patch) | |
| tree | 2191b5399341d06795c2c00d7aaa5dc47448e841 /drivers | |
| parent | drm/nouveau/fence: convert to exec engine, and improve channel sync (diff) | |
| download | linux-dev-f51ee65c75d42633e693dd1704772ad241d9748a.tar.xz linux-dev-f51ee65c75d42633e693dd1704772ad241d9748a.zip | |
drm/nouveau: fix engine context destructor ordering
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_channel.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_channel.c b/drivers/gpu/drm/nouveau/nouveau_channel.c index d25dc249535b..5762547ed8af 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 */ |