aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nv04_graph.c
diff options
context:
space:
mode:
authorFrancisco Jerez <currojerez@riseup.net>2010-11-20 08:43:51 -0500
committerFrancisco Jerez <currojerez@riseup.net>2010-12-07 21:00:20 -0500
commit38cf189fa13e988f85efb6de26315e762cecc260 (patch)
tree3f2572b44a4d2d56632fcc3f59e85dfc356acac1 /drivers/gpu/drm/nouveau/nv04_graph.c
parentca130c2267d0719c92ed188e15082d6baad6c046 (diff)
drm/nv04-nv10: Don't re-enable FIFO access multiple times after IRQ dispatch.
nvxx_graph_isr is already taking care of it. In some cases this could've made you miss PGRAPH interrupts (e.g. when you were supposed to get several IRQs of the same kind in a row). Signed-off-by: Francisco Jerez <currojerez@riseup.net> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv04_graph.c')
-rw-r--r--drivers/gpu/drm/nouveau/nv04_graph.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/nv04_graph.c b/drivers/gpu/drm/nouveau/nv04_graph.c
index 0bc616d35eb6..af75015068d6 100644
--- a/drivers/gpu/drm/nouveau/nv04_graph.c
+++ b/drivers/gpu/drm/nouveau/nv04_graph.c
@@ -373,7 +373,6 @@ nv04_graph_context_switch(struct drm_device *dev)
373 struct nouveau_channel *chan = NULL; 373 struct nouveau_channel *chan = NULL;
374 int chid; 374 int chid;
375 375
376 pgraph->fifo_access(dev, false);
377 nouveau_wait_for_idle(dev); 376 nouveau_wait_for_idle(dev);
378 377
379 /* If previous context is valid, we need to save it */ 378 /* If previous context is valid, we need to save it */
@@ -384,8 +383,6 @@ nv04_graph_context_switch(struct drm_device *dev)
384 chan = dev_priv->channels.ptr[chid]; 383 chan = dev_priv->channels.ptr[chid];
385 if (chan) 384 if (chan)
386 nv04_graph_load_context(chan); 385 nv04_graph_load_context(chan);
387
388 pgraph->fifo_access(dev, true);
389} 386}
390 387
391static uint32_t *ctx_reg(struct graph_state *ctx, uint32_t reg) 388static uint32_t *ctx_reg(struct graph_state *ctx, uint32_t reg)