Commit 4a34fd0e authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/devinit: switch to instanced constructor 



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

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_devinit *devinit;

	struct nvkm_fault *fault;

	struct nvkm_fb *fb;

	struct nvkm_fuse *fuse;
@@ -143,7 +142,6 @@ struct nvkm_device_chip { 
#include <core/layout.h>

#undef NVKM_LAYOUT_INST

#undef NVKM_LAYOUT_ONCE

	int (*devinit )(struct nvkm_device *, int idx, struct nvkm_devinit **);

	int (*fault   )(struct nvkm_device *, int idx, struct nvkm_fault **);

	int (*fb      )(struct nvkm_device *, int idx, struct nvkm_fb **);

	int (*fuse    )(struct nvkm_device *, int idx, struct nvkm_fuse **);

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

+1 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: MIT */

NVKM_LAYOUT_ONCE(NVKM_SUBDEV_VBIOS   , struct nvkm_bios    ,     bios)

NVKM_LAYOUT_ONCE(NVKM_SUBDEV_DEVINIT , struct nvkm_devinit ,  devinit)

NVKM_LAYOUT_ONCE(NVKM_SUBDEV_BUS     , struct nvkm_bus     ,      bus)

NVKM_LAYOUT_ONCE(NVKM_SUBDEV_BAR     , struct nvkm_bar     ,      bar)

NVKM_LAYOUT_ONCE(NVKM_SUBDEV_ACR     , struct nvkm_acr     ,      acr)

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

+16 −16
Original line number Diff line number Diff line
@@ -17,20 +17,20 @@ void nvkm_devinit_meminit(struct nvkm_devinit *); 
u64 nvkm_devinit_disable(struct nvkm_devinit *);

int nvkm_devinit_post(struct nvkm_devinit *, u64 *disable);



int nv04_devinit_new(struct nvkm_device *, int, struct nvkm_devinit **);

int nv05_devinit_new(struct nvkm_device *, int, struct nvkm_devinit **);

int nv10_devinit_new(struct nvkm_device *, int, struct nvkm_devinit **);

int nv1a_devinit_new(struct nvkm_device *, int, struct nvkm_devinit **);

int nv20_devinit_new(struct nvkm_device *, int, struct nvkm_devinit **);

int nv50_devinit_new(struct nvkm_device *, int, struct nvkm_devinit **);

int g84_devinit_new(struct nvkm_device *, int, struct nvkm_devinit **);

int g98_devinit_new(struct nvkm_device *, int, struct nvkm_devinit **);

int gt215_devinit_new(struct nvkm_device *, int, struct nvkm_devinit **);

int mcp89_devinit_new(struct nvkm_device *, int, struct nvkm_devinit **);

int gf100_devinit_new(struct nvkm_device *, int, struct nvkm_devinit **);

int gm107_devinit_new(struct nvkm_device *, int, struct nvkm_devinit **);

int gm200_devinit_new(struct nvkm_device *, int, struct nvkm_devinit **);

int gv100_devinit_new(struct nvkm_device *, int, struct nvkm_devinit **);

int tu102_devinit_new(struct nvkm_device *, int, struct nvkm_devinit **);

int ga100_devinit_new(struct nvkm_device *, int, struct nvkm_devinit **);

int nv04_devinit_new(struct nvkm_device *, enum nvkm_subdev_type, int, struct nvkm_devinit **);

int nv05_devinit_new(struct nvkm_device *, enum nvkm_subdev_type, int, struct nvkm_devinit **);

int nv10_devinit_new(struct nvkm_device *, enum nvkm_subdev_type, int, struct nvkm_devinit **);

int nv1a_devinit_new(struct nvkm_device *, enum nvkm_subdev_type, int, struct nvkm_devinit **);

int nv20_devinit_new(struct nvkm_device *, enum nvkm_subdev_type, int, struct nvkm_devinit **);

int nv50_devinit_new(struct nvkm_device *, enum nvkm_subdev_type, int, struct nvkm_devinit **);

int g84_devinit_new(struct nvkm_device *, enum nvkm_subdev_type, int, struct nvkm_devinit **);

int g98_devinit_new(struct nvkm_device *, enum nvkm_subdev_type, int, struct nvkm_devinit **);

int gt215_devinit_new(struct nvkm_device *, enum nvkm_subdev_type, int, struct nvkm_devinit **);

int mcp89_devinit_new(struct nvkm_device *, enum nvkm_subdev_type, int, struct nvkm_devinit **);

int gf100_devinit_new(struct nvkm_device *, enum nvkm_subdev_type, int, struct nvkm_devinit **);

int gm107_devinit_new(struct nvkm_device *, enum nvkm_subdev_type, int, struct nvkm_devinit **);

int gm200_devinit_new(struct nvkm_device *, enum nvkm_subdev_type, int, struct nvkm_devinit **);

int gv100_devinit_new(struct nvkm_device *, enum nvkm_subdev_type, int, struct nvkm_devinit **);

int tu102_devinit_new(struct nvkm_device *, enum nvkm_subdev_type, int, struct nvkm_devinit **);

int ga100_devinit_new(struct nvkm_device *, enum nvkm_subdev_type, int, struct nvkm_devinit **);

#endif

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

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ nvkm_subdev_type[NVKM_SUBDEV_NR] = { 
#include <core/layout.h>

#undef NVKM_LAYOUT_ONCE

#undef NVKM_LAYOUT_INST

	[NVKM_SUBDEV_DEVINIT ] = "devinit",

	[NVKM_SUBDEV_FAULT   ] = "fault",

	[NVKM_SUBDEV_FB      ] = "fb",

	[NVKM_SUBDEV_FUSE    ] = "fuse",

drivers/gpu/drm/nouveau/nvkm/engine/device/base.c

+84 −85

File changed.

Preview size limit exceeded, changes collapsed.