diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2010-07-07 21:29:10 -0400 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2010-07-12 20:13:40 -0400 |
commit | f56cb86f9abd229418f894a8ffedfb9ff465c181 (patch) | |
tree | b29420af53d096e49ff573790c6161ed71599858 /drivers/gpu/drm/nouveau/nv40_graph.c | |
parent | 2107cce3056dccf37ae5cbfc95df348959b2c717 (diff) |
drm/nouveau: add instmem flush() hook
This removes the previous prepare_access() and finish_access() hooks, and
replaces it with a much simpler flush() hook.
All the chipset-specific code before nv50 has its use removed completely,
as it's not required there at all.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv40_graph.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/nv40_graph.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nv40_graph.c b/drivers/gpu/drm/nouveau/nv40_graph.c index 65b13b54c5ae..2608c34eca82 100644 --- a/drivers/gpu/drm/nouveau/nv40_graph.c +++ b/drivers/gpu/drm/nouveau/nv40_graph.c | |||
@@ -67,7 +67,6 @@ nv40_graph_create_context(struct nouveau_channel *chan) | |||
67 | return ret; | 67 | return ret; |
68 | 68 | ||
69 | /* Initialise default context values */ | 69 | /* Initialise default context values */ |
70 | dev_priv->engine.instmem.prepare_access(dev, true); | ||
71 | if (!pgraph->ctxprog) { | 70 | if (!pgraph->ctxprog) { |
72 | struct nouveau_grctx ctx = {}; | 71 | struct nouveau_grctx ctx = {}; |
73 | 72 | ||
@@ -80,7 +79,6 @@ nv40_graph_create_context(struct nouveau_channel *chan) | |||
80 | } | 79 | } |
81 | nv_wo32(dev, chan->ramin_grctx->gpuobj, 0, | 80 | nv_wo32(dev, chan->ramin_grctx->gpuobj, 0, |
82 | chan->ramin_grctx->gpuobj->im_pramin->start); | 81 | chan->ramin_grctx->gpuobj->im_pramin->start); |
83 | dev_priv->engine.instmem.finish_access(dev); | ||
84 | return 0; | 82 | return 0; |
85 | } | 83 | } |
86 | 84 | ||