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, 91 insertions, 267 deletions

diff --git a/drivers/gpu/drm/nouveau/nouveau_object.c b/drivers/gpu/drm/nouveau/nouveau_object.c
index 552f5131650f..d55c50f1a2d3 100644
--- a/drivers/gpu/drm/nouveau/nouveau_object.c
+++ b/drivers/gpu/drm/nouveau/nouveau_object.c
@@ -90,7 +90,7 @@ nouveau_gpuobj_new(struct drm_device *dev, struct nouveau_channel *chan,
         NV_DEBUG(dev, "gpuobj %p\n", gpuobj);
         gpuobj->dev = dev;
         gpuobj->flags = flags;
-        gpuobj->im_channel = chan;
+        gpuobj->refcount = 1;
 
         list_add_tail(&gpuobj->list, &dev_priv->gpuobj_list);
 
@@ -108,7 +108,7 @@ nouveau_gpuobj_new(struct drm_device *dev, struct nouveau_channel *chan,
 
                 ret = engine->instmem.populate(dev, gpuobj, &size);
                 if (ret) {
-                        nouveau_gpuobj_del(dev, &gpuobj);
+                        nouveau_gpuobj_ref(NULL, &gpuobj);
                         return ret;
                 }
         }
@@ -119,14 +119,14 @@ nouveau_gpuobj_new(struct drm_device *dev, struct nouveau_channel *chan,
                 gpuobj->im_pramin = drm_mm_get_block(gpuobj->im_pramin, size, align);
 
         if (!gpuobj->im_pramin) {
-                nouveau_gpuobj_del(dev, &gpuobj);
+                nouveau_gpuobj_ref(NULL, &gpuobj);
                 return -ENOMEM;
         }
 
         if (!chan) {
                 ret = engine->instmem.bind(dev, gpuobj);
                 if (ret) {
-                        nouveau_gpuobj_del(dev, &gpuobj);
+                        nouveau_gpuobj_ref(NULL, &gpuobj);
                         return ret;
                 }
         }
@@ -134,13 +134,13 @@ nouveau_gpuobj_new(struct drm_device *dev, struct nouveau_channel *chan,
         /* calculate the various different addresses for the object */
         if (chan) {
                 gpuobj->pinst = gpuobj->im_pramin->start +
-                                chan->ramin->gpuobj->im_pramin->start;
+                                chan->ramin->im_pramin->start;
                 if (dev_priv->card_type < NV_50) {
                         gpuobj->cinst = gpuobj->pinst;
                 } else {
                         gpuobj->cinst = gpuobj->im_pramin->start;
                         gpuobj->vinst = gpuobj->im_pramin->start +
-                                        chan->ramin->gpuobj->im_backing_start;
+                                        chan->ramin->im_backing_start;
                 }
         } else {
                 gpuobj->pinst = gpuobj->im_pramin->start;
@@ -156,6 +156,7 @@ nouveau_gpuobj_new(struct drm_device *dev, struct nouveau_channel *chan,
                 engine->instmem.flush(dev);
         }
 
+
         *gpuobj_ret = gpuobj;
         return 0;
 }
@@ -176,20 +177,23 @@ int
 nouveau_gpuobj_init(struct drm_device *dev)
 {
         struct drm_nouveau_private *dev_priv = dev->dev_private;
+        struct nouveau_gpuobj *ramht = NULL;
         int ret;
 
         NV_DEBUG(dev, "\n");
 
-        if (dev_priv->card_type < NV_50) {
-                ret = nouveau_gpuobj_new_fake(dev,
-                        dev_priv->ramht_offset, ~0, dev_priv->ramht_size,
-                        NVOBJ_FLAG_ZERO_ALLOC | NVOBJ_FLAG_ALLOW_NO_REFS,
-                                                &dev_priv->ramht, NULL);
-                if (ret)
-                        return ret;
-        }
+        if (dev_priv->card_type >= NV_50)
+                return 0;
 
-        return 0;
+        ret = nouveau_gpuobj_new_fake(dev, dev_priv->ramht_offset, ~0,
+                                      dev_priv->ramht_size,
+                                      NVOBJ_FLAG_ZERO_ALLOC, &ramht);
+        if (ret)
+                return ret;
+
+        ret = nouveau_ramht_new(dev, ramht, &dev_priv->ramht);
+        nouveau_gpuobj_ref(NULL, &ramht);
+        return ret;
 }
 
 void
@@ -199,7 +203,7 @@ nouveau_gpuobj_takedown(struct drm_device *dev)
 
         NV_DEBUG(dev, "\n");
 
-        nouveau_gpuobj_del(dev, &dev_priv->ramht);
+        nouveau_ramht_ref(NULL, &dev_priv->ramht, NULL);
 }
 
 void
@@ -216,29 +220,21 @@ nouveau_gpuobj_late_takedown(struct drm_device *dev)
 
                 NV_ERROR(dev, "gpuobj %p still exists at takedown, refs=%d\n",
                          gpuobj, gpuobj->refcount);
-                gpuobj->refcount = 0;
-                nouveau_gpuobj_del(dev, &gpuobj);
+
+                gpuobj->refcount = 1;
+                nouveau_gpuobj_ref(NULL, &gpuobj);
         }
 }
 
