drm/nouveau/fifo: add RAMIN info to nvkm_chan_func

Currently provided by {chan,dma,gpfifo}*.c, and those are going away.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/include/nvkm/engine/fifo.h b/drivers/gpu/drm/nouveau/include/nvkm/engine/fifo.h
index 2d34f1944d64a2b9c600dd3d6f87cdb7eccf2413..02a725d7bf39541cb77a837201e789554acde7e4 100644 (file)
--- a/drivers/gpu/drm/nouveau/include/nvkm/engine/fifo.h
+++ b/drivers/gpu/drm/nouveau/include/nvkm/engine/fifo.h
@@ -19,6 +19,8 @@ struct nvkm_chan {
        struct nvkm_cgrp *cgrp;
        int runq;
 
+       struct nvkm_gpuobj *inst;
+       struct nvkm_vmm *vmm;
        union { int id; int chid; }; /*FIXME: remove later */
 
        spinlock_t lock;
@@ -31,9 +33,7 @@ struct nvkm_chan {
        struct nvkm_object object;
 
        struct list_head head;
-       struct nvkm_gpuobj *inst;
        struct nvkm_gpuobj *push;
-       struct nvkm_vmm *vmm;
        u64 addr;
        u32 size;
 

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.c
index 3832a9aad80ae6435f580175d287f3afeb41467b..5b6377ec0df03c4710b60ebd52dd1af2801a3c33 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.c
@@ -602,39 +602,44 @@ nvkm_fifo_chan_ctor(const struct nvkm_fifo_chan_func *fn,
                chan->cgrp = nvkm_cgrp_ref(cgrp);
        }
 
-       /* instance memory */
-       ret = nvkm_gpuobj_new(device, size, align, zero, NULL, &chan->inst);
-       if (ret)
+       /* Allocate instance block. */
+       ret = nvkm_gpuobj_new(device, func->inst->size, 0x1000, func->inst->zero, NULL,
+                             &chan->inst);
+       if (ret) {
+               RUNL_DEBUG(runl, "inst %d", ret);
                return ret;
-
-       /* allocate push buffer ctxdma instance */
-       if (push) {
-               dmaobj = nvkm_dmaobj_search(client, push);
-               if (IS_ERR(dmaobj))
-                       return PTR_ERR(dmaobj);
-
-               ret = nvkm_object_bind(&dmaobj->object, chan->inst, -16,
-                                      &chan->push);
-               if (ret)
-                       return ret;
        }
 
-       /* channel address space */
-       if (hvmm) {
+       /* Initialise virtual address-space. */
+       if (func->inst->vmm) {
                struct nvkm_vmm *vmm = nvkm_uvmm_search(client, hvmm);
                if (IS_ERR(vmm))
                        return PTR_ERR(vmm);
 
-               if (vmm->mmu != device->mmu)
+               if (WARN_ON(vmm->mmu != device->mmu))
                        return -EINVAL;
 
                ret = nvkm_vmm_join(vmm, chan->inst->memory);
-               if (ret)
+               if (ret) {
+                       RUNL_DEBUG(runl, "vmm %d", ret);
                        return ret;
+               }
 
                chan->vmm = nvkm_vmm_ref(vmm);
        }
 
+       /* allocate push buffer ctxdma instance */
+       if (push) {
+               dmaobj = nvkm_dmaobj_search(client, push);
+               if (IS_ERR(dmaobj))
+                       return PTR_ERR(dmaobj);
+
+               ret = nvkm_object_bind(&dmaobj->object, chan->inst, -16,
+                                      &chan->push);
+               if (ret)
+                       return ret;
+       }
+
        /* Allocate channel ID. */
        chan->id = nvkm_chid_get(runl->chid, chan);
        if (chan->id < 0) {

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.h b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.h
index 804441f30f4400a7840ade962817cdc34b79ba20..0b764d28117ea985315bd669316ae29391f375d5 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.h
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.h
@@ -16,6 +16,12 @@ struct nvkm_cctx {
 };
 
 struct nvkm_chan_func {
+       const struct nvkm_chan_func_inst {
+               u32 size;
+               bool zero;
+               bool vmm;
+       } *inst;
+
        void (*bind)(struct nvkm_chan *);
        void (*unbind)(struct nvkm_chan *);
        void (*start)(struct nvkm_chan *);

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/g84.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/g84.c
index 18ec982f4f54dcf8b321d87323e73d1a8f85ee56..beb51dcb886373f7b942b90d4cd1ad9566e70414 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/g84.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/g84.c
@@ -42,6 +42,7 @@ g84_chan_bind(struct nvkm_chan *chan)
 
 const struct nvkm_chan_func
 g84_chan = {
+       .inst = &nv50_chan_inst,
        .bind = g84_chan_bind,
        .unbind = nv50_chan_unbind,
        .start = nv50_chan_start,

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.c
index 767507e0e2390ccc0ad778f1b7db755b872d6e35..8d1ffeb10c45118ccec0bf1d03b9fa1756db1c2b 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gf100.c
@@ -82,8 +82,16 @@ gf100_chan_bind(struct nvkm_chan *chan)
        nvkm_wr32(device, 0x003000 + (chan->id * 8), 0xc0000000 | chan->inst->addr >> 12);
 }
 
+const struct nvkm_chan_func_inst
+gf100_chan_inst = {
+       .size = 0x1000,
+       .zero = true,
+       .vmm = true,
+};
+
 static const struct nvkm_chan_func
 gf100_chan = {
+       .inst = &gf100_chan_inst,
        .bind = gf100_chan_bind,
        .unbind = gf100_chan_unbind,
        .start = gf100_chan_start,

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c
index b5e698a223b6de528222e28615c8c417935eb533..a7e2b58f5029db1f0427cbe8057d96d5622e10e2 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c
@@ -81,6 +81,7 @@ gk104_chan_bind(struct nvkm_chan *chan)
 
 static const struct nvkm_chan_func
 gk104_chan = {
+       .inst = &gf100_chan_inst,
        .bind = gk104_chan_bind,
        .unbind = gk104_chan_unbind,
        .start = gk104_chan_start,

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk110.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk110.c
index 812fefff092555b7e07c0453642281de22e3b151..5cc48a367c0db3cbe66cd0b82b3a0e6dcba1dacb 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk110.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk110.c
@@ -49,6 +49,7 @@ gk110_chan_preempt(struct nvkm_chan *chan)
 
 const struct nvkm_chan_func
 gk110_chan = {
+       .inst = &gf100_chan_inst,
        .bind = gk104_chan_bind,
        .unbind = gk104_chan_unbind,
        .start = gk104_chan_start,

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gm107.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gm107.c
index c0eca7da7d09844df9a8d3d3b0c75bcceb142a81..f8bc89ac35abf1dc379630b793def4b4920d213f 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gm107.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gm107.c
@@ -34,6 +34,7 @@
 
 const struct nvkm_chan_func
 gm107_chan = {
+       .inst = &gf100_chan_inst,
        .bind = gk104_chan_bind_inst,
        .unbind = gk104_chan_unbind,
        .start = gk104_chan_start,

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gv100.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gv100.c
index 29a83ed3404f19f4167c2912e20033457f777600..db998c9de3ad9201f5a991aa9c0b3062fd21df6b 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gv100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gv100.c
@@ -40,6 +40,7 @@ gv100_chan_doorbell_handle(struct nvkm_chan *chan)
 
 static const struct nvkm_chan_func
 gv100_chan = {
+       .inst = &gf100_chan_inst,
        .bind = gk104_chan_bind_inst,
        .unbind = gk104_chan_unbind,
        .start = gk104_chan_start,

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv04.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv04.c
index a0a28a81f7f4cebe061172d9dcb05ee827c6339b..aeb24f838e3f3dcdb1d90fe112837dc689603aec 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv04.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv04.c
@@ -113,8 +113,14 @@ nv04_chan_start(struct nvkm_chan *chan)
        spin_unlock_irqrestore(&fifo->lock, flags);
 }
 
+const struct nvkm_chan_func_inst
+nv04_chan_inst = {
+       .size = 0x1000,
+};
+
 static const struct nvkm_chan_func
 nv04_chan = {
+       .inst = &nv04_chan_inst,
        .start = nv04_chan_start,
        .stop = nv04_chan_stop,
 };

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv10.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv10.c
index 8d302cb8ba8c5560a9a6aa82149594a9e2d6c54a..b9111fcfbcad33f89a51a9e505b0e5140d0e8a4b 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv10.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv10.c
@@ -45,6 +45,7 @@ nv10_fifo_ramfc[] = {
 
 static const struct nvkm_chan_func
 nv10_chan = {
+       .inst = &nv04_chan_inst,
        .start = nv04_chan_start,
        .stop = nv04_chan_stop,
 };

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv17.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv17.c
index 7b1b90d285c1471a7e6ebec1c46aa3fdf05b935b..e0ad8fabb2d6a0908105e630ca617f12174fc46b 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv17.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv17.c
@@ -54,6 +54,7 @@ nv17_fifo_ramfc[] = {
 
 static const struct nvkm_chan_func
 nv17_chan = {
+       .inst = &nv04_chan_inst,
        .start = nv04_chan_start,
        .stop = nv04_chan_stop,
 };

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv40.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv40.c
index 19f7c0407e70eda8e6c0361ee1f20b8913e710f8..c2d892a7400b1b2610283d14d0dd6dbbd6ffee66 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv40.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv40.c
@@ -64,6 +64,7 @@ nv40_fifo_ramfc[] = {
 
 static const struct nvkm_chan_func
 nv40_chan = {
+       .inst = &nv04_chan_inst,
        .start = nv04_chan_start,
        .stop = nv04_chan_stop,
 };

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv50.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv50.c
index 6a069e84006c44345479b36dce2fe3d940c04b66..384772d522afda83618df9eb900c2cc957c5e226 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv50.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv50.c
@@ -66,8 +66,15 @@ nv50_chan_bind(struct nvkm_chan *chan)
        nvkm_wr32(device, 0x002600 + (chan->id * 4), nv50_fifo_chan(chan)->ramfc->addr >> 12);
 }
 
+const struct nvkm_chan_func_inst
+nv50_chan_inst = {
+       .size = 0x10000,
+       .vmm = true,
+};
+
 static const struct nvkm_chan_func
 nv50_chan = {
+       .inst = &nv50_chan_inst,
        .bind = nv50_chan_bind,
        .unbind = nv50_chan_unbind,
        .start = nv50_chan_start,

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/priv.h b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/priv.h
index 78c6d2218398fbb0d6fb2946669f999cf0dbe931..bf8067e97ba2b61cd3d82b7c39023e721501ddf4 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/priv.h
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/priv.h
@@ -80,6 +80,7 @@ void nv04_fifo_start(struct nvkm_fifo *, unsigned long *);
 extern const struct nvkm_runl_func nv04_runl;
 extern const struct nvkm_engn_func nv04_engn;
 extern const struct nvkm_cgrp_func nv04_cgrp;
+extern const struct nvkm_chan_func_inst nv04_chan_inst;
 void nv04_chan_start(struct nvkm_chan *);
 void nv04_chan_stop(struct nvkm_chan *);
 
@@ -92,6 +93,7 @@ extern const struct nvkm_runl_func nv50_runl;
 int nv50_runl_update(struct nvkm_runl *);
 int nv50_runl_wait(struct nvkm_runl *);
 extern const struct nvkm_engn_func nv50_engn_sw;
+extern const struct nvkm_chan_func_inst nv50_chan_inst;
 void nv50_chan_unbind(struct nvkm_chan *);
 void nv50_chan_start(struct nvkm_chan *);
 void nv50_chan_stop(struct nvkm_chan *);
@@ -117,6 +119,7 @@ bool gf100_runq_intr(struct nvkm_runq *, struct nvkm_runl *);
 void gf100_engn_mmu_fault_trigger(struct nvkm_engn *);
 bool gf100_engn_mmu_fault_triggered(struct nvkm_engn *);
 extern const struct nvkm_engn_func gf100_engn_sw;
+extern const struct nvkm_chan_func_inst gf100_chan_inst;
 void gf100_chan_preempt(struct nvkm_chan *);
 
 int gk104_fifo_chid_nr(struct nvkm_fifo *);

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/tu102.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/tu102.c
index babadc8641dcfabebfe10d0f8c0bef5833fac69f..75e4c0db40bcd75089a91463efa6f3511c81e87a 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/tu102.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/tu102.c
@@ -49,6 +49,7 @@ tu102_chan_start(struct nvkm_chan *chan)
 
 static const struct nvkm_chan_func
 tu102_chan = {
+       .inst = &gf100_chan_inst,
        .bind = gk104_chan_bind_inst,
        .unbind = gk104_chan_unbind,
        .start = tu102_chan_start,