diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2015-08-20 14:54:16 +1000 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2015-08-28 12:40:33 +1000 |
commit | aa35888ff024b18c7b6b29eb773a221f642987f7 (patch) | |
tree | fff59d717c0b36c63dfa25020f69b4eb9e341644 /drivers/gpu/drm/nouveau/nvkm/core/ioctl.c | |
parent | d61f4c178cb36a7b15871fcc60814f1f94a5044d (diff) | |
download | linux-aa35888ff024b18c7b6b29eb773a221f642987f7.tar.bz2 |
drm/nouveau/object: rename some functions to avoid upcoming conflicts
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/core/ioctl.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/core/ioctl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/core/ioctl.c b/drivers/gpu/drm/nouveau/nvkm/core/ioctl.c index ee6ff01c2b1b..7a15b15bfce0 100644 --- a/drivers/gpu/drm/nouveau/nvkm/core/ioctl.c +++ b/drivers/gpu/drm/nouveau/nvkm/core/ioctl.c @@ -137,7 +137,7 @@ nvkm_ioctl_new(struct nvkm_handle *handle, void *data, u32 size) * between the parent and its children (eg. PGRAPH context) */ if (engine && nv_engine(engine)->cclass) { - ret = nvkm_object_ctor(&parent->object, engine, + ret = nvkm_object_old(&parent->object, engine, nv_engine(engine)->cclass, data, size, &engctx); if (ret) @@ -147,7 +147,7 @@ nvkm_ioctl_new(struct nvkm_handle *handle, void *data, u32 size) } /* finally, create new object and bind it to its handle */ - ret = nvkm_object_ctor(engctx, engine, oclass, data, size, &object); + ret = nvkm_object_old(engctx, engine, oclass, data, size, &object); client->data = object; if (ret) goto fail_ctor; |