drm/nouveau: working towards a common way to represent engines

There's lots of more-or-less independant engines present on NVIDIA GPUs
these days, and we generally want to perform the same operations on them.
Implementing new ones requires hooking into lots of different places,
the aim of this work is to make this simpler and cleaner.

NV84:NV98 PCRYPT moved over as a test.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

1 files changed, 6 insertions, 9 deletions

diff --git a/drivers/gpu/drm/nouveau/nouveau_object.c b/drivers/gpu/drm/nouveau/nouveau_object.c
index f7b806f26f2f..4fb05b6c6985 100644
--- a/drivers/gpu/drm/nouveau/nouveau_object.c
+++ b/drivers/gpu/drm/nouveau/nouveau_object.c
@@ -621,7 +621,6 @@ nouveau_gpuobj_gr_new(struct nouveau_channel *chan, u32 handle, int class)
 {
         struct drm_nouveau_private *dev_priv = chan->dev->dev_private;
         struct nouveau_pgraph_engine *pgraph = &dev_priv->engine.graph;
-        struct nouveau_crypt_engine *pcrypt = &dev_priv->engine.crypt;
         struct drm_device *dev = chan->dev;
         struct nouveau_gpuobj_class *oc;
         int ret;
@@ -649,17 +648,15 @@ found:
                 }
 
                 return pgraph->object_new(chan, handle, class);
-        case NVOBJ_ENGINE_CRYPT:
-                if (!chan->crypt_ctx) {
-                        ret = pcrypt->create_context(chan);
-                        if (ret)
-                                return ret;
-                }
+        }
 
-                return pcrypt->object_new(chan, handle, class);
+        if (!chan->engctx[oc->engine]) {
+                ret = dev_priv->eng[oc->engine]->context_new(chan, oc->engine);
+                if (ret)
+                        return ret;
         }
 
-        BUG_ON(1);
+        return dev_priv->eng[oc->engine]->object_new(chan, oc->engine, handle, class);
 }
 
 static int