drm/nouveau: remove nouveau_gpuobj_ref completely, replace with sanity

Reviewed-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

1 files changed, 19 insertions, 20 deletions

diff --git a/drivers/gpu/drm/nouveau/nv50_graph.c b/drivers/gpu/drm/nouveau/nv50_graph.c
index 17a8d788a494..7db0d627c1b9 100644
--- a/drivers/gpu/drm/nouveau/nv50_graph.c
+++ b/drivers/gpu/drm/nouveau/nv50_graph.c
@@ -27,7 +27,7 @@
 #include "drmP.h"
 #include "drm.h"
 #include "nouveau_drv.h"
-
+#include "nouveau_ramht.h"
 #include "nouveau_grctx.h"
 
 static void
@@ -192,7 +192,7 @@ nv50_graph_channel(struct drm_device *dev)
         for (i = 0; i < dev_priv->engine.fifo.channels; i++) {
                 struct nouveau_channel *chan = dev_priv->fifos[i];
 
-                if (chan && chan->ramin && chan->ramin->instance == inst)
+                if (chan && chan->ramin && chan->ramin->vinst == inst)
                         return chan;
         }
 
@@ -204,36 +204,34 @@ nv50_graph_create_context(struct nouveau_channel *chan)
 {
         struct drm_device *dev = chan->dev;
         struct drm_nouveau_private *dev_priv = dev->dev_private;
-        struct nouveau_gpuobj *ramin = chan->ramin->gpuobj;
-        struct nouveau_gpuobj *obj;
+        struct nouveau_gpuobj *ramin = chan->ramin;
         struct nouveau_pgraph_engine *pgraph = &dev_priv->engine.graph;
         struct nouveau_grctx ctx = {};
         int hdr, ret;
 
         NV_DEBUG(dev, "ch%d\n", chan->id);
 
-        ret = nouveau_gpuobj_new_ref(dev, chan, NULL, 0, pgraph->grctx_size,
-                                     0x1000, NVOBJ_FLAG_ZERO_ALLOC |
-                                     NVOBJ_FLAG_ZERO_FREE, &chan->ramin_grctx);
+        ret = nouveau_gpuobj_new(dev, chan, pgraph->grctx_size, 0x1000,
+                                 NVOBJ_FLAG_ZERO_ALLOC |
+                                 NVOBJ_FLAG_ZERO_FREE, &chan->ramin_grctx);
         if (ret)
                 return ret;
-        obj = chan->ramin_grctx->gpuobj;
 
         hdr = (dev_priv->chipset == 0x50) ? 0x200 : 0x20;
         nv_wo32(ramin, hdr + 0x00, 0x00190002);
-        nv_wo32(ramin, hdr + 0x04, chan->ramin_grctx->instance +
+        nv_wo32(ramin, hdr + 0x04, chan->ramin_grctx->vinst +
                                    pgraph->grctx_size - 1);
-        nv_wo32(ramin, hdr + 0x08, chan->ramin_grctx->instance);
+        nv_wo32(ramin, hdr + 0x08, chan->ramin_grctx->vinst);
         nv_wo32(ramin, hdr + 0x0c, 0);
         nv_wo32(ramin, hdr + 0x10, 0);
         nv_wo32(ramin, hdr + 0x14, 0x00010000);
 
         ctx.dev = chan->dev;
         ctx.mode = NOUVEAU_GRCTX_VALS;
-        ctx.data = obj;
+        ctx.data = chan->ramin_grctx;
         nv50_grctx_init(&ctx);
 
-        nv_wo32(obj, 0x00000, chan->ramin->instance >> 12);
+        nv_wo32(chan->ramin_grctx, 0x00000, chan->ramin->vinst >> 12);
 
         dev_priv->engine.instmem.flush(dev);
         return 0;
@@ -248,14 +246,14 @@ nv50_graph_destroy_context(struct nouveau_channel *chan)
 
         NV_DEBUG(dev, "ch%d\n", chan->id);
 
-        if (!chan->ramin || !chan->ramin->gpuobj)
+        if (!chan->ramin)
                 return;
 
         for (i = hdr; i < hdr + 24; i += 4)
-                nv_wo32(chan->ramin->gpuobj, i, 0);
+                nv_wo32(chan->ramin, i, 0);
         dev_priv->engine.instmem.flush(dev);
 
-        nouveau_gpuobj_ref_del(dev, &chan->ramin_grctx);
+        nouveau_gpuobj_ref(NULL, &chan->ramin_grctx);
 }
 
 static int
@@ -282,7 +280,7 @@ nv50_graph_do_load_context(struct drm_device *dev, uint32_t inst)
 int
 nv50_graph_load_context(struct nouveau_channel *chan)
 {
-        uint32_t inst = chan->ramin->instance >> 12;
+        uint32_t inst = chan->ramin->vinst >> 12;
 
         NV_DEBUG(chan->dev, "ch%d\n", chan->id);
         return nv50_graph_do_load_context(chan->dev, inst);
@@ -327,15 +325,16 @@ static int
 nv50_graph_nvsw_dma_vblsem(struct nouveau_channel *chan, int grclass,
                            int mthd, uint32_t data)
 {
-        struct nouveau_gpuobj_ref *ref = NULL;
+        struct nouveau_gpuobj *gpuobj;
 
-        if (nouveau_gpuobj_ref_find(chan, data, &ref))
+        gpuobj = nouveau_ramht_find(chan, data);
+        if (!gpuobj)
                 return -ENOENT;
 
-        if (nouveau_notifier_offset(ref->gpuobj, NULL))
+        if (nouveau_notifier_offset(gpuobj, NULL))
                 return -EINVAL;
 
-        chan->nvsw.vblsem = ref->gpuobj;
+        chan->nvsw.vblsem = gpuobj;
         chan->nvsw.vblsem_offset = ~0;
         return 0;
 }