drm/nouveau/fifo/tu102-: prepare for GSP-RM

- (temporarily) disable if GSP-RM detected, will be added later
- add dtor() so GSP-RM paths can cleanup properly
- add alternate engine context mapping interface for RM engines
- add alternate chid interfaces to handle RM USERD oddities

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230918202149.4343-26-skeggsb@gmail.com

diff --git a/drivers/gpu/drm/nouveau/include/nvkm/engine/fifo.h b/drivers/gpu/drm/nouveau/include/nvkm/engine/fifo.h
index 221abd6c431037c22a53e4ef1404482dac8bbfc0..7de63718ae7e06e50cc85cf6fc0d038d027aaa41 100644 (file)
--- a/drivers/gpu/drm/nouveau/include/nvkm/engine/fifo.h
+++ b/drivers/gpu/drm/nouveau/include/nvkm/engine/fifo.h
@@ -66,6 +66,9 @@ struct nvkm_fifo {
        struct {
                struct nvkm_memory *mem;
                struct nvkm_vma *bar1;
+
+               struct mutex mutex;
+               struct list_head list;
        } userd;
 
        spinlock_t lock;

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/base.c
index 5db37247dc29b2f1f9062981b2bf535fe2632c69..d7bff2e3f75c8128eb130bbf62ec8c2a7df1b900 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/base.c
@@ -347,8 +347,14 @@ nvkm_fifo_dtor(struct nvkm_engine *engine)
        nvkm_chid_unref(&fifo->cgid);
        nvkm_chid_unref(&fifo->chid);
 
+       mutex_destroy(&fifo->userd.mutex);
+
        nvkm_event_fini(&fifo->nonstall.event);
        mutex_destroy(&fifo->mutex);
+
+       if (fifo->func->dtor)
+               fifo->func->dtor(fifo);
+
        return fifo;
 }
 
