From 184ece985d4b0502f653df6f13878e3e49022ac2 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Fri, 1 Apr 2011 13:17:25 +1000 Subject: [PATCH] --- yaml --- r: 250655 b: refs/heads/master c: 39a654d5b90b69acb9423fd9569c9a468737bcb8 h: refs/heads/master i: 250653: 73e8b3fa2d6c601f4e66777ab349752c7b9ac01d 250651: 9b388f94231bca82c026230e2c2c5c87f2f739a8 250647: 923ed6412a55e3c551dbda78c9df190dcbaade20 250639: a806f335232698e4a93951319821506130892399 250623: 9d83f4bf008f5d9ee488c4b35f89dc7acd8030ee v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_channel.c | 11 ----------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/[refs] b/[refs] index a1563e9c3f89..6a2ed91ef21f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 96c50082904c7cefa3b01356f62268ee6d9e9f38 +refs/heads/master: 39a654d5b90b69acb9423fd9569c9a468737bcb8 diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_channel.c b/trunk/drivers/gpu/drm/nouveau/nouveau_channel.c index 8b0a6689bf27..f82a27609519 100644 --- a/trunk/drivers/gpu/drm/nouveau/nouveau_channel.c +++ b/trunk/drivers/gpu/drm/nouveau/nouveau_channel.c @@ -268,7 +268,6 @@ nouveau_channel_put_unlocked(struct nouveau_channel **pchan) struct drm_device *dev = chan->dev; struct drm_nouveau_private *dev_priv = dev->dev_private; struct nouveau_fifo_engine *pfifo = &dev_priv->engine.fifo; - struct nouveau_pgraph_engine *pgraph = &dev_priv->engine.graph; unsigned long flags; int i; @@ -294,18 +293,8 @@ nouveau_channel_put_unlocked(struct nouveau_channel **pchan) /* boot it off the hardware */ pfifo->reassign(dev, false); - /* We want to give pgraph a chance to idle and get rid of all - * potential errors. We need to do this without the context - * switch lock held, otherwise the irq handler is unable to - * process them. - */ - if (pgraph->channel(dev) == chan) - nouveau_wait_for_idle(dev); - /* destroy the engine specific contexts */ pfifo->destroy_context(chan); - if (pgraph->destroy_context) - pgraph->destroy_context(chan); for (i = 0; i < NVOBJ_ENGINE_NR; i++) { if (chan->engctx[i]) dev_priv->eng[i]->context_del(chan, i);