diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2015-08-20 07:54:17 +0300 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-08-28 05:40:37 +0300 |
| commit | 1d2a1e53865266a67fb569705eba3ec992682721 (patch) | |
| tree | 9ee9f3817de71fe0a39f0d27ddcc80dcd2179b2b /drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv40.c | |
| parent | f027f49166171c98d5945af12ac3ee9bc9f9bf4c (diff) | |
| download | linux-1d2a1e53865266a67fb569705eba3ec992682721.tar.xz | |
drm/nouveau/ramht: remove dependence on namedb
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv40.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv40.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv40.c b/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv40.c index 5a2709d499e9..8e7a11503c09 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv40.c +++ b/drivers/gpu/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; |