@@ -383,5 +389,8 @@ nvkm_fifo_new_(const struct nvkm_fifo_func *func, struct nvkm_device *device,
        spin_lock_init(&fifo->lock);
        mutex_init(&fifo->mutex);
 
+       INIT_LIST_HEAD(&fifo->userd.list);
+       mutex_init(&fifo->userd.mutex);
+
        return nvkm_engine_ctor(&nvkm_fifo, device, type, inst, true, &fifo->engine);
 }

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/cgrp.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/cgrp.c
index ea53fb3d5d06f1b3fc0f862eb133d70c575dcbe3..814db9daa194c4ece28cd3d7188f917bea7fdfb2 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/cgrp.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/cgrp.c
@@ -156,6 +156,9 @@ nvkm_cgrp_vctx_get(struct nvkm_cgrp *cgrp, struct nvkm_engn *engn, struct nvkm_c
                atomic_inc(&vctx->vmm->engref[engn->engine->subdev.type]);
 
        /* Allocate the HW structures. */
+       if (engn->func->ctor2) {
+               ret = engn->func->ctor2(engn, vctx, chan);
+       } else
        if (engn->func->bind) {
                ret = nvkm_object_bind(vctx->ectx->object, NULL, 0, &vctx->inst);
                if (ret == 0 && engn->func->ctor)

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.c
index b7c9d6115bce37a6f55ca55ad4bd44467e0626a8..87a62d4ff4bda45ee532b0598bbe99b247566879 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.c
@@ -275,13 +275,17 @@ nvkm_chan_del(struct nvkm_chan **pchan)
        nvkm_gpuobj_del(&chan->cache);
        nvkm_gpuobj_del(&chan->ramfc);
 
-       nvkm_memory_unref(&chan->userd.mem);
-
        if (chan->cgrp) {
-               nvkm_chid_put(chan->cgrp->runl->chid, chan->id, &chan->cgrp->lock);
+               if (!chan->func->id_put)
+                       nvkm_chid_put(chan->cgrp->runl->chid, chan->id, &chan->cgrp->lock);
+               else
+                       chan->func->id_put(chan);
+
                nvkm_cgrp_unref(&chan->cgrp);
        }
 
+       nvkm_memory_unref(&chan->userd.mem);
+
        if (chan->vmm) {
                nvkm_vmm_part(chan->vmm, chan->inst->memory);
                nvkm_vmm_unref(&chan->vmm);
@@ -438,7 +442,32 @@ nvkm_chan_new_(const struct nvkm_chan_func *func, struct nvkm_runl *runl, int ru
        }
 
        /* Allocate channel ID. */
-       chan->id = nvkm_chid_get(runl->chid, chan);
+       if (!chan->func->id_get) {
+               chan->id = nvkm_chid_get(runl->chid, chan);
+               if (chan->id >= 0) {
+                       if (func->userd->bar < 0) {
+                               if (ouserd + chan->func->userd->size >=
+                                       nvkm_memory_size(userd)) {
+                                       RUNL_DEBUG(runl, "ouserd %llx", ouserd);
+                                       return -EINVAL;
+                               }
+
+                               ret = nvkm_memory_kmap(userd, &chan->userd.mem);
+                               if (ret) {
+                                       RUNL_DEBUG(runl, "userd %d", ret);
+                                       return ret;
+                               }
+
+                               chan->userd.base = ouserd;
+                       } else {
+                               chan->userd.mem = nvkm_memory_ref(fifo->userd.mem);
+                               chan->userd.base = chan->id * chan->func->userd->size;
+                       }
+               }
+       } else {
+               chan->id = chan->func->id_get(chan, userd, ouserd);
+       }
+
        if (chan->id < 0) {
                RUNL_ERROR(runl, "!chids");
                return -ENOSPC;
@@ -448,24 +477,6 @@ nvkm_chan_new_(const struct nvkm_chan_func *func, struct nvkm_runl *runl, int ru
                cgrp->id = chan->id;
 
        /* Initialise USERD. */
-       if (func->userd->bar < 0) {
-               if (ouserd + chan->func->userd->size >= nvkm_memory_size(userd)) {
-                       RUNL_DEBUG(runl, "ouserd %llx", ouserd);
-                       return -EINVAL;
-               }
-
-               ret = nvkm_memory_kmap(userd, &chan->userd.mem);
-               if (ret) {
-                       RUNL_DEBUG(runl, "userd %d", ret);
-                       return ret;
-               }
-
-               chan->userd.base = ouserd;
-       } else {
-               chan->userd.mem = nvkm_memory_ref(fifo->userd.mem);
-               chan->userd.base = chan->id * chan->func->userd->size;
-       }
-
        if (chan->func->userd->clear)
                chan->func->userd->clear(chan);
 

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.h b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.h
index 85b94f699128d3db025ff2042b45d1293bd55a92..013682a709d56e3901a09a4f89f841e8d84145d8 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.h
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.h
@@ -17,6 +17,9 @@ struct nvkm_cctx {
 };
 
 struct nvkm_chan_func {
+       int (*id_get)(struct nvkm_chan *, struct nvkm_memory *userd, u64 ouserd);
+       void (*id_put)(struct nvkm_chan *);
+
        const struct nvkm_chan_func_inst {
                u32 size;
                bool zero;

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/ga100.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/ga100.c
index c56d2a839efbaffdb6c0a01843973863b56c30de..a41a460ca9d4c38bd65c7cae54ca2a7f74b48418 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/ga100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/ga100.c
@@ -27,6 +27,7 @@
 #include "runq.h"
 
 #include <core/gpuobj.h>
+#include <subdev/gsp.h>
 #include <subdev/top.h>
 #include <subdev/vfn.h>
 
@@ -607,5 +608,8 @@ int
 ga100_fifo_new(struct nvkm_device *device, enum nvkm_subdev_type type, int inst,
               struct nvkm_fifo **pfifo)
 {
+       if (nvkm_gsp_rm(device->gsp))
+               return -ENODEV;
+
        return nvkm_fifo_new_(&ga100_fifo, device, type, inst, pfifo);
 }

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/ga102.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/ga102.c
index 2cdf5da339b60bc609a8ebd1d45160dd2722430b..3701de24fefafa780da1c1660098cc2775955939 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/ga102.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/ga102.c
@@ -21,6 +21,8 @@
  */
 #include "priv.h"
 
+#include <subdev/gsp.h>
+
 #include <nvif/class.h>
 
 static const struct nvkm_fifo_func
@@ -41,5 +43,8 @@ int
 ga102_fifo_new(struct nvkm_device *device, enum nvkm_subdev_type type, int inst,
               struct nvkm_fifo **pfifo)
 {
+       if (nvkm_gsp_rm(device->gsp))
+               return -ENODEV;
+
        return nvkm_fifo_new_(&ga102_fifo, device, type, inst, pfifo);
 }

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/priv.h b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/priv.h
index 4d448be19224a8a0f86e7bfe08eaa66b3a70e117..4a3ef0277738a391415358044926be736ccee9b5 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/priv.h
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/priv.h
@@ -13,6 +13,8 @@ struct nvkm_runq;
 struct nvkm_vctx;
 
 struct nvkm_fifo_func {
+       void (*dtor)(struct nvkm_fifo *);
+
        int (*chid_nr)(struct nvkm_fifo *);
        int (*chid_ctor)(struct nvkm_fifo *, int nr);
        int (*runq_nr)(struct nvkm_fifo *);

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/runl.h b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/runl.h
index 5421321f8e85f3a7e94cae5a76b869ad0d33641c..b450b79bb1d66bd321d746cee45698c60ef7c69d 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/runl.h
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/runl.h
@@ -18,6 +18,7 @@ struct nvkm_engn {
                bool (*mmu_fault_triggered)(struct nvkm_engn *);
                int (*ctor)(struct nvkm_engn *, struct nvkm_vctx *);
                void (*bind)(struct nvkm_engn *, struct nvkm_cctx *, struct nvkm_chan *);
+               int (*ctor2)(struct nvkm_engn *, struct nvkm_vctx *, struct nvkm_chan *);
                int (*ramht_add)(struct nvkm_engn *, struct nvkm_object *, struct nvkm_chan *);
                void (*ramht_del)(struct nvkm_chan *, int hash);
        } *func;

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/tu102.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/tu102.c
index ea9e151dbb488286511f3272f1a3de22d18339f4..f310091b74e449051e676515167a961884a9a964 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/tu102.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/tu102.c
@@ -25,6 +25,7 @@
 #include "runl.h"
 
 #include <core/memory.h>
+#include <subdev/gsp.h>
 #include <subdev/mc.h>
 #include <subdev/vfn.h>
 
@@ -282,5 +283,8 @@ int
 tu102_fifo_new(struct nvkm_device *device, enum nvkm_subdev_type type, int inst,
               struct nvkm_fifo **pfifo)
 {
+       if (nvkm_gsp_rm(device->gsp))
+               return -ENODEV;
+
        return nvkm_fifo_new_(&tu102_fifo, device, type, inst, pfifo);
 }