diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2015-08-20 14:54:17 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-08-28 12:37:39 +1000 |
| commit | b9977d2d78f05350be659cb2b76d5e9f455099e5 (patch) | |
| tree | d9c28e548d431d4d4233ad182795af2f6f1fe2e3 /drm/nouveau/nvkm/subdev | |
| parent | 541f14853e44c2934afd49c597b36768823ee84d (diff) | |
| download | nouveau-b9977d2d78f05350be659cb2b76d5e9f455099e5.tar.gz | |
ramht: remove dependence on namedb
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drm/nouveau/nvkm/subdev')
| -rw-r--r-- | drm/nouveau/nvkm/subdev/instmem/nv04.c | 5 | ||||
| -rw-r--r-- | drm/nouveau/nvkm/subdev/instmem/nv40.c | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/drm/nouveau/nvkm/subdev/instmem/nv04.c b/drm/nouveau/nvkm/subdev/instmem/nv04.c index 56330ccf4..1df45273b 100644 --- a/drm/nouveau/nvkm/subdev/instmem/nv04.c +++ b/drm/nouveau/nvkm/subdev/instmem/nv04.c @@ -156,7 +156,7 @@ nv04_instmem_dtor(struct nvkm_object *object) struct nv04_instmem *imem = (void *)object; nvkm_memory_del(&imem->base.ramfc); nvkm_memory_del(&imem->base.ramro); - nvkm_ramht_ref(NULL, &imem->base.ramht); + nvkm_ramht_del(&imem->base.ramht); nvkm_memory_del(&imem->base.vbios); nvkm_mm_fini(&imem->heap); nvkm_instmem_destroy(&imem->base); @@ -198,8 +198,7 @@ nv04_instmem_ctor(struct nvkm_object *parent, struct nvkm_object *engine, return ret; /* 0x10000-0x18000: reserve for RAMHT */ - ret = nvkm_ramht_new(nv_object(imem), NULL, 0x08000, 0, - &imem->base.ramht); + ret = nvkm_ramht_new(device, 0x08000, 0, NULL, &imem->base.ramht); if (ret) return ret; diff --git a/drm/nouveau/nvkm/subdev/instmem/nv40.c b/drm/nouveau/nvkm/subdev/instmem/nv40.c index 5a2709d49..8e7a11503 100644 --- a/drm/nouveau/nvkm/subdev/instmem/nv40.c +++ b/drm/nouveau/nvkm/subdev/instmem/nv40.c @@ -157,7 +157,7 @@ nv40_instmem_dtor(struct nvkm_object *object) struct nv40_instmem *imem = (void *)object; nvkm_memory_del(&imem->base.ramfc); nvkm_memory_del(&imem->base.ramro); - nvkm_ramht_ref(NULL, &imem->base.ramht); + nvkm_ramht_del(&imem->base.ramht); nvkm_memory_del(&imem->base.vbios); nvkm_mm_fini(&imem->heap); if (imem->iomem) @@ -227,8 +227,7 @@ nv40_instmem_ctor(struct nvkm_object *parent, struct nvkm_object *engine, return ret; /* 0x10000-0x18000: reserve for RAMHT */ - ret = nvkm_ramht_new(nv_object(imem), NULL, 0x08000, 0, - &imem->base.ramht); + ret = nvkm_ramht_new(device, 0x08000, 0, NULL, &imem->base.ramht); if (ret) return ret; |