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

drm/nouveau/volt: switch to instanced constructor 



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

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

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

	} acpi;



	struct nvkm_volt *volt;



	struct nvkm_engine *bsp;

	struct nvkm_engine *ce[9];

	struct nvkm_engine *cipher;
@@ -124,7 +122,6 @@ struct nvkm_device_chip { 
#include <core/layout.h>

#undef NVKM_LAYOUT_INST

#undef NVKM_LAYOUT_ONCE

	int (*volt    )(struct nvkm_device *, int idx, struct nvkm_volt **);



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

	int (*ce[9]   )(struct nvkm_device *, int idx, struct nvkm_engine **);

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

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

NVKM_LAYOUT_ONCE(NVKM_SUBDEV_PMU     , struct nvkm_pmu     ,      pmu)

NVKM_LAYOUT_ONCE(NVKM_SUBDEV_VOLT    , struct nvkm_volt    ,     volt)

NVKM_LAYOUT_ONCE(NVKM_SUBDEV_ICCSENSE, struct nvkm_iccsense, iccsense)

NVKM_LAYOUT_ONCE(NVKM_SUBDEV_THERM   , struct nvkm_therm   ,    therm)

NVKM_LAYOUT_ONCE(NVKM_SUBDEV_CLK     , struct nvkm_clk     ,      clk)

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

+6 −6
Original line number Diff line number Diff line
@@ -36,10 +36,10 @@ int nvkm_volt_get(struct nvkm_volt *); 
int nvkm_volt_set_id(struct nvkm_volt *, u8 id, u8 min_id, u8 temp,

		     int condition);



int nv40_volt_new(struct nvkm_device *, int, struct nvkm_volt **);

int gf100_volt_new(struct nvkm_device *, int, struct nvkm_volt **);

int gf117_volt_new(struct nvkm_device *, int, struct nvkm_volt **);

int gk104_volt_new(struct nvkm_device *, int, struct nvkm_volt **);

int gk20a_volt_new(struct nvkm_device *, int, struct nvkm_volt **);

int gm20b_volt_new(struct nvkm_device *, int, struct nvkm_volt **);

int nv40_volt_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_volt **);

int gf100_volt_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_volt **);

int gf117_volt_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_volt **);

int gk104_volt_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_volt **);

int gk20a_volt_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_volt **);

int gm20b_volt_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_volt **);

#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_VOLT    ] = "volt",

	[NVKM_ENGINE_BSP     ] = "bsp",

	[NVKM_ENGINE_CE0     ] = "ce0",

	[NVKM_ENGINE_CE1     ] = "ce1",

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

