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>

1 files changed, 0 insertions, 5 deletions

diff --git a/drivers/gpu/drm/nouveau/nv20_graph.c b/drivers/gpu/drm/nouveau/nv20_graph.c
index fe2349b115f0..f3e6dd70d22e 100644
--- a/drivers/gpu/drm/nouveau/nv20_graph.c
+++ b/drivers/gpu/drm/nouveau/nv20_graph.c
@@ -421,7 +421,6 @@ nv20_graph_create_context(struct nouveau_channel *chan)
                 return ret;
 
         /* Initialise default context values */
-        dev_priv->engine.instmem.prepare_access(dev, true);
         ctx_init(dev, chan->ramin_grctx->gpuobj);
 
         /* nv20: nv_wo32(dev, chan->ramin_grctx->gpuobj, 10, chan->id<<24); */
@@ -430,8 +429,6 @@ nv20_graph_create_context(struct nouveau_channel *chan)
 
         nv_wo32(dev, dev_priv->ctx_table->gpuobj, chan->id,
                         chan->ramin_grctx->instance >> 4);
-
-        dev_priv->engine.instmem.finish_access(dev);
         return 0;
 }
 
@@ -444,9 +441,7 @@ nv20_graph_destroy_context(struct nouveau_channel *chan)
         if (chan->ramin_grctx)
                 nouveau_gpuobj_ref_del(dev, &chan->ramin_grctx);
 
-        dev_priv->engine.instmem.prepare_access(dev, true);
         nv_wo32(dev, dev_priv->ctx_table->gpuobj, chan->id, 0);
-        dev_priv->engine.instmem.finish_access(dev);
 }
 
 int