Commit aa35888f authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/object: rename some functions to avoid upcoming conflicts 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent d61f4c17

drivers/gpu/drm/nouveau/include/nvkm/core/gpuobj.h

+2 −2
Original line number Diff line number Diff line
@@ -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,

drivers/gpu/drm/nouveau/include/nvkm/core/object.h

+3 −3
Original line number Diff line number Diff line
@@ -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 **);

drivers/gpu/drm/nouveau/include/nvkm/core/parent.h

+4 −4
Original line number Diff line number Diff line
@@ -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,

drivers/gpu/drm/nouveau/nvkm/core/gpuobj.c

+5 −5
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ nvkm_gpuobj_new(struct nvkm_object *parent, struct nvkm_object *pargpu, 
		.flags = flags,

	};



	return nvkm_object_ctor(parent, &parent->engine->subdev.object,

	return nvkm_object_old(parent, &parent->engine->subdev.object,

			       &_nvkm_gpuobj_oclass, &args, sizeof(args),

			       (struct nvkm_object **)pgpuobj);

}
@@ -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,

	},

};

drivers/gpu/drm/nouveau/nvkm/core/ioctl.c

+2 −2
Original line number Diff line number Diff line
@@ -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;