Commit 8d6461d8 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/sw: switch to instanced constructor 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
parent d1866250

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

+0 −2
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ struct nvkm_device { 
		struct notifier_block nb;

	} acpi;



	struct nvkm_sw *sw;

	struct nvkm_engine *vic;



#define NVKM_LAYOUT_ONCE(type,data,ptr) data *ptr;
@@ -103,7 +102,6 @@ struct nvkm_device_chip { 
#undef NVKM_LAYOUT_INST

#undef NVKM_LAYOUT_ONCE



	int (*sw      )(struct nvkm_device *, int idx, struct nvkm_sw **);

	int (*vic     )(struct nvkm_device *, int idx, struct nvkm_engine **);

};

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

+1 −5
Original line number Diff line number Diff line
@@ -47,12 +47,8 @@ struct nvkm_engine_func { 
	struct nvkm_sclass sclass[];

};



int nvkm_engine_ctor_(const struct nvkm_engine_func *, bool old, struct nvkm_device *,

int nvkm_engine_ctor(const struct nvkm_engine_func *, struct nvkm_device *,

		     enum nvkm_subdev_type, int inst, bool enable, struct nvkm_engine *);

#define nvkm_engine_ctor_o(f,d,i,  e,s) nvkm_engine_ctor_((f),  true, (d), (i), -1 , (e), (s))

#define nvkm_engine_ctor_n(f,d,t,i,e,s) nvkm_engine_ctor_((f), false, (d), (t), (i), (e), (s))

#define nvkm_engine_ctor__(_1,_2,_3,_4,_5,_6,IMPL,...) IMPL

#define nvkm_engine_ctor(A...) nvkm_engine_ctor__(A, nvkm_engine_ctor_n, nvkm_engine_ctor_o)(A)

int nvkm_engine_new_(const struct nvkm_engine_func *, struct nvkm_device *,

		     enum nvkm_subdev_type, int, bool enable, struct nvkm_engine **);

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

+1 −0
Original line number Diff line number Diff line
@@ -44,4 +44,5 @@ NVKM_LAYOUT_INST(NVKM_ENGINE_NVENC , struct nvkm_nvenc , nvenc, 3) 
NVKM_LAYOUT_ONCE(NVKM_ENGINE_PM      , struct nvkm_pm      ,       pm)

NVKM_LAYOUT_ONCE(NVKM_ENGINE_SEC     , struct nvkm_engine  ,      sec)

NVKM_LAYOUT_ONCE(NVKM_ENGINE_SEC2    , struct nvkm_sec2    ,     sec2)

NVKM_LAYOUT_ONCE(NVKM_ENGINE_SW      , struct nvkm_sw      ,       sw)

NVKM_LAYOUT_ONCE(NVKM_ENGINE_VP      , struct nvkm_engine  ,       vp)

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

+2 −6
Original line number Diff line number Diff line
@@ -106,12 +106,8 @@ struct nvkm_subdev_func { 
extern const char *nvkm_subdev_type[NVKM_SUBDEV_NR];

int nvkm_subdev_new_(const struct nvkm_subdev_func *, struct nvkm_device *, enum nvkm_subdev_type,

		     int inst, struct nvkm_subdev **);

void nvkm_subdev_ctor_(const struct nvkm_subdev_func *, bool old, struct nvkm_device *,

void nvkm_subdev_ctor(const struct nvkm_subdev_func *, struct nvkm_device *,

		      enum nvkm_subdev_type, int inst, struct nvkm_subdev *);

#define nvkm_subdev_ctor_o(f,d,i,  s) nvkm_subdev_ctor_((f),  true, (d), (i), -1 , (s))

#define nvkm_subdev_ctor_n(f,d,t,i,s) nvkm_subdev_ctor_((f), false, (d), (t), (i), (s))

#define nvkm_subdev_ctor__(_1,_2,_3,_4,_5,IMPL,...) IMPL

#define nvkm_subdev_ctor(A...) nvkm_subdev_ctor__(A, nvkm_subdev_ctor_n, nvkm_subdev_ctor_o)(A)

void nvkm_subdev_disable(struct nvkm_device *, enum nvkm_subdev_type, int inst);

void nvkm_subdev_del(struct nvkm_subdev **);

int  nvkm_subdev_preinit(struct nvkm_subdev *);

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

+4 −4
Original line number Diff line number Diff line
@@ -12,8 +12,8 @@ struct nvkm_sw { 


bool nvkm_sw_mthd(struct nvkm_sw *sw, int chid, int subc, u32 mthd, u32 data);



int nv04_sw_new(struct nvkm_device *, int, struct nvkm_sw **);

int nv10_sw_new(struct nvkm_device *, int, struct nvkm_sw **);

int nv50_sw_new(struct nvkm_device *, int, struct nvkm_sw **);

int gf100_sw_new(struct nvkm_device *, int, struct nvkm_sw **);

int nv04_sw_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_sw **);

int nv10_sw_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_sw **);

int nv50_sw_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_sw **);

int gf100_sw_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_sw **);

#endif