-int
-nouveau_gpuobj_del(struct drm_device *dev, struct nouveau_gpuobj **pgpuobj)
+static int
+nouveau_gpuobj_del(struct nouveau_gpuobj *gpuobj)
 {
+        struct drm_device *dev = gpuobj->dev;
         struct drm_nouveau_private *dev_priv = dev->dev_private;
         struct nouveau_engine *engine = &dev_priv->engine;
-        struct nouveau_gpuobj *gpuobj;
         int i;
 
-        NV_DEBUG(dev, "gpuobj %p\n", pgpuobj ? *pgpuobj : NULL);
-
-        if (!dev_priv || !pgpuobj || !(*pgpuobj))
-                return -EINVAL;
-        gpuobj = *pgpuobj;
-
-        if (gpuobj->refcount != 0) {
-                NV_ERROR(dev, "gpuobj refcount is %d\n", gpuobj->refcount);
-                return -EINVAL;
-        }
+        NV_DEBUG(dev, "gpuobj %p\n", gpuobj);
 
         if (gpuobj->im_pramin && (gpuobj->flags & NVOBJ_FLAG_ZERO_FREE)) {
                 for (i = 0; i < gpuobj->im_pramin->size; i += 4)
@@ -261,181 +257,26 @@ nouveau_gpuobj_del(struct drm_device *dev, struct nouveau_gpuobj **pgpuobj)
 
         list_del(&gpuobj->list);
 
-        *pgpuobj = NULL;
         kfree(gpuobj);
         return 0;
 }
 
-static int
-nouveau_gpuobj_instance_get(struct drm_device *dev,
-                            struct nouveau_channel *chan,
-                            struct nouveau_gpuobj *gpuobj, uint32_t *inst)
-{
-        struct drm_nouveau_private *dev_priv = dev->dev_private;
-        struct nouveau_gpuobj *cpramin;
-
-        /* <NV50 use PRAMIN address everywhere */
-        if (dev_priv->card_type < NV_50) {
-                *inst = gpuobj->im_pramin->start;
-                if (gpuobj->im_channel) {
-                        cpramin = gpuobj->im_channel->ramin->gpuobj;
-                        *inst += cpramin->im_pramin->start;
-                }
-                return 0;
-        }
-
-        /* NV50 channel-local instance */
-        if (chan) {
-                *inst = gpuobj->im_pramin->start;
-                return 0;
-        }
-
-        /* NV50 global (VRAM) instance */
-        if (!gpuobj->im_channel) {
-                /* ...from global heap */
-                if (!gpuobj->im_backing) {
-                        NV_ERROR(dev, "AII, no VRAM backing gpuobj\n");
-                        return -EINVAL;
-                }
-                *inst = gpuobj->im_backing_start;
-                return 0;
-        } else {
-                /* ...from local heap */
-                cpramin = gpuobj->im_channel->ramin->gpuobj;
-                *inst = cpramin->im_backing_start + gpuobj->im_pramin->start;
-                return 0;
-        }
-
-        return -EINVAL;
-}
-
-int
-nouveau_gpuobj_ref_add(struct drm_device *dev, struct nouveau_channel *chan,
-                       uint32_t handle, struct nouveau_gpuobj *gpuobj,
-                       struct nouveau_gpuobj_ref **ref_ret)
-{
-        struct drm_nouveau_private *dev_priv = dev->dev_private;
-        struct nouveau_gpuobj_ref *ref;
-        uint32_t instance;
-        int ret;
-
-        NV_DEBUG(dev, "ch%d h=0x%08x gpuobj=%p\n",
-                 chan ? chan->id : -1, handle, gpuobj);
-
-        if (!dev_priv || !gpuobj || (ref_ret && *ref_ret != NULL))
-                return -EINVAL;
-
-        if (!chan && !ref_ret)
-                return -EINVAL;
-
-        if (gpuobj->engine == NVOBJ_ENGINE_SW && !gpuobj->im_pramin) {
-                /* sw object */
-                instance = 0x40;
-        } else {
-                ret = nouveau_gpuobj_instance_get(dev, chan, gpuobj, &instance);
-                if (ret)
-                        return ret;
-        }
-
-        ref = kzalloc(sizeof(*ref), GFP_KERNEL);
-        if (!ref)
-                return -ENOMEM;
-        INIT_LIST_HEAD(&ref->list);
-        ref->gpuobj   = gpuobj;
-        ref->channel  = chan;
-        ref->instance = instance;
-
-        if (!ref_ret) {
-                ref->handle = handle;
-
-                ret = nouveau_ramht_insert(dev, ref);
-                if (ret) {
-                        kfree(ref);
-                        return ret;
-                }
-        } else {
-                ref->handle = ~0;
-                *ref_ret = ref;
-        }
-
-        ref->gpuobj->refcount++;
-        return 0;
-}
-
-int nouveau_gpuobj_ref_del(struct drm_device *dev, struct nouveau_gpuobj_ref **pref)
-{
-        struct nouveau_gpuobj_ref *ref;
-
-        NV_DEBUG(dev, "ref %p\n", pref ? *pref : NULL);
-
-        if (!dev || !pref || *pref == NULL)
-                return -EINVAL;
-        ref = *pref;
-
-        if (ref->handle != ~0)
-                nouveau_ramht_remove(dev, ref);
-
-        if (ref->gpuobj) {
-                ref->gpuobj->refcount--;
-
-                if (ref->gpuobj->refcount == 0) {
-                        if (!(ref->gpuobj->flags & NVOBJ_FLAG_ALLOW_NO_REFS))
-                                nouveau_gpuobj_del(dev, &ref->gpuobj);
-                }
-        }
-
-        *pref = NULL;
-        kfree(ref);
-        return 0;
-}
-
-int
-nouveau_gpuobj_new_ref(struct drm_device *dev,
-                       struct nouveau_channel *oc, struct nouveau_channel *rc,
-                       uint32_t handle, uint32_t size, int align,
-                       uint32_t flags, struct nouveau_gpuobj_ref **ref)
+void
+nouveau_gpuobj_ref(struct nouveau_gpuobj *ref, struct nouveau_gpuobj **ptr)
 {
-        struct nouveau_gpuobj *gpuobj = NULL;
-        int ret;
+        if (ref)
+                ref->refcount++;
 
-        ret = nouveau_gpuobj_new(dev, oc, size, align, flags, &gpuobj);
-        if (ret)
-                return ret;
+        if (*ptr && --(*ptr)->refcount == 0)
+                nouveau_gpuobj_del(*ptr);
 
-        ret = nouveau_gpuobj_ref_add(dev, rc, handle, gpuobj, ref);
-        if (ret) {
-                nouveau_gpuobj_del(dev, &gpuobj);
-                return ret;
-        }
-
-        return 0;
-}
-
-int
-nouveau_gpuobj_ref_find(struct nouveau_channel *chan, uint32_t handle,
-                        struct nouveau_gpuobj_ref **ref_ret)
-{
-        struct nouveau_gpuobj_ref *ref;
-        struct list_head *entry, *tmp;
-
-        list_for_each_safe(entry, tmp, &chan->ramht_refs) {
-                ref = list_entry(entry, struct nouveau_gpuobj_ref, list);
-
-                if (ref->handle == handle) {
-                        if (ref_ret)
-                                *ref_ret = ref;
-                        return 0;
-                }
-        }
-
-        return -EINVAL;
+        *ptr = ref;
 }
 
 int
 nouveau_gpuobj_new_fake(struct drm_device *dev, uint32_t p_offset,
                         uint32_t b_offset, uint32_t size,
-                        uint32_t flags, struct nouveau_gpuobj **pgpuobj,
-                        struct nouveau_gpuobj_ref **pref)
+                        uint32_t flags, struct nouveau_gpuobj **pgpuobj)
 {
         struct drm_nouveau_private *dev_priv = dev->dev_private;
         struct nouveau_gpuobj *gpuobj = NULL;
@@ -450,8 +291,8 @@ nouveau_gpuobj_new_fake(struct drm_device *dev, uint32_t p_offset,
                 return -ENOMEM;
         NV_DEBUG(dev, "gpuobj %p\n", gpuobj);
         gpuobj->dev = dev;
-        gpuobj->im_channel = NULL;
         gpuobj->flags      = flags | NVOBJ_FLAG_FAKE;
+        gpuobj->refcount = 1;
 
         list_add_tail(&gpuobj->list, &dev_priv->gpuobj_list);
 
@@ -459,7 +300,7 @@ nouveau_gpuobj_new_fake(struct drm_device *dev, uint32_t p_offset,
                 gpuobj->im_pramin = kzalloc(sizeof(struct drm_mm_node),
                                             GFP_KERNEL);
                 if (!gpuobj->im_pramin) {
-                        nouveau_gpuobj_del(dev, &gpuobj);
+                        nouveau_gpuobj_ref(NULL, &gpuobj);
                         return -ENOMEM;
                 }
                 gpuobj->im_pramin->start = p_offset;
@@ -481,14 +322,6 @@ nouveau_gpuobj_new_fake(struct drm_device *dev, uint32_t p_offset,
                 dev_priv->engine.instmem.flush(dev);
         }
 
-        if (pref) {
-                i = nouveau_gpuobj_ref_add(dev, NULL, 0, gpuobj, pref);
-                if (i) {
-                        nouveau_gpuobj_del(dev, &gpuobj);
-                        return i;
-                }
-        }
-
         if (pgpuobj)
                 *pgpuobj = gpuobj;
         return 0;
@@ -628,7 +461,7 @@ nouveau_gpuobj_gart_dma_new(struct nouveau_channel *chan,
                         *o_ret = 0;
         } else
         if (dev_priv->gart_info.type == NOUVEAU_GART_SGDMA) {
-                *gpuobj = dev_priv->gart_info.sg_ctxdma;
+                nouveau_gpuobj_ref(dev_priv->gart_info.sg_ctxdma, gpuobj);
                 if (offset & ~0xffffffffULL) {
                         NV_ERROR(dev, "obj offset exceeds 32-bits\n");
                         return -EINVAL;
@@ -760,8 +593,11 @@ nouveau_gpuobj_sw_new(struct nouveau_channel *chan, int class,
         gpuobj = kzalloc(sizeof(*gpuobj), GFP_KERNEL);
         if (!gpuobj)
                 return -ENOMEM;
+        gpuobj->dev = chan->dev;
         gpuobj->engine = NVOBJ_ENGINE_SW;
         gpuobj->class = class;
+        gpuobj->refcount = 1;
+        gpuobj->cinst = 0x40;
 
         list_add_tail(&gpuobj->list, &dev_priv->gpuobj_list);
         *gpuobj_ret = gpuobj;
@@ -773,7 +609,6 @@ nouveau_gpuobj_channel_init_pramin(struct nouveau_channel *chan)
 {
         struct drm_device *dev = chan->dev;
         struct drm_nouveau_private *dev_priv = dev->dev_private;
-        struct nouveau_gpuobj *pramin = NULL;
         uint32_t size;
         uint32_t base;
         int ret;
@@ -798,18 +633,16 @@ nouveau_gpuobj_channel_init_pramin(struct nouveau_channel *chan)
                 size += 0x1000;
         }
 
-        ret = nouveau_gpuobj_new_ref(dev, NULL, NULL, 0, size, 0x1000, 0,
-                                     &chan->ramin);
+        ret = nouveau_gpuobj_new(dev, NULL, size, 0x1000, 0, &chan->ramin);
         if (ret) {
                 NV_ERROR(dev, "Error allocating channel PRAMIN: %d\n", ret);
                 return ret;
         }
-        pramin = chan->ramin->gpuobj;
 
         ret = drm_mm_init(&chan->ramin_heap, base, size);
         if (ret) {
                 NV_ERROR(dev, "Error creating PRAMIN heap: %d\n", ret);
-                nouveau_gpuobj_ref_del(dev, &chan->ramin);
+                nouveau_gpuobj_ref(NULL, &chan->ramin);
                 return ret;
         }
 
@@ -826,8 +659,6 @@ nouveau_gpuobj_channel_init(struct nouveau_channel *chan,
         struct nouveau_gpuobj *vram = NULL, *tt = NULL;
         int ret, i;
 
-        INIT_LIST_HEAD(&chan->ramht_refs);
-
         NV_DEBUG(dev, "ch%d vram=0x%08x tt=0x%08x\n", chan->id, vram_h, tt_h);
 
         /* Allocate a chunk of memory for per-channel object storage */
@@ -846,10 +677,10 @@ nouveau_gpuobj_channel_init(struct nouveau_channel *chan,
                 uint32_t vm_offset, pde;
 
                 vm_offset = (dev_priv->chipset & 0xf0) == 0x50 ? 0x1400 : 0x200;
-                vm_offset += chan->ramin->gpuobj->im_pramin->start;
+                vm_offset += chan->ramin->im_pramin->start;
 
                 ret = nouveau_gpuobj_new_fake(dev, vm_offset, ~0, 0x4000,
-                                                        0, &chan->vm_pd, NULL);
+                                              0, &chan->vm_pd);
                 if (ret)
                         return ret;
                 for (i = 0; i < 0x4000; i += 8) {
@@ -857,25 +688,19 @@ nouveau_gpuobj_channel_init(struct nouveau_channel *chan,
                         nv_wo32(chan->vm_pd, i + 4, 0xdeadcafe);
                 }
 
+                nouveau_gpuobj_ref(dev_priv->gart_info.sg_ctxdma,
+                                   &chan->vm_gart_pt);
                 pde = (dev_priv->vm_gart_base / (512*1024*1024)) * 8;
-                ret = nouveau_gpuobj_ref_add(dev, NULL, 0,
-                                             dev_priv->gart_info.sg_ctxdma,
-                                             &chan->vm_gart_pt);
-                if (ret)
-                        return ret;
-                nv_wo32(chan->vm_pd, pde + 0, chan->vm_gart_pt->instance | 3);
+                nv_wo32(chan->vm_pd, pde + 0, chan->vm_gart_pt->vinst | 3);
                 nv_wo32(chan->vm_pd, pde + 4, 0x00000000);
 
                 pde = (dev_priv->vm_vram_base / (512*1024*1024)) * 8;
                 for (i = 0; i < dev_priv->vm_vram_pt_nr; i++) {
-                        ret = nouveau_gpuobj_ref_add(dev, NULL, 0,
-                                                     dev_priv->vm_vram_pt[i],
-                                                     &chan->vm_vram_pt[i]);
-                        if (ret)
-                                return ret;
+                        nouveau_gpuobj_ref(dev_priv->vm_vram_pt[i],
+                                           &chan->vm_vram_pt[i]);
 
                         nv_wo32(chan->vm_pd, pde + 0,
-                                chan->vm_vram_pt[i]->instance | 0x61);
+                                chan->vm_vram_pt[i]->vinst | 0x61);
                         nv_wo32(chan->vm_pd, pde + 4, 0x00000000);
                         pde += 8;
                 }
@@ -885,15 +710,17 @@ nouveau_gpuobj_channel_init(struct nouveau_channel *chan,
 
         /* RAMHT */
         if (dev_priv->card_type < NV_50) {
-                ret = nouveau_gpuobj_ref_add(dev, NULL, 0, dev_priv->ramht,
-                                             &chan->ramht);
+                nouveau_ramht_ref(dev_priv->ramht, &chan->ramht, NULL);
+        } else {
+                struct nouveau_gpuobj *ramht = NULL;
+
+                ret = nouveau_gpuobj_new(dev, chan, 0x8000, 16,
+                                         NVOBJ_FLAG_ZERO_ALLOC, &ramht);
                 if (ret)
                         return ret;
-        } else {
-                ret = nouveau_gpuobj_new_ref(dev, chan, chan, 0,
-                                             0x8000, 16,
-                                             NVOBJ_FLAG_ZERO_ALLOC,
-                                             &chan->ramht);
+
+                ret = nouveau_ramht_new(dev, ramht, &chan->ramht);
+                nouveau_gpuobj_ref(NULL, &ramht);
                 if (ret)
                         return ret;
         }
@@ -910,24 +737,32 @@ nouveau_gpuobj_channel_init(struct nouveau_channel *chan,
                 }
         } else {
                 ret = nouveau_gpuobj_dma_new(chan, NV_CLASS_DMA_IN_MEMORY,
-                                                0, dev_priv->fb_available_size,
-                                                NV_DMA_ACCESS_RW,
-                                                NV_DMA_TARGET_VIDMEM, &vram);
+                                             0, dev_priv->fb_available_size,
+                                             NV_DMA_ACCESS_RW,
+                                             NV_DMA_TARGET_VIDMEM, &vram);
                 if (ret) {
                         NV_ERROR(dev, "Error creating VRAM ctxdma: %d\n", ret);
                         return ret;
                 }
         }
 
-        ret = nouveau_gpuobj_ref_add(dev, chan, vram_h, vram, NULL);
+        ret = nouveau_ramht_insert(chan, vram_h, vram);
+        nouveau_gpuobj_ref(NULL, &vram);
         if (ret) {
-                NV_ERROR(dev, "Error referencing VRAM ctxdma: %d\n", ret);
+                NV_ERROR(dev, "Error adding VRAM ctxdma to RAMHT: %d\n", ret);
                 return ret;
         }
 
         /* TT memory ctxdma */
         if (dev_priv->card_type >= NV_50) {
-                tt = vram;
+                ret = nouveau_gpuobj_dma_new(chan, NV_CLASS_DMA_IN_MEMORY,
+                                             0, dev_priv->vm_end,
+                                             NV_DMA_ACCESS_RW,
+                                             NV_DMA_TARGET_AGP, &tt);
+                if (ret) {
+                        NV_ERROR(dev, "Error creating VRAM ctxdma: %d\n", ret);
+                        return ret;
+                }
         } else
         if (dev_priv->gart_info.type != NOUVEAU_GART_NONE) {
                 ret = nouveau_gpuobj_gart_dma_new(chan, 0,
@@ -943,9 +778,10 @@ nouveau_gpuobj_channel_init(struct nouveau_channel *chan,
                 return ret;
         }
 
-        ret = nouveau_gpuobj_ref_add(dev, chan, tt_h, tt, NULL);
+        ret = nouveau_ramht_insert(chan, tt_h, tt);
+        nouveau_gpuobj_ref(NULL, &tt);
         if (ret) {
-                NV_ERROR(dev, "Error referencing TT ctxdma: %d\n", ret);
+                NV_ERROR(dev, "Error adding TT ctxdma to RAMHT: %d\n", ret);
                 return ret;
         }
 
@@ -957,33 +793,23 @@ nouveau_gpuobj_channel_takedown(struct nouveau_channel *chan)
 {
         struct drm_nouveau_private *dev_priv = chan->dev->dev_private;
         struct drm_device *dev = chan->dev;
-        struct list_head *entry, *tmp;
-        struct nouveau_gpuobj_ref *ref;
         int i;
 
         NV_DEBUG(dev, "ch%d\n", chan->id);
 
-        if (!chan->ramht_refs.next)
+        if (!chan->ramht)
                 return;
 
-        list_for_each_safe(entry, tmp, &chan->ramht_refs) {
-                ref = list_entry(entry, struct nouveau_gpuobj_ref, list);
-
-                nouveau_gpuobj_ref_del(dev, &ref);
-        }
-
-        nouveau_gpuobj_ref_del(dev, &chan->ramht);
+        nouveau_ramht_ref(NULL, &chan->ramht, chan);
 
-        nouveau_gpuobj_del(dev, &chan->vm_pd);
-        nouveau_gpuobj_ref_del(dev, &chan->vm_gart_pt);
+        nouveau_gpuobj_ref(NULL, &chan->vm_pd);
+        nouveau_gpuobj_ref(NULL, &chan->vm_gart_pt);
         for (i = 0; i < dev_priv->vm_vram_pt_nr; i++)
-                nouveau_gpuobj_ref_del(dev, &chan->vm_vram_pt[i]);
+                nouveau_gpuobj_ref(NULL, &chan->vm_vram_pt[i]);
 
         if (chan->ramin_heap.free_stack.next)
                 drm_mm_takedown(&chan->ramin_heap);
-        if (chan->ramin)
-                nouveau_gpuobj_ref_del(dev, &chan->ramin);
-
+        nouveau_gpuobj_ref(NULL, &chan->ramin);
 }
 
 int
@@ -1095,25 +921,24 @@ int nouveau_ioctl_grobj_alloc(struct drm_device *dev, void *data,
                 return -EPERM;
         }
 
-        if (nouveau_gpuobj_ref_find(chan, init->handle, NULL) == 0)
+        if (nouveau_ramht_find(chan, init->handle))
                 return -EEXIST;
 
         if (!grc->software)
                 ret = nouveau_gpuobj_gr_new(chan, grc->id, &gr);
         else
                 ret = nouveau_gpuobj_sw_new(chan, grc->id, &gr);
-
         if (ret) {
                 NV_ERROR(dev, "Error creating object: %d (%d/0x%08x)\n",
                          ret, init->channel, init->handle);
                 return ret;
         }
 
-        ret = nouveau_gpuobj_ref_add(dev, chan, init->handle, gr, NULL);
+        ret = nouveau_ramht_insert(chan, init->handle, gr);
+        nouveau_gpuobj_ref(NULL, &gr);
         if (ret) {
                 NV_ERROR(dev, "Error referencing object: %d (%d/0x%08x)\n",
                          ret, init->channel, init->handle);
-                nouveau_gpuobj_del(dev, &gr);
                 return ret;
         }
 
@@ -1124,17 +949,16 @@ int nouveau_ioctl_gpuobj_free(struct drm_device *dev, void *data,
                               struct drm_file *file_priv)
 {
         struct drm_nouveau_gpuobj_free *objfree = data;
-        struct nouveau_gpuobj_ref *ref;
+        struct nouveau_gpuobj *gpuobj;
         struct nouveau_channel *chan;
-        int ret;
 
         NOUVEAU_GET_USER_CHANNEL_WITH_RETURN(objfree->channel, file_priv, chan);
 
-        ret = nouveau_gpuobj_ref_find(chan, objfree->handle, &ref);
-        if (ret)
-                return ret;
-        nouveau_gpuobj_ref_del(dev, &ref);
+        gpuobj = nouveau_ramht_find(chan, objfree->handle);
+        if (!gpuobj)
+                return -ENOENT;
 
+        nouveau_ramht_remove(chan, objfree->handle);
         return 0;
 }