From aa35888ff024b18c7b6b29eb773a221f642987f7 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Thu, 20 Aug 2015 14:54:16 +1000 Subject: drm/nouveau/object: rename some functions to avoid upcoming conflicts Signed-off-by: Ben Skeggs diff --git a/drivers/gpu/drm/nouveau/include/nvkm/core/gpuobj.h b/drivers/gpu/drm/nouveau/include/nvkm/core/gpuobj.h index 0dd216c..4697578 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/core/gpuobj.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/core/gpuobj.h @@ -32,8 +32,8 @@ nv_gpuobj(void *obj) #define nvkm_gpuobj_create(p,e,c,v,g,s,a,f,d) \ nvkm_gpuobj_create_((p), (e), (c), (v), (g), (s), (a), (f), \ sizeof(**d), (void **)d) -#define nvkm_gpuobj_init(p) nvkm_object_init(&(p)->object) -#define nvkm_gpuobj_fini(p,s) nvkm_object_fini(&(p)->object, (s)) +#define nvkm_gpuobj_init(p) _nvkm_object_init(&(p)->object) +#define nvkm_gpuobj_fini(p,s) _nvkm_object_fini(&(p)->object, (s)) int nvkm_gpuobj_create_(struct nvkm_object *, struct nvkm_object *, struct nvkm_oclass *, u32 pclass, struct nvkm_object *, u32 size, u32 align, diff --git a/drivers/gpu/drm/nouveau/include/nvkm/core/object.h b/drivers/gpu/drm/nouveau/include/nvkm/core/object.h index 005cd4a..39a4962 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/core/object.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/core/object.h @@ -50,8 +50,8 @@ nv_object(void *obj) int nvkm_object_create_(struct nvkm_object *, struct nvkm_object *, struct nvkm_oclass *, u32, int size, void **); void nvkm_object_destroy(struct nvkm_object *); -int nvkm_object_init(struct nvkm_object *); -int nvkm_object_fini(struct nvkm_object *, bool suspend); +int _nvkm_object_init(struct nvkm_object *); +int _nvkm_object_fini(struct nvkm_object *, bool suspend); int _nvkm_object_ctor(struct nvkm_object *, struct nvkm_object *, struct nvkm_oclass *, void *, u32, @@ -112,7 +112,7 @@ nv_ofuncs(void *obj) return nv_oclass(obj)->ofuncs; } -int nvkm_object_ctor(struct nvkm_object *, struct nvkm_object *, +int nvkm_object_old(struct nvkm_object *, struct nvkm_object *, struct nvkm_oclass *, void *, u32, struct nvkm_object **); void nvkm_object_ref(struct nvkm_object *, struct nvkm_object **); diff --git a/drivers/gpu/drm/nouveau/include/nvkm/core/parent.h b/drivers/gpu/drm/nouveau/include/nvkm/core/parent.h index 45d2066..92270af 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/core/parent.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/core/parent.h @@ -30,9 +30,9 @@ nv_parent(void *obj) nvkm_parent_create_((p), (e), (c), (v), (s), (m), \ sizeof(**d), (void **)d) #define nvkm_parent_init(p) \ - nvkm_object_init(&(p)->object) + _nvkm_object_init(&(p)->object) #define nvkm_parent_fini(p,s) \ - nvkm_object_fini(&(p)->object, (s)) + _nvkm_object_fini(&(p)->object, (s)) int nvkm_parent_create_(struct nvkm_object *, struct nvkm_object *, struct nvkm_oclass *, u32 pclass, @@ -41,8 +41,8 @@ int nvkm_parent_create_(struct nvkm_object *, struct nvkm_object *, void nvkm_parent_destroy(struct nvkm_parent *); void _nvkm_parent_dtor(struct nvkm_object *); -#define _nvkm_parent_init nvkm_object_init -#define _nvkm_parent_fini nvkm_object_fini +#define _nvkm_parent_init _nvkm_object_init +#define _nvkm_parent_fini _nvkm_object_fini int nvkm_parent_sclass(struct nvkm_object *, s32 handle, struct nvkm_object **pengine, diff --git a/drivers/gpu/drm/nouveau/nvkm/core/gpuobj.c b/drivers/gpu/drm/nouveau/nvkm/core/gpuobj.c index 6e26833..1ca5479 100644 --- a/drivers/gpu/drm/nouveau/nvkm/core/gpuobj.c +++ b/drivers/gpu/drm/nouveau/nvkm/core/gpuobj.c @@ -223,9 +223,9 @@ nvkm_gpuobj_new(struct nvkm_object *parent, struct nvkm_object *pargpu, .flags = flags, }; - return nvkm_object_ctor(parent, &parent->engine->subdev.object, - &_nvkm_gpuobj_oclass, &args, sizeof(args), - (struct nvkm_object **)pgpuobj); + return nvkm_object_old(parent, &parent->engine->subdev.object, + &_nvkm_gpuobj_oclass, &args, sizeof(args), + (struct nvkm_object **)pgpuobj); } int @@ -288,8 +288,8 @@ nvkm_gpudup_oclass = { .handle = NV_GPUOBJ_CLASS, .ofuncs = &(struct nvkm_ofuncs) { .dtor = nvkm_gpudup_dtor, - .init = nvkm_object_init, - .fini = nvkm_object_fini, + .init = _nvkm_object_init, + .fini = _nvkm_object_fini, }, }; diff --git a/drivers/gpu/drm/nouveau/nvkm/core/ioctl.c b/drivers/gpu/drm/nouveau/nvkm/core/ioctl.c index ee6ff01..7a15b15 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; diff --git a/drivers/gpu/drm/nouveau/nvkm/core/object.c b/drivers/gpu/drm/nouveau/nvkm/core/object.c index 98ba58e..1c117f0 100644 --- a/drivers/gpu/drm/nouveau/nvkm/core/object.c +++ b/drivers/gpu/drm/nouveau/nvkm/core/object.c @@ -136,13 +136,13 @@ nvkm_object_destroy(struct nvkm_object *object) } int -nvkm_object_init(struct nvkm_object *object) +_nvkm_object_init(struct nvkm_object *object) { return 0; } int -nvkm_object_fini(struct nvkm_object *object, bool suspend) +_nvkm_object_fini(struct nvkm_object *object, bool suspend) { return 0; } @@ -151,12 +151,12 @@ struct nvkm_ofuncs nvkm_object_ofuncs = { .ctor = _nvkm_object_ctor, .dtor = nvkm_object_destroy, - .init = nvkm_object_init, - .fini = nvkm_object_fini, + .init = _nvkm_object_init, + .fini = _nvkm_object_fini, }; int -nvkm_object_ctor(struct nvkm_object *parent, struct nvkm_object *engine, +nvkm_object_old(struct nvkm_object *parent, struct nvkm_object *engine, struct nvkm_oclass *oclass, void *data, u32 size, struct nvkm_object **pobject) { diff --git a/drivers/gpu/drm/nouveau/nvkm/core/subdev.c b/drivers/gpu/drm/nouveau/nvkm/core/subdev.c index 25f3503..0c31346 100644 --- a/drivers/gpu/drm/nouveau/nvkm/core/subdev.c +++ b/drivers/gpu/drm/nouveau/nvkm/core/subdev.c @@ -48,7 +48,7 @@ nvkm_subdev_reset(struct nvkm_object *obj) int nvkm_subdev_init(struct nvkm_subdev *subdev) { - int ret = nvkm_object_init(&subdev->object); + int ret = _nvkm_object_init(&subdev->object); if (ret) return ret; @@ -72,7 +72,7 @@ nvkm_subdev_fini(struct nvkm_subdev *subdev, bool suspend) nvkm_mask(device, 0x000200, subdev->unit, subdev->unit); } - return nvkm_object_fini(&subdev->object, suspend); + return _nvkm_object_fini(&subdev->object, suspend); } int diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c index 479181c..b7892e6 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c @@ -152,7 +152,7 @@ nvkm_device_init(struct nvkm_device *device) for (i = 0, c = 0; i < NVDEV_SUBDEV_NR; i++) { #define _(s,m) case s: if (device->oclass[s] && !device->subdev[s]) { \ - ret = nvkm_object_ctor(nv_object(device), NULL, \ + ret = nvkm_object_old(nv_object(device), NULL, \ device->oclass[s], NULL, (s), \ (struct nvkm_object **)&device->m); \ if (ret == -ENODEV) { \ diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/ctrl.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/ctrl.c index c13cd9d..0abee2d 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/device/ctrl.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/ctrl.c @@ -185,8 +185,8 @@ static struct nvkm_ofuncs nvkm_control_ofuncs = { .ctor = _nvkm_object_ctor, .dtor = nvkm_object_destroy, - .init = nvkm_object_init, - .fini = nvkm_object_fini, + .init = _nvkm_object_init, + .fini = _nvkm_object_fini, .mthd = nvkm_control_mthd, }; diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv04.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv04.c index d6c0cf0..ab5f842 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv04.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv04.c @@ -106,8 +106,8 @@ static struct nvkm_ofuncs nv04_disp_ofuncs = { .ctor = _nvkm_object_ctor, .dtor = nvkm_object_destroy, - .init = nvkm_object_init, - .fini = nvkm_object_fini, + .init = _nvkm_object_init, + .fini = _nvkm_object_fini, .mthd = nv04_disp_mthd, .ntfy = nvkm_disp_ntfy, }; diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/dmaobj/priv.h b/drivers/gpu/drm/nouveau/nvkm/engine/dmaobj/priv.h index 44ae8a0..c4c210b 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/dmaobj/priv.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/dmaobj/priv.h @@ -9,8 +9,8 @@ int nvkm_dmaobj_create_(struct nvkm_object *, struct nvkm_object *, struct nvkm_oclass *, void **, u32 *, int, void **); #define _nvkm_dmaobj_dtor nvkm_object_destroy -#define _nvkm_dmaobj_init nvkm_object_init -#define _nvkm_dmaobj_fini nvkm_object_fini +#define _nvkm_dmaobj_init _nvkm_object_init +#define _nvkm_dmaobj_fini _nvkm_object_fini int _nvkm_dmaeng_ctor(struct nvkm_object *, struct nvkm_object *, struct nvkm_oclass *, void *, u32, diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c index 48b526c..3562b79 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c @@ -272,7 +272,7 @@ gk104_fifo_chan_ctor(struct nvkm_object *parent, struct nvkm_object *engine, .ofuncs = &nvkm_object_ofuncs, }; args->v0.engine = engines; - return nvkm_object_ctor(parent, engine, &oclass, NULL, 0, pobject); + return nvkm_object_old(parent, engine, &oclass, NULL, 0, pobject); } engines &= args->v0.engine; diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c index a7141e0..6afdb20 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c @@ -228,8 +228,8 @@ struct nvkm_ofuncs gf100_fermi_ofuncs = { .ctor = _nvkm_object_ctor, .dtor = nvkm_object_destroy, - .init = nvkm_object_init, - .fini = nvkm_object_fini, + .init = _nvkm_object_init, + .fini = _nvkm_object_fini, .mthd = gf100_fermi_mthd, }; diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv04.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv04.c index 323f020..617161e 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv04.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv04.c @@ -1187,7 +1187,7 @@ nv04_gr_context_fini(struct nvkm_object *object, bool suspend) nvkm_mask(device, NV04_PGRAPH_FIFO, 0x00000001, 0x00000001); spin_unlock_irqrestore(&gr->lock, flags); - return nvkm_object_fini(&chan->base, suspend); + return _nvkm_object_fini(&chan->base, suspend); } static struct nvkm_oclass @@ -1196,7 +1196,7 @@ nv04_gr_cclass = { .ofuncs = &(struct nvkm_ofuncs) { .ctor = nv04_gr_context_ctor, .dtor = nv04_gr_context_dtor, - .init = nvkm_object_init, + .init = _nvkm_object_init, .fini = nv04_gr_context_fini, }, }; diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv10.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv10.c index 94f7dc7..be92015 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv10.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/nv10.c @@ -1111,7 +1111,7 @@ nv10_gr_context_fini(struct nvkm_object *object, bool suspend) nvkm_mask(device, NV04_PGRAPH_FIFO, 0x00000001, 0x00000001); spin_unlock_irqrestore(&gr->lock, flags); - return nvkm_object_fini(&chan->base, suspend); + return _nvkm_object_fini(&chan->base, suspend); } static struct nvkm_oclass @@ -1120,7 +1120,7 @@ nv10_gr_cclass = { .ofuncs = &(struct nvkm_ofuncs) { .ctor = nv10_gr_context_ctor, .dtor = nv10_gr_context_dtor, - .init = nvkm_object_init, + .init = _nvkm_object_init, .fini = nv10_gr_context_fini, }, }; diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv31.c b/drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv31.c index 1586213..0f02b28 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv31.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv31.c @@ -173,8 +173,8 @@ nv31_mpeg_cclass = { .ofuncs = &(struct nvkm_ofuncs) { .ctor = nv31_mpeg_context_ctor, .dtor = nv31_mpeg_context_dtor, - .init = nvkm_object_init, - .fini = nvkm_object_fini, + .init = _nvkm_object_init, + .fini = _nvkm_object_fini, }, }; diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c index b75395b..ac27f51 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c @@ -419,8 +419,8 @@ static struct nvkm_ofuncs nvkm_perfdom_ofuncs = { .ctor = nvkm_perfdom_ctor, .dtor = nvkm_perfdom_dtor, - .init = nvkm_object_init, - .fini = nvkm_object_fini, + .init = _nvkm_object_init, + .fini = _nvkm_object_fini, .mthd = nvkm_perfdom_mthd, }; diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bar/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/bar/base.c index 0cdb49e..6fe71b2 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/bar/base.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bar/base.c @@ -94,8 +94,8 @@ nvkm_barobj_oclass = { .ofuncs = &(struct nvkm_ofuncs) { .ctor = nvkm_barobj_ctor, .dtor = nvkm_barobj_dtor, - .init = nvkm_object_init, - .fini = nvkm_object_fini, + .init = _nvkm_object_init, + .fini = _nvkm_object_fini, .rd32 = nvkm_barobj_rd32, .wr32 = nvkm_barobj_wr32, }, @@ -106,7 +106,7 @@ nvkm_bar_alloc(struct nvkm_bar *bar, struct nvkm_object *parent, struct nvkm_mem *mem, struct nvkm_object **pobject) { struct nvkm_object *gpuobj; - int ret = nvkm_object_ctor(parent, &parent->engine->subdev.object, + int ret = nvkm_object_old(parent, &parent->engine->subdev.object, &nvkm_barobj_oclass, mem, 0, &gpuobj); if (ret == 0) *pobject = gpuobj; diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/base.c index 4219eb3..495da91 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/base.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/base.c @@ -72,7 +72,7 @@ nvkm_instmem_alloc(struct nvkm_instmem *imem, struct nvkm_object *parent, { struct nvkm_instmem_impl *impl = (void *)imem->subdev.object.oclass; struct nvkm_instobj_args args = { .size = size, .align = align }; - return nvkm_object_ctor(parent, &parent->engine->subdev.object, + return nvkm_object_old(parent, &parent->engine->subdev.object, impl->instobj, &args, sizeof(args), pobject); } diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/priv.h b/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/priv.h index e217ebe..819f615 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/priv.h +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/priv.h @@ -18,15 +18,15 @@ struct nvkm_instobj_args { _nvkm_instobj_dtor(nv_object(iobj)); \ }) #define nvkm_instobj_init(p) \ - nvkm_object_init(&(p)->base) + _nvkm_object_init(&(p)->base) #define nvkm_instobj_fini(p,s) \ - nvkm_object_fini(&(p)->base, (s)) + _nvkm_object_fini(&(p)->base, (s)) int nvkm_instobj_create_(struct nvkm_object *, struct nvkm_object *, struct nvkm_oclass *, int, void **); void _nvkm_instobj_dtor(struct nvkm_object *); -#define _nvkm_instobj_init nvkm_object_init -#define _nvkm_instobj_fini nvkm_object_fini +#define _nvkm_instobj_init _nvkm_object_init +#define _nvkm_instobj_fini _nvkm_object_fini struct nvkm_instmem_impl { struct nvkm_oclass base; diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/nv41.c b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/nv41.c index c44f880..26192b9 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/nv41.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/nv41.c @@ -96,7 +96,7 @@ nv41_mmu_ctor(struct nvkm_object *parent, struct nvkm_object *engine, if (pci_find_capability(device->pdev, PCI_CAP_ID_AGP) || !nvkm_boolopt(device->cfgopt, "NvPCIE", true)) { - return nvkm_object_ctor(parent, engine, &nv04_mmu_oclass, + return nvkm_object_old(parent, engine, &nv04_mmu_oclass, data, size, pobject); } diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/nv44.c b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/nv44.c index 3be8a79..3e51dc7 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/nv44.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/nv44.c @@ -169,7 +169,7 @@ nv44_mmu_ctor(struct nvkm_object *parent, struct nvkm_object *engine, if (pci_find_capability(device->pdev, PCI_CAP_ID_AGP) || !nvkm_boolopt(device->cfgopt, "NvPCIE", true)) { - return nvkm_object_ctor(parent, engine, &nv04_mmu_oclass, + return nvkm_object_old(parent, engine, &nv04_mmu_oclass, data, size, pobject); } -- cgit v0.10.2