+53 −54
Original line number Diff line number Diff line
@@ -485,7 +485,7 @@ nv40_chipset = { 
	.pci      = { 0x00000001, nv40_pci_new },

	.therm    = { 0x00000001, nv40_therm_new },

	.timer    = { 0x00000001, nv40_timer_new },

	.volt = nv40_volt_new,

	.volt     = { 0x00000001, nv40_volt_new },

	.disp = nv04_disp_new,

	.dma = nv04_dma_new,

	.fifo = nv40_fifo_new,
@@ -511,7 +511,7 @@ nv41_chipset = { 
	.pci      = { 0x00000001, nv40_pci_new },

	.therm    = { 0x00000001, nv40_therm_new },

	.timer    = { 0x00000001, nv41_timer_new },

	.volt = nv40_volt_new,

	.volt     = { 0x00000001, nv40_volt_new },

	.disp = nv04_disp_new,

	.dma = nv04_dma_new,

	.fifo = nv40_fifo_new,
@@ -537,7 +537,7 @@ nv42_chipset = { 
	.pci      = { 0x00000001, nv40_pci_new },

	.therm    = { 0x00000001, nv40_therm_new },

	.timer    = { 0x00000001, nv41_timer_new },

	.volt = nv40_volt_new,

	.volt     = { 0x00000001, nv40_volt_new },

	.disp = nv04_disp_new,

	.dma = nv04_dma_new,

	.fifo = nv40_fifo_new,
@@ -563,7 +563,7 @@ nv43_chipset = { 
	.pci      = { 0x00000001, nv40_pci_new },

	.therm    = { 0x00000001, nv40_therm_new },

	.timer    = { 0x00000001, nv41_timer_new },

	.volt = nv40_volt_new,

	.volt     = { 0x00000001, nv40_volt_new },

	.disp = nv04_disp_new,

	.dma = nv04_dma_new,

	.fifo = nv40_fifo_new,
@@ -589,7 +589,7 @@ nv44_chipset = { 
	.pci      = { 0x00000001, nv40_pci_new },

	.therm    = { 0x00000001, nv40_therm_new },

	.timer    = { 0x00000001, nv41_timer_new },

	.volt = nv40_volt_new,

	.volt     = { 0x00000001, nv40_volt_new },

	.disp = nv04_disp_new,

	.dma = nv04_dma_new,

	.fifo = nv40_fifo_new,
@@ -615,7 +615,7 @@ nv45_chipset = { 
	.pci      = { 0x00000001, nv40_pci_new },

	.therm    = { 0x00000001, nv40_therm_new },

	.timer    = { 0x00000001, nv41_timer_new },

	.volt = nv40_volt_new,

	.volt     = { 0x00000001, nv40_volt_new },

	.disp = nv04_disp_new,

	.dma = nv04_dma_new,

	.fifo = nv40_fifo_new,
@@ -641,7 +641,7 @@ nv46_chipset = { 
	.pci      = { 0x00000001, nv46_pci_new },

	.therm    = { 0x00000001, nv40_therm_new },

	.timer    = { 0x00000001, nv41_timer_new },

	.volt = nv40_volt_new,

	.volt     = { 0x00000001, nv40_volt_new },

	.disp = nv04_disp_new,

	.dma = nv04_dma_new,

	.fifo = nv40_fifo_new,
@@ -667,7 +667,7 @@ nv47_chipset = { 
	.pci      = { 0x00000001, nv40_pci_new },

	.therm    = { 0x00000001, nv40_therm_new },

	.timer    = { 0x00000001, nv41_timer_new },

	.volt = nv40_volt_new,

	.volt     = { 0x00000001, nv40_volt_new },

	.disp = nv04_disp_new,

	.dma = nv04_dma_new,

	.fifo = nv40_fifo_new,
@@ -693,7 +693,7 @@ nv49_chipset = { 
	.pci      = { 0x00000001, nv40_pci_new },

	.therm    = { 0x00000001, nv40_therm_new },

	.timer    = { 0x00000001, nv41_timer_new },

	.volt = nv40_volt_new,

	.volt     = { 0x00000001, nv40_volt_new },

	.disp = nv04_disp_new,

	.dma = nv04_dma_new,

	.fifo = nv40_fifo_new,
@@ -719,7 +719,7 @@ nv4a_chipset = { 
	.pci      = { 0x00000001, nv40_pci_new },

	.therm    = { 0x00000001, nv40_therm_new },

	.timer    = { 0x00000001, nv41_timer_new },

	.volt = nv40_volt_new,

	.volt     = { 0x00000001, nv40_volt_new },

	.disp = nv04_disp_new,

	.dma = nv04_dma_new,

	.fifo = nv40_fifo_new,
@@ -745,7 +745,7 @@ nv4b_chipset = { 
	.pci      = { 0x00000001, nv40_pci_new },

	.therm    = { 0x00000001, nv40_therm_new },

	.timer    = { 0x00000001, nv41_timer_new },

	.volt = nv40_volt_new,

	.volt     = { 0x00000001, nv40_volt_new },

	.disp = nv04_disp_new,

	.dma = nv04_dma_new,

	.fifo = nv40_fifo_new,
@@ -771,7 +771,7 @@ nv4c_chipset = { 
	.pci      = { 0x00000001, nv4c_pci_new },

	.therm    = { 0x00000001, nv40_therm_new },

	.timer    = { 0x00000001, nv41_timer_new },

	.volt = nv40_volt_new,

	.volt     = { 0x00000001, nv40_volt_new },

	.disp = nv04_disp_new,

	.dma = nv04_dma_new,

	.fifo = nv40_fifo_new,
@@ -797,7 +797,7 @@ nv4e_chipset = { 
	.pci      = { 0x00000001, nv4c_pci_new },

	.therm    = { 0x00000001, nv40_therm_new },

	.timer    = { 0x00000001, nv41_timer_new },

	.volt = nv40_volt_new,

	.volt     = { 0x00000001, nv40_volt_new },

	.disp = nv04_disp_new,

	.dma = nv04_dma_new,

	.fifo = nv40_fifo_new,
@@ -826,7 +826,7 @@ nv50_chipset = { 
	.pci      = { 0x00000001, nv46_pci_new },

	.therm    = { 0x00000001, nv50_therm_new },

	.timer    = { 0x00000001, nv41_timer_new },

	.volt = nv40_volt_new,

	.volt     = { 0x00000001, nv40_volt_new },

	.disp = nv50_disp_new,

	.dma = nv50_dma_new,

	.fifo = nv50_fifo_new,
@@ -852,7 +852,7 @@ nv63_chipset = { 
	.pci      = { 0x00000001, nv4c_pci_new },

	.therm    = { 0x00000001, nv40_therm_new },

	.timer    = { 0x00000001, nv41_timer_new },

	.volt = nv40_volt_new,

	.volt     = { 0x00000001, nv40_volt_new },

	.disp = nv04_disp_new,

	.dma = nv04_dma_new,

	.fifo = nv40_fifo_new,
@@ -878,7 +878,7 @@ nv67_chipset = { 
	.pci      = { 0x00000001, nv4c_pci_new },

	.therm    = { 0x00000001, nv40_therm_new },

	.timer    = { 0x00000001, nv41_timer_new },

	.volt = nv40_volt_new,

	.volt     = { 0x00000001, nv40_volt_new },

	.disp = nv04_disp_new,

	.dma = nv04_dma_new,

	.fifo = nv40_fifo_new,
@@ -904,7 +904,7 @@ nv68_chipset = { 
	.pci      = { 0x00000001, nv4c_pci_new },

	.therm    = { 0x00000001, nv40_therm_new },

	.timer    = { 0x00000001, nv41_timer_new },

	.volt = nv40_volt_new,

	.volt     = { 0x00000001, nv40_volt_new },

	.disp = nv04_disp_new,

	.dma = nv04_dma_new,

	.fifo = nv40_fifo_new,
@@ -933,7 +933,7 @@ nv84_chipset = { 
	.pci      = { 0x00000001, g84_pci_new },

	.therm    = { 0x00000001, g84_therm_new },

	.timer    = { 0x00000001, nv41_timer_new },

	.volt = nv40_volt_new,

	.volt     = { 0x00000001, nv40_volt_new },

	.bsp = g84_bsp_new,

	.cipher = g84_cipher_new,

	.disp = g84_disp_new,
@@ -965,7 +965,7 @@ nv86_chipset = { 
	.pci      = { 0x00000001, g84_pci_new },

	.therm    = { 0x00000001, g84_therm_new },

	.timer    = { 0x00000001, nv41_timer_new },

	.volt = nv40_volt_new,

	.volt     = { 0x00000001, nv40_volt_new },

	.bsp = g84_bsp_new,

	.cipher = g84_cipher_new,

	.disp = g84_disp_new,
@@ -997,7 +997,7 @@ nv92_chipset = { 
	.pci      = { 0x00000001, g92_pci_new },

	.therm    = { 0x00000001, g84_therm_new },

	.timer    = { 0x00000001, nv41_timer_new },

	.volt = nv40_volt_new,

	.volt     = { 0x00000001, nv40_volt_new },

	.bsp = g84_bsp_new,

	.cipher = g84_cipher_new,

	.disp = g84_disp_new,
@@ -1029,7 +1029,7 @@ nv94_chipset = { 
	.pci      = { 0x00000001, g94_pci_new },

	.therm    = { 0x00000001, g84_therm_new },

	.timer    = { 0x00000001, nv41_timer_new },

	.volt = nv40_volt_new,

	.volt     = { 0x00000001, nv40_volt_new },

	.bsp = g84_bsp_new,

	.cipher = g84_cipher_new,

	.disp = g94_disp_new,
@@ -1061,7 +1061,7 @@ nv96_chipset = { 
	.pci      = { 0x00000001, g94_pci_new },

	.therm    = { 0x00000001, g84_therm_new },

	.timer    = { 0x00000001, nv41_timer_new },

	.volt = nv40_volt_new,

	.volt     = { 0x00000001, nv40_volt_new },

	.bsp = g84_bsp_new,

	.cipher = g84_cipher_new,

	.disp = g94_disp_new,
@@ -1093,7 +1093,7 @@ nv98_chipset = { 
	.pci      = { 0x00000001, g94_pci_new },

	.therm    = { 0x00000001, g84_therm_new },

	.timer    = { 0x00000001, nv41_timer_new },

	.volt = nv40_volt_new,

	.volt     = { 0x00000001, nv40_volt_new },

	.disp = g94_disp_new,

	.dma = nv50_dma_new,

	.fifo = g84_fifo_new,
@@ -1125,7 +1125,7 @@ nva0_chipset = { 
	.pci      = { 0x00000001, g94_pci_new },

	.therm    = { 0x00000001, g84_therm_new },

	.timer    = { 0x00000001, nv41_timer_new },

	.volt = nv40_volt_new,

	.volt     = { 0x00000001, nv40_volt_new },

	.bsp = g84_bsp_new,

	.cipher = g84_cipher_new,

	.disp = gt200_disp_new,
@@ -1158,7 +1158,7 @@ nva3_chipset = { 
	.pmu      = { 0x00000001, gt215_pmu_new },

	.therm    = { 0x00000001, gt215_therm_new },

	.timer    = { 0x00000001, nv41_timer_new },

	.volt = nv40_volt_new,

	.volt     = { 0x00000001, nv40_volt_new },

	.ce[0] = gt215_ce_new,

	.disp = gt215_disp_new,

	.dma = nv50_dma_new,
@@ -1192,7 +1192,7 @@ nva5_chipset = { 
	.pmu      = { 0x00000001, gt215_pmu_new },

	.therm    = { 0x00000001, gt215_therm_new },

	.timer    = { 0x00000001, nv41_timer_new },

	.volt = nv40_volt_new,

	.volt     = { 0x00000001, nv40_volt_new },

	.ce[0] = gt215_ce_new,

	.disp = gt215_disp_new,

	.dma = nv50_dma_new,
@@ -1225,7 +1225,7 @@ nva8_chipset = { 
	.pmu      = { 0x00000001, gt215_pmu_new },

	.therm    = { 0x00000001, gt215_therm_new },

	.timer    = { 0x00000001, nv41_timer_new },

	.volt = nv40_volt_new,

	.volt     = { 0x00000001, nv40_volt_new },

	.ce[0] = gt215_ce_new,

	.disp = gt215_disp_new,

	.dma = nv50_dma_new,
@@ -1257,7 +1257,7 @@ nvaa_chipset = { 
	.pci      = { 0x00000001, g94_pci_new },

	.therm    = { 0x00000001, g84_therm_new },

	.timer    = { 0x00000001, nv41_timer_new },

	.volt = nv40_volt_new,

	.volt     = { 0x00000001, nv40_volt_new },

	.disp = mcp77_disp_new,

	.dma = nv50_dma_new,

	.fifo = g84_fifo_new,
@@ -1289,7 +1289,7 @@ nvac_chipset = { 
	.pci      = { 0x00000001, g94_pci_new },

	.therm    = { 0x00000001, g84_therm_new },

	.timer    = { 0x00000001, nv41_timer_new },

	.volt = nv40_volt_new,

	.volt     = { 0x00000001, nv40_volt_new },

	.disp = mcp77_disp_new,

	.dma = nv50_dma_new,

	.fifo = g84_fifo_new,
@@ -1322,7 +1322,7 @@ nvaf_chipset = { 
	.pmu      = { 0x00000001, gt215_pmu_new },

	.therm    = { 0x00000001, gt215_therm_new },

	.timer    = { 0x00000001, nv41_timer_new },

	.volt = nv40_volt_new,

	.volt     = { 0x00000001, nv40_volt_new },

	.ce[0] = gt215_ce_new,

	.disp = mcp89_disp_new,

	.dma = nv50_dma_new,
@@ -1358,7 +1358,7 @@ nvc0_chipset = { 
	.pmu      = { 0x00000001, gf100_pmu_new },

	.therm    = { 0x00000001, gt215_therm_new },

	.timer    = { 0x00000001, nv41_timer_new },

	.volt = gf100_volt_new,

	.volt     = { 0x00000001, gf100_volt_new },

	.ce[0] = gf100_ce_new,

	.ce[1] = gf100_ce_new,

	.disp = gt215_disp_new,
@@ -1395,7 +1395,7 @@ nvc1_chipset = { 
	.pmu      = { 0x00000001, gf100_pmu_new },

	.therm    = { 0x00000001, gt215_therm_new },

	.timer    = { 0x00000001, nv41_timer_new },

	.volt = gf100_volt_new,

	.volt     = { 0x00000001, gf100_volt_new },

	.ce[0] = gf100_ce_new,

	.disp = gt215_disp_new,

	.dma = gf100_dma_new,
@@ -1431,7 +1431,7 @@ nvc3_chipset = { 
	.pmu      = { 0x00000001, gf100_pmu_new },

	.therm    = { 0x00000001, gt215_therm_new },

	.timer    = { 0x00000001, nv41_timer_new },

	.volt = gf100_volt_new,

	.volt     = { 0x00000001, gf100_volt_new },

	.ce[0] = gf100_ce_new,

	.disp = gt215_disp_new,

	.dma = gf100_dma_new,
@@ -1467,7 +1467,7 @@ nvc4_chipset = { 
	.pmu      = { 0x00000001, gf100_pmu_new },

	.therm    = { 0x00000001, gt215_therm_new },

	.timer    = { 0x00000001, nv41_timer_new },

	.volt = gf100_volt_new,

	.volt     = { 0x00000001, gf100_volt_new },

	.ce[0] = gf100_ce_new,

	.ce[1] = gf100_ce_new,

	.disp = gt215_disp_new,
@@ -1504,7 +1504,7 @@ nvc8_chipset = { 
	.pmu      = { 0x00000001, gf100_pmu_new },

	.therm    = { 0x00000001, gt215_therm_new },

	.timer    = { 0x00000001, nv41_timer_new },

	.volt = gf100_volt_new,

	.volt     = { 0x00000001, gf100_volt_new },

	.ce[0] = gf100_ce_new,

	.ce[1] = gf100_ce_new,

	.disp = gt215_disp_new,
@@ -1541,7 +1541,7 @@ nvce_chipset = { 
	.pmu      = { 0x00000001, gf100_pmu_new },

	.therm    = { 0x00000001, gt215_therm_new },

	.timer    = { 0x00000001, nv41_timer_new },

	.volt = gf100_volt_new,

	.volt     = { 0x00000001, gf100_volt_new },

	.ce[0] = gf100_ce_new,

	.ce[1] = gf100_ce_new,

	.disp = gt215_disp_new,
@@ -1578,7 +1578,7 @@ nvcf_chipset = { 
	.pmu      = { 0x00000001, gf100_pmu_new },

	.therm    = { 0x00000001, gt215_therm_new },

	.timer    = { 0x00000001, nv41_timer_new },

	.volt = gf100_volt_new,

	.volt     = { 0x00000001, gf100_volt_new },

	.ce[0] = gf100_ce_new,

	.disp = gt215_disp_new,

	.dma = gf100_dma_new,
@@ -1613,7 +1613,7 @@ nvd7_chipset = { 
	.pci      = { 0x00000001, gf106_pci_new },

	.therm    = { 0x00000001, gf119_therm_new },

	.timer    = { 0x00000001, nv41_timer_new },

	.volt = gf117_volt_new,

	.volt     = { 0x00000001, gf117_volt_new },

	.ce[0] = gf100_ce_new,

	.disp = gf119_disp_new,

	.dma = gf119_dma_new,
@@ -1649,7 +1649,7 @@ nvd9_chipset = { 
	.pmu      = { 0x00000001, gf119_pmu_new },

	.therm    = { 0x00000001, gf119_therm_new },

	.timer    = { 0x00000001, nv41_timer_new },

	.volt = gf100_volt_new,

	.volt     = { 0x00000001, gf100_volt_new },

	.ce[0] = gf100_ce_new,

	.disp = gf119_disp_new,

	.dma = gf119_dma_new,
@@ -1686,7 +1686,7 @@ nve4_chipset = { 
	.therm    = { 0x00000001, gk104_therm_new },

	.timer    = { 0x00000001, nv41_timer_new },

	.top      = { 0x00000001, gk104_top_new },

	.volt = gk104_volt_new,

	.volt     = { 0x00000001, gk104_volt_new },

	.ce[0] = gk104_ce_new,

	.ce[1] = gk104_ce_new,

	.ce[2] = gk104_ce_new,
@@ -1725,7 +1725,7 @@ nve6_chipset = { 
	.therm    = { 0x00000001, gk104_therm_new },

	.timer    = { 0x00000001, nv41_timer_new },

	.top      = { 0x00000001, gk104_top_new },

	.volt = gk104_volt_new,

	.volt     = { 0x00000001, gk104_volt_new },

	.ce[0] = gk104_ce_new,

	.ce[1] = gk104_ce_new,

	.ce[2] = gk104_ce_new,
@@ -1764,7 +1764,7 @@ nve7_chipset = { 
	.therm    = { 0x00000001, gk104_therm_new },

	.timer    = { 0x00000001, nv41_timer_new },

	.top      = { 0x00000001, gk104_top_new },

	.volt = gk104_volt_new,

	.volt     = { 0x00000001, gk104_volt_new },

	.ce[0] = gk104_ce_new,

	.ce[1] = gk104_ce_new,

	.ce[2] = gk104_ce_new,
@@ -1795,7 +1795,7 @@ nvea_chipset = { 
	.pmu      = { 0x00000001, gk20a_pmu_new },

	.timer    = { 0x00000001, gk20a_timer_new },

	.top      = { 0x00000001, gk104_top_new },

	.volt = gk20a_volt_new,

	.volt     = { 0x00000001, gk20a_volt_new },

	.ce[2] = gk104_ce_new,

	.dma = gf119_dma_new,

	.fifo = gk20a_fifo_new,
@@ -1828,7 +1828,7 @@ nvf0_chipset = { 
	.therm    = { 0x00000001, gk104_therm_new },

	.timer    = { 0x00000001, nv41_timer_new },

	.top      = { 0x00000001, gk104_top_new },

	.volt = gk104_volt_new,

	.volt     = { 0x00000001, gk104_volt_new },

	.ce[0] = gk104_ce_new,

	.ce[1] = gk104_ce_new,

	.ce[2] = gk104_ce_new,
@@ -1866,7 +1866,7 @@ nvf1_chipset = { 
	.therm    = { 0x00000001, gk104_therm_new },

	.timer    = { 0x00000001, nv41_timer_new },

	.top      = { 0x00000001, gk104_top_new },

	.volt = gk104_volt_new,

	.volt     = { 0x00000001, gk104_volt_new },

	.ce[0] = gk104_ce_new,

	.ce[1] = gk104_ce_new,

	.ce[2] = gk104_ce_new,
@@ -1904,7 +1904,7 @@ nv106_chipset = { 
	.therm    = { 0x00000001, gk104_therm_new },

	.timer    = { 0x00000001, nv41_timer_new },

	.top      = { 0x00000001, gk104_top_new },

	.volt = gk104_volt_new,

	.volt     = { 0x00000001, gk104_volt_new },

	.ce[0] = gk104_ce_new,

	.ce[1] = gk104_ce_new,

	.ce[2] = gk104_ce_new,
@@ -1942,7 +1942,7 @@ nv108_chipset = { 
	.therm    = { 0x00000001, gk104_therm_new },

	.timer    = { 0x00000001, nv41_timer_new },

	.top      = { 0x00000001, gk104_top_new },

	.volt = gk104_volt_new,

	.volt     = { 0x00000001, gk104_volt_new },

	.ce[0] = gk104_ce_new,

	.ce[1] = gk104_ce_new,

	.ce[2] = gk104_ce_new,
@@ -1980,7 +1980,7 @@ nv117_chipset = { 
	.therm    = { 0x00000001, gm107_therm_new },

	.timer    = { 0x00000001, gk20a_timer_new },

	.top      = { 0x00000001, gk104_top_new },

	.volt = gk104_volt_new,

	.volt     = { 0x00000001, gk104_volt_new },

	.ce[0] = gm107_ce_new,

	.ce[2] = gm107_ce_new,

	.disp = gm107_disp_new,
@@ -2016,7 +2016,7 @@ nv118_chipset = { 
	.therm    = { 0x00000001, gm107_therm_new },

	.timer    = { 0x00000001, gk20a_timer_new },

	.top      = { 0x00000001, gk104_top_new },

	.volt = gk104_volt_new,

	.volt     = { 0x00000001, gk104_volt_new },

	.ce[0] = gm107_ce_new,

	.ce[2] = gm107_ce_new,

	.disp = gm107_disp_new,
@@ -2050,7 +2050,7 @@ nv120_chipset = { 
	.therm    = { 0x00000001, gm200_therm_new },

	.timer    = { 0x00000001, gk20a_timer_new },

	.top      = { 0x00000001, gk104_top_new },

	.volt = gk104_volt_new,

	.volt     = { 0x00000001, gk104_volt_new },

	.ce[0] = gm200_ce_new,

	.ce[1] = gm200_ce_new,

	.ce[2] = gm200_ce_new,
@@ -2088,7 +2088,7 @@ nv124_chipset = { 
	.therm    = { 0x00000001, gm200_therm_new },

	.timer    = { 0x00000001, gk20a_timer_new },

	.top      = { 0x00000001, gk104_top_new },

	.volt = gk104_volt_new,

	.volt     = { 0x00000001, gk104_volt_new },

	.ce[0] = gm200_ce_new,

	.ce[1] = gm200_ce_new,

	.ce[2] = gm200_ce_new,
@@ -2126,7 +2126,7 @@ nv126_chipset = { 
	.therm    = { 0x00000001, gm200_therm_new },

	.timer    = { 0x00000001, gk20a_timer_new },

	.top      = { 0x00000001, gk104_top_new },

	.volt = gk104_volt_new,

	.volt     = { 0x00000001, gk104_volt_new },

	.ce[0] = gm200_ce_new,

	.ce[1] = gm200_ce_new,

	.ce[2] = gm200_ce_new,
@@ -2156,8 +2156,8 @@ nv12b_chipset = { 
	.pmu      = { 0x00000001, gm20b_pmu_new },

	.timer    = { 0x00000001, gk20a_timer_new },

	.top      = { 0x00000001, gk104_top_new },

	.volt     = { 0x00000001, gm20b_volt_new },

	.ce[2] = gm200_ce_new,

	.volt = gm20b_volt_new,

	.dma = gf119_dma_new,

	.fifo = gm20b_fifo_new,

	.gr = gm20b_gr_new,
@@ -3248,7 +3248,6 @@ nvkm_device_ctor(const struct nvkm_device_func *func, 
#include <core/layout.h>

#undef NVKM_LAYOUT_INST

#undef NVKM_LAYOUT_ONCE

		_(NVKM_SUBDEV_VOLT    ,     volt);

		_(NVKM_ENGINE_BSP     ,      bsp);

		_(NVKM_ENGINE_CE0     ,    ce[0]);

		_(NVKM_ENGINE_CE1     ,    ce[1]);