Commit 89c651e2 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

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



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

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

+2 −2
Original line number Diff line number Diff line
@@ -40,9 +40,9 @@ struct nvkm_engine *nvkm_engine(void *obj, int idx); 


#define nvkm_engine_destroy(p)                                              \

	nvkm_subdev_destroy(&(p)->subdev)

#define nvkm_engine_init(p)                                                 \

#define nvkm_engine_init_old(p)                                                \

	nvkm_subdev_init_old(&(p)->subdev)

#define nvkm_engine_fini(p,s)                                               \

#define nvkm_engine_fini_old(p,s)                                              \

	nvkm_subdev_fini_old(&(p)->subdev, (s))



int nvkm_engine_create_(struct nvkm_object *, struct nvkm_object *,

drivers/gpu/drm/nouveau/include/nvkm/engine/fifo.h

+2 −2
Original line number Diff line number Diff line
@@ -91,9 +91,9 @@ nvkm_fifo(void *obj) 
#define nvkm_fifo_create(o,e,c,fc,lc,d)                                     \

	nvkm_fifo_create_((o), (e), (c), (fc), (lc), sizeof(**d), (void **)d)

#define nvkm_fifo_init(p)                                                   \

	nvkm_engine_init(&(p)->engine)

	nvkm_engine_init_old(&(p)->engine)

#define nvkm_fifo_fini(p,s)                                                 \

	nvkm_engine_fini(&(p)->engine, (s))

	nvkm_engine_fini_old(&(p)->engine, (s))



int nvkm_fifo_create_(struct nvkm_object *, struct nvkm_object *,

			 struct nvkm_oclass *, int min, int max,

drivers/gpu/drm/nouveau/include/nvkm/engine/gr.h

+2 −2
Original line number Diff line number Diff line
@@ -42,9 +42,9 @@ nvkm_gr(void *obj) 
#define nvkm_gr_destroy(d)                                               \

	nvkm_engine_destroy(&(d)->engine)

#define nvkm_gr_init(d)                                                  \

	nvkm_engine_init(&(d)->engine)

	nvkm_engine_init_old(&(d)->engine)

#define nvkm_gr_fini(d,s)                                                \

	nvkm_engine_fini(&(d)->engine, (s))

	nvkm_engine_fini_old(&(d)->engine, (s))



#define _nvkm_gr_dtor _nvkm_engine_dtor

#define _nvkm_gr_init _nvkm_engine_init

drivers/gpu/drm/nouveau/include/nvkm/engine/mpeg.h

+2 −2
Original line number Diff line number Diff line
@@ -32,9 +32,9 @@ struct nvkm_mpeg { 
#define nvkm_mpeg_destroy(d)                                                \

	nvkm_engine_destroy(&(d)->engine)

#define nvkm_mpeg_init(d)                                                   \

	nvkm_engine_init(&(d)->engine)

	nvkm_engine_init_old(&(d)->engine)

#define nvkm_mpeg_fini(d,s)                                                 \

	nvkm_engine_fini(&(d)->engine, (s))

	nvkm_engine_fini_old(&(d)->engine, (s))



#define _nvkm_mpeg_dtor _nvkm_engine_dtor

#define _nvkm_mpeg_init _nvkm_engine_init

drivers/gpu/drm/nouveau/include/nvkm/engine/sw.h

+2 −2
Original line number Diff line number Diff line
@@ -33,9 +33,9 @@ struct nvkm_sw { 
#define nvkm_sw_destroy(d)                                            \

	nvkm_engine_destroy(&(d)->engine)

#define nvkm_sw_init(d)                                               \

	nvkm_engine_init(&(d)->engine)

	nvkm_engine_init_old(&(d)->engine)

#define nvkm_sw_fini(d,s)                                             \

	nvkm_engine_fini(&(d)->engine, (s))

	nvkm_engine_fini_old(&(d)->engine, (s))



#define _nvkm_sw_dtor _nvkm_engine_dtor

#define _nvkm_sw_init _nvkm_engine_init