Commit 1fc2fddf authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/mc: switch to instanced constructor 



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

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_mc *mc;

	struct nvkm_mmu *mmu;

	struct nvkm_subdev *mxm;

	struct nvkm_pci *pci;
@@ -132,7 +131,6 @@ struct nvkm_device_chip { 
#include <core/layout.h>

#undef NVKM_LAYOUT_INST

#undef NVKM_LAYOUT_ONCE

	int (*mc      )(struct nvkm_device *, int idx, struct nvkm_mc **);

	int (*mmu     )(struct nvkm_device *, int idx, struct nvkm_mmu **);

	int (*mxm     )(struct nvkm_device *, int idx, struct nvkm_subdev **);

	int (*pci     )(struct nvkm_device *, int idx, struct nvkm_pci **);

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

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ NVKM_LAYOUT_ONCE(NVKM_SUBDEV_IBUS , struct nvkm_subdev , ibus) 
NVKM_LAYOUT_ONCE(NVKM_SUBDEV_GPIO    , struct nvkm_gpio    ,     gpio)

NVKM_LAYOUT_ONCE(NVKM_SUBDEV_I2C     , struct nvkm_i2c     ,      i2c)

NVKM_LAYOUT_ONCE(NVKM_SUBDEV_FUSE    , struct nvkm_fuse    ,     fuse)

NVKM_LAYOUT_ONCE(NVKM_SUBDEV_MC      , struct nvkm_mc      ,       mc)

NVKM_LAYOUT_ONCE(NVKM_SUBDEV_BUS     , struct nvkm_bus     ,      bus)

NVKM_LAYOUT_ONCE(NVKM_SUBDEV_INSTMEM , struct nvkm_instmem ,     imem)

NVKM_LAYOUT_ONCE(NVKM_SUBDEV_FB      , struct nvkm_fb      ,       fb)

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

+15 −15
Original line number Diff line number Diff line
@@ -18,19 +18,19 @@ void nvkm_mc_intr_rearm(struct nvkm_device *); 
void nvkm_mc_intr_mask(struct nvkm_device *, enum nvkm_devidx, bool enable);

void nvkm_mc_unk260(struct nvkm_device *, u32 data);



int nv04_mc_new(struct nvkm_device *, int, struct nvkm_mc **);

int nv11_mc_new(struct nvkm_device *, int, struct nvkm_mc **);

int nv17_mc_new(struct nvkm_device *, int, struct nvkm_mc **);

int nv44_mc_new(struct nvkm_device *, int, struct nvkm_mc **);

int nv50_mc_new(struct nvkm_device *, int, struct nvkm_mc **);

int g84_mc_new(struct nvkm_device *, int, struct nvkm_mc **);

int g98_mc_new(struct nvkm_device *, int, struct nvkm_mc **);

int gt215_mc_new(struct nvkm_device *, int, struct nvkm_mc **);

int gf100_mc_new(struct nvkm_device *, int, struct nvkm_mc **);

int gk104_mc_new(struct nvkm_device *, int, struct nvkm_mc **);

int gk20a_mc_new(struct nvkm_device *, int, struct nvkm_mc **);

int gp100_mc_new(struct nvkm_device *, int, struct nvkm_mc **);

int gp10b_mc_new(struct nvkm_device *, int, struct nvkm_mc **);

int tu102_mc_new(struct nvkm_device *, int, struct nvkm_mc **);

int ga100_mc_new(struct nvkm_device *, int, struct nvkm_mc **);

int nv04_mc_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_mc **);

int nv11_mc_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_mc **);

int nv17_mc_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_mc **);

int nv44_mc_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_mc **);

int nv50_mc_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_mc **);

int g84_mc_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_mc **);

int g98_mc_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_mc **);

int gt215_mc_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_mc **);

int gf100_mc_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_mc **);

int gk104_mc_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_mc **);

int gk20a_mc_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_mc **);

int gp100_mc_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_mc **);

int gp10b_mc_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_mc **);

int tu102_mc_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_mc **);

int ga100_mc_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_mc **);

#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_MC      ] = "mc",

	[NVKM_SUBDEV_MMU     ] = "mmu",

	[NVKM_SUBDEV_MXM     ] = "mxm",

	[NVKM_SUBDEV_PCI     ] = "pci",

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

+87 −88

File changed.

Preview size limit exceeded, changes collapsed.