diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2011-07-19 21:04:46 -0400 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2011-07-24 19:42:27 -0400 |
| commit | 70ad25ab735a016c48183875f657d90d592b773d (patch) | |
| tree | 9596e372527faf3e924ae3bab421bbfb2bf8b8d8 /drivers/gpu/drm/nouveau/nv20_graph.c | |
| parent | 12a30e267c162145df3c104d0f4aabff7bce56a5 (diff) | |
drm/nouveau: replace nv04_graph_fifo_access() use with direct reg bashing
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv20_graph.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv20_graph.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nv20_graph.c b/drivers/gpu/drm/nouveau/nv20_graph.c index f8736270f62f..3791222f20b9 100644 --- a/drivers/gpu/drm/nouveau/nv20_graph.c +++ b/drivers/gpu/drm/nouveau/nv20_graph.c | |||
| @@ -454,13 +454,13 @@ nv20_graph_context_del(struct nouveau_channel *chan, int engine) | |||
| 454 | unsigned long flags; | 454 | unsigned long flags; |
| 455 | 455 | ||
| 456 | spin_lock_irqsave(&dev_priv->context_switch_lock, flags); | 456 | spin_lock_irqsave(&dev_priv->context_switch_lock, flags); |
| 457 | nv04_graph_fifo_access(dev, false); | 457 | nv_mask(dev, NV04_PGRAPH_FIFO, 0x00000001, 0x00000000); |
| 458 | 458 | ||
| 459 | /* Unload the context if it's the currently active one */ | 459 | /* Unload the context if it's the currently active one */ |
| 460 | if (nv10_graph_channel(dev) == chan) | 460 | if (nv10_graph_channel(dev) == chan) |
| 461 | nv20_graph_unload_context(dev); | 461 | nv20_graph_unload_context(dev); |
| 462 | 462 | ||
| 463 | nv04_graph_fifo_access(dev, true); | 463 | nv_mask(dev, NV04_PGRAPH_FIFO, 0x00000001, 0x00000001); |
| 464 | spin_unlock_irqrestore(&dev_priv->context_switch_lock, flags); | 464 | spin_unlock_irqrestore(&dev_priv->context_switch_lock, flags); |
| 465 | 465 | ||
| 466 | /* Free the context resources */ | 466 | /* Free the context resources */ |