Commit 6dd123ba authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/mmu: switch to instanced constructor 



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

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_mmu *mmu;

	struct nvkm_subdev *mxm;

	struct nvkm_pci *pci;

	struct nvkm_pmu *pmu;
@@ -131,7 +130,6 @@ struct nvkm_device_chip { 
#include <core/layout.h>

#undef NVKM_LAYOUT_INST

#undef NVKM_LAYOUT_ONCE

	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 **);

	int (*pmu     )(struct nvkm_device *, int idx, struct nvkm_pmu **);

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

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 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)

NVKM_LAYOUT_ONCE(NVKM_SUBDEV_LTC     , struct nvkm_ltc     ,      ltc)

NVKM_LAYOUT_ONCE(NVKM_SUBDEV_MMU     , struct nvkm_mmu     ,      mmu)

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/mmu.h

+15 −15
Original line number Diff line number Diff line
@@ -122,19 +122,19 @@ struct nvkm_mmu { 
	struct nvkm_device_oclass user;

};



int nv04_mmu_new(struct nvkm_device *, int, struct nvkm_mmu **);

int nv41_mmu_new(struct nvkm_device *, int, struct nvkm_mmu **);

int nv44_mmu_new(struct nvkm_device *, int, struct nvkm_mmu **);

int nv50_mmu_new(struct nvkm_device *, int, struct nvkm_mmu **);

int g84_mmu_new(struct nvkm_device *, int, struct nvkm_mmu **);

int mcp77_mmu_new(struct nvkm_device *, int, struct nvkm_mmu **);

int gf100_mmu_new(struct nvkm_device *, int, struct nvkm_mmu **);

int gk104_mmu_new(struct nvkm_device *, int, struct nvkm_mmu **);

int gk20a_mmu_new(struct nvkm_device *, int, struct nvkm_mmu **);

int gm200_mmu_new(struct nvkm_device *, int, struct nvkm_mmu **);

int gm20b_mmu_new(struct nvkm_device *, int, struct nvkm_mmu **);

int gp100_mmu_new(struct nvkm_device *, int, struct nvkm_mmu **);

int gp10b_mmu_new(struct nvkm_device *, int, struct nvkm_mmu **);

int gv100_mmu_new(struct nvkm_device *, int, struct nvkm_mmu **);

int tu102_mmu_new(struct nvkm_device *, int, struct nvkm_mmu **);

int nv04_mmu_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_mmu **);

int nv41_mmu_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_mmu **);

int nv44_mmu_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_mmu **);

int nv50_mmu_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_mmu **);

int g84_mmu_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_mmu **);

int mcp77_mmu_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_mmu **);

int gf100_mmu_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_mmu **);

int gk104_mmu_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_mmu **);

int gk20a_mmu_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_mmu **);

int gm200_mmu_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_mmu **);

int gm20b_mmu_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_mmu **);

int gp100_mmu_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_mmu **);

int gp10b_mmu_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_mmu **);

int gv100_mmu_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_mmu **);

int tu102_mmu_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_mmu **);

#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_MMU     ] = "mmu",

	[NVKM_SUBDEV_MXM     ] = "mxm",

	[NVKM_SUBDEV_PCI     ] = "pci",

	[NVKM_SUBDEV_PMU     ] = "pmu",

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

+87 −88

File changed.

Preview size limit exceeded, changes collapsed.