diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2015-08-20 14:54:14 +1000 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2015-08-28 12:40:29 +1000 |
commit | d36a99d2da22bdffebf644e4a5f811e8eff82360 (patch) | |
tree | 67198dafc31c379c5e9c17e3e86230d59293406d /drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c | |
parent | drm/nouveau/vga: require nvkm_device pointer in accessor functions (diff) | |
download | linux-dev-d36a99d2da22bdffebf644e4a5f811e8eff82360.tar.xz linux-dev-d36a99d2da22bdffebf644e4a5f811e8eff82360.zip |
drm/nouveau/fb: transition nvkm_ram away from being based on nvkm_object
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c b/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c index 339dd19e0e45..4f6354df538a 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c @@ -84,8 +84,8 @@ static void nv50_instobj_dtor(struct nvkm_object *object) { struct nv50_instobj *node = (void *)object; - struct nvkm_fb *fb = nvkm_fb(object); - fb->ram->put(fb, &node->mem); + struct nvkm_ram *ram = nvkm_fb(object)->ram; + ram->func->put(ram, &node->mem); nvkm_instobj_destroy(&node->base); } @@ -94,7 +94,7 @@ nv50_instobj_ctor(struct nvkm_object *parent, struct nvkm_object *engine, struct nvkm_oclass *oclass, void *data, u32 size, struct nvkm_object **pobject) { - struct nvkm_fb *fb = nvkm_fb(parent); + struct nvkm_ram *ram = nvkm_fb(parent)->ram; struct nvkm_instobj_args *args = data; struct nv50_instobj *node; int ret; @@ -107,7 +107,8 @@ nv50_instobj_ctor(struct nvkm_object *parent, struct nvkm_object *engine, if (ret) return ret; - ret = fb->ram->get(fb, args->size, args->align, 0, 0x800, &node->mem); + ret = ram->func->get(ram, args->size, args->align, 0, 0x800, + &node->mem); if (ret) return ret; |