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

drm/nouveau/fb: switch to instanced constructor 



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

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_fb *fb;

	struct nvkm_fuse *fuse;

	struct nvkm_gpio *gpio;

	struct nvkm_gsp *gsp;
@@ -141,7 +140,6 @@ struct nvkm_device_chip { 
#include <core/layout.h>

#undef NVKM_LAYOUT_INST

#undef NVKM_LAYOUT_ONCE

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

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

	int (*gpio    )(struct nvkm_device *, int idx, struct nvkm_gpio **);

	int (*gsp     )(struct nvkm_device *, int idx, struct nvkm_gsp **);

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

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
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_FB      , struct nvkm_fb      ,       fb)

NVKM_LAYOUT_ONCE(NVKM_SUBDEV_BAR     , struct nvkm_bar     ,      bar)

NVKM_LAYOUT_ONCE(NVKM_SUBDEV_FAULT   , struct nvkm_fault   ,    fault)

NVKM_LAYOUT_ONCE(NVKM_SUBDEV_ACR     , struct nvkm_acr     ,      acr)

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

+34 −34
Original line number Diff line number Diff line
@@ -58,40 +58,40 @@ void nvkm_fb_tile_init(struct nvkm_fb *, int region, u32 addr, u32 size, 
void nvkm_fb_tile_fini(struct nvkm_fb *, int region, struct nvkm_fb_tile *);

void nvkm_fb_tile_prog(struct nvkm_fb *, int region, struct nvkm_fb_tile *);



int nv04_fb_new(struct nvkm_device *, int, struct nvkm_fb **);

int nv10_fb_new(struct nvkm_device *, int, struct nvkm_fb **);

int nv1a_fb_new(struct nvkm_device *, int, struct nvkm_fb **);

int nv20_fb_new(struct nvkm_device *, int, struct nvkm_fb **);

int nv25_fb_new(struct nvkm_device *, int, struct nvkm_fb **);

int nv30_fb_new(struct nvkm_device *, int, struct nvkm_fb **);

int nv35_fb_new(struct nvkm_device *, int, struct nvkm_fb **);

int nv36_fb_new(struct nvkm_device *, int, struct nvkm_fb **);

int nv40_fb_new(struct nvkm_device *, int, struct nvkm_fb **);

int nv41_fb_new(struct nvkm_device *, int, struct nvkm_fb **);

int nv44_fb_new(struct nvkm_device *, int, struct nvkm_fb **);

int nv46_fb_new(struct nvkm_device *, int, struct nvkm_fb **);

int nv47_fb_new(struct nvkm_device *, int, struct nvkm_fb **);

int nv49_fb_new(struct nvkm_device *, int, struct nvkm_fb **);

int nv4e_fb_new(struct nvkm_device *, int, struct nvkm_fb **);

int nv50_fb_new(struct nvkm_device *, int, struct nvkm_fb **);

int g84_fb_new(struct nvkm_device *, int, struct nvkm_fb **);

int gt215_fb_new(struct nvkm_device *, int, struct nvkm_fb **);

int mcp77_fb_new(struct nvkm_device *, int, struct nvkm_fb **);

int mcp89_fb_new(struct nvkm_device *, int, struct nvkm_fb **);

int gf100_fb_new(struct nvkm_device *, int, struct nvkm_fb **);

int gf108_fb_new(struct nvkm_device *, int, struct nvkm_fb **);

int gk104_fb_new(struct nvkm_device *, int, struct nvkm_fb **);

int gk110_fb_new(struct nvkm_device *, int, struct nvkm_fb **);

int gk20a_fb_new(struct nvkm_device *, int, struct nvkm_fb **);

int gm107_fb_new(struct nvkm_device *, int, struct nvkm_fb **);

int gm200_fb_new(struct nvkm_device *, int, struct nvkm_fb **);

int gm20b_fb_new(struct nvkm_device *, int, struct nvkm_fb **);

int gp100_fb_new(struct nvkm_device *, int, struct nvkm_fb **);

int gp102_fb_new(struct nvkm_device *, int, struct nvkm_fb **);

int gp10b_fb_new(struct nvkm_device *, int, struct nvkm_fb **);

int gv100_fb_new(struct nvkm_device *, int, struct nvkm_fb **);

int ga100_fb_new(struct nvkm_device *, int, struct nvkm_fb **);

int ga102_fb_new(struct nvkm_device *, int, struct nvkm_fb **);

int nv04_fb_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_fb **);

int nv10_fb_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_fb **);

int nv1a_fb_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_fb **);

int nv20_fb_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_fb **);

int nv25_fb_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_fb **);

int nv30_fb_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_fb **);

int nv35_fb_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_fb **);

int nv36_fb_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_fb **);

int nv40_fb_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_fb **);

int nv41_fb_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_fb **);

int nv44_fb_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_fb **);

int nv46_fb_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_fb **);

int nv47_fb_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_fb **);

int nv49_fb_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_fb **);

int nv4e_fb_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_fb **);

int nv50_fb_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_fb **);

int g84_fb_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_fb **);

int gt215_fb_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_fb **);

int mcp77_fb_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_fb **);

int mcp89_fb_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_fb **);

int gf100_fb_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_fb **);

int gf108_fb_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_fb **);

int gk104_fb_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_fb **);

int gk110_fb_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_fb **);

int gk20a_fb_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_fb **);

int gm107_fb_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_fb **);

int gm200_fb_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_fb **);

int gm20b_fb_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_fb **);

int gp100_fb_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_fb **);

int gp102_fb_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_fb **);

int gp10b_fb_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_fb **);

int gv100_fb_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_fb **);

int ga100_fb_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_fb **);

int ga102_fb_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_fb **);



#include <subdev/bios.h>

#include <subdev/bios/ramcfg.h>

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_FB      ] = "fb",

	[NVKM_SUBDEV_FUSE    ] = "fuse",

	[NVKM_SUBDEV_GPIO    ] = "gpio",

	[NVKM_SUBDEV_GSP     ] = "gsp",

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

+87 −88

File changed.

Preview size limit exceeded, changes collapsed.