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:40:36 +1000 |
| commit | d0659d3277cd7bf50e45d48f4692a7fbb11e5957 (patch) | |
| tree | f8c1227bf23f524f106fea8aa8d6104d4aa08ccb /drivers/gpu/drm/nouveau/nvkm/core | |
| parent | d8e83994aaf6749b7124a219f5b46bd1329e2a08 (diff) | |
| download | blackbird-obmc-linux-d0659d3277cd7bf50e45d48f4692a7fbb11e5957.tar.gz blackbird-obmc-linux-d0659d3277cd7bf50e45d48f4692a7fbb11e5957.zip | |
drm/nouveau/mmu: directly use instmem for page tables
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/core')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/core/gpuobj.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/core/gpuobj.c b/drivers/gpu/drm/nouveau/nvkm/core/gpuobj.c index 037036069839..ada5b6114a40 100644 --- a/drivers/gpu/drm/nouveau/nvkm/core/gpuobj.c +++ b/drivers/gpu/drm/nouveau/nvkm/core/gpuobj.c @@ -308,7 +308,6 @@ static void nvkm_gpudup_dtor(struct nvkm_object *object) { struct nvkm_gpuobj *gpuobj = (void *)object; - nvkm_object_ref(NULL, (struct nvkm_object **)&gpuobj->parent); nvkm_object_destroy(&gpuobj->object); } @@ -323,7 +322,7 @@ nvkm_gpudup_oclass = { }; int -nvkm_gpuobj_dup(struct nvkm_object *parent, struct nvkm_gpuobj *base, +nvkm_gpuobj_dup(struct nvkm_object *parent, struct nvkm_memory *base, struct nvkm_gpuobj **pgpuobj) { struct nvkm_gpuobj *gpuobj; @@ -335,8 +334,7 @@ nvkm_gpuobj_dup(struct nvkm_object *parent, struct nvkm_gpuobj *base, if (ret) return ret; - nvkm_object_ref(nv_object(base), (struct nvkm_object **)&gpuobj->parent); - gpuobj->addr = base->addr; - gpuobj->size = base->size; + gpuobj->addr = nvkm_memory_addr(base); + gpuobj->size = nvkm_memory_size(base); return 0; } |
