drm/nouveau/fb: switch to instanced constructor

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>

1 files changed, 87 insertions, 88 deletions

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
index 123a01f26830..a4ef6cac85fa 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
@@ -81,7 +81,7 @@ nv4_chipset = {
 	.bus      = { 0x00000001, nv04_bus_new },
 	.clk      = { 0x00000001, nv04_clk_new },
 	.devinit  = { 0x00000001, nv04_devinit_new },
-	.fb = nv04_fb_new,
+	.fb       = { 0x00000001, nv04_fb_new },
 	.i2c = nv04_i2c_new,
 	.imem = nv04_instmem_new,
 	.mc = nv04_mc_new,
@@ -102,7 +102,7 @@ nv5_chipset = {
 	.bus      = { 0x00000001, nv04_bus_new },
 	.clk      = { 0x00000001, nv04_clk_new },
 	.devinit  = { 0x00000001, nv05_devinit_new },
-	.fb = nv04_fb_new,
+	.fb       = { 0x00000001, nv04_fb_new },
 	.i2c = nv04_i2c_new,
 	.imem = nv04_instmem_new,
 	.mc = nv04_mc_new,
@@ -123,7 +123,7 @@ nv10_chipset = {
 	.bus      = { 0x00000001, nv04_bus_new },
 	.clk      = { 0x00000001, nv04_clk_new },
 	.devinit  = { 0x00000001, nv10_devinit_new },
-	.fb = nv10_fb_new,
+	.fb       = { 0x00000001, nv10_fb_new },
 	.gpio = nv10_gpio_new,
 	.i2c = nv04_i2c_new,
 	.imem = nv04_instmem_new,
@@ -143,7 +143,7 @@ nv11_chipset = {
 	.bus      = { 0x00000001, nv04_bus_new },
 	.clk      = { 0x00000001, nv04_clk_new },
 	.devinit  = { 0x00000001, nv10_devinit_new },
-	.fb = nv10_fb_new,
+	.fb       = { 0x00000001, nv10_fb_new },
 	.gpio = nv10_gpio_new,
 	.i2c = nv04_i2c_new,
 	.imem = nv04_instmem_new,
@@ -165,7 +165,7 @@ nv15_chipset = {
 	.bus      = { 0x00000001, nv04_bus_new },
 	.clk      = { 0x00000001, nv04_clk_new },
 	.devinit  = { 0x00000001, nv10_devinit_new },
-	.fb = nv10_fb_new,
+	.fb       = { 0x00000001, nv10_fb_new },
 	.gpio = nv10_gpio_new,
 	.i2c = nv04_i2c_new,
 	.imem = nv04_instmem_new,
@@ -187,7 +187,7 @@ nv17_chipset = {
 	.bus      = { 0x00000001, nv04_bus_new },
 	.clk      = { 0x00000001, nv04_clk_new },
 	.devinit  = { 0x00000001, nv10_devinit_new },
-	.fb = nv10_fb_new,
+	.fb       = { 0x00000001, nv10_fb_new },
 	.gpio = nv10_gpio_new,
 	.i2c = nv04_i2c_new,
 	.imem = nv04_instmem_new,
@@ -209,7 +209,7 @@ nv18_chipset = {
 	.bus      = { 0x00000001, nv04_bus_new },
 	.clk      = { 0x00000001, nv04_clk_new },
 	.devinit  = { 0x00000001, nv10_devinit_new },
-	.fb = nv10_fb_new,
+	.fb       = { 0x00000001, nv10_fb_new },
 	.gpio = nv10_gpio_new,
 	.i2c = nv04_i2c_new,
 	.imem = nv04_instmem_new,
@@ -231,7 +231,7 @@ nv1a_chipset = {
 	.bus      = { 0x00000001, nv04_bus_new },
 	.clk      = { 0x00000001, nv04_clk_new },
 	.devinit  = { 0x00000001, nv1a_devinit_new },
-	.fb = nv1a_fb_new,
+	.fb       = { 0x00000001, nv1a_fb_new },
 	.gpio = nv10_gpio_new,
 	.i2c = nv04_i2c_new,
 	.imem = nv04_instmem_new,
@@ -253,7 +253,7 @@ nv1f_chipset = {
 	.bus      = { 0x00000001, nv04_bus_new },
 	.clk      = { 0x00000001, nv04_clk_new },
 	.devinit  = { 0x00000001, nv1a_devinit_new },
-	.fb = nv1a_fb_new,
+	.fb       = { 0x00000001, nv1a_fb_new },
 	.gpio = nv10_gpio_new,
 	.i2c = nv04_i2c_new,
 	.imem = nv04_instmem_new,
@@ -275,7 +275,7 @@ nv20_chipset = {
 	.bus      = { 0x00000001, nv04_bus_new },
 	.clk      = { 0x00000001, nv04_clk_new },
 	.devinit  = { 0x00000001, nv20_devinit_new },
-	.fb = nv20_fb_new,
+	.fb       = { 0x00000001, nv20_fb_new },
 	.gpio = nv10_gpio_new,
 	.i2c = nv04_i2c_new,
 	.imem = nv04_instmem_new,
@@ -297,7 +297,7 @@ nv25_chipset = {
 	.bus      = { 0x00000001, nv04_bus_new },
 	.clk      = { 0x00000001, nv04_clk_new },
 	.devinit  = { 0x00000001, nv20_devinit_new },
-	.fb = nv25_fb_new,
+	.fb       = { 0x00000001, nv25_fb_new },
 	.gpio = nv10_gpio_new,
 	.i2c = nv04_i2c_new,
 	.imem = nv04_instmem_new,
@@ -319,7 +319,7 @@ nv28_chipset = {
 	.bus      = { 0x00000001, nv04_bus_new },
 	.clk      = { 0x00000001, nv04_clk_new },
 	.devinit  = { 0x00000001, nv20_devinit_new },
-	.fb = nv25_fb_new,
+	.fb       = { 0x00000001, nv25_fb_new },
 	.gpio = nv10_gpio_new,
 	.i2c = nv04_i2c_new,
 	.imem = nv04_instmem_new,
@@ -341,7 +341,7 @@ nv2a_chipset = {
 	.bus      = { 0x00000001, nv04_bus_new },
 	.clk      = { 0x00000001, nv04_clk_new },
 	.devinit  = { 0x00000001, nv20_devinit_new },
-	.fb = nv25_fb_new,
+	.fb       = { 0x00000001, nv25_fb_new },
 	.gpio = nv10_gpio_new,
 	.i2c = nv04_i2c_new,
 	.imem = nv04_instmem_new,
@@ -363,7 +363,7 @@ nv30_chipset = {
 	.bus      = { 0x00000001, nv04_bus_new },
 	.clk      = { 0x00000001, nv04_clk_new },
 	.devinit  = { 0x00000001, nv20_devinit_new },
-	.fb = nv30_fb_new,
+	.fb       = { 0x00000001, nv30_fb_new },
 	.gpio = nv10_gpio_new,
 	.i2c = nv04_i2c_new,
 	.imem = nv04_instmem_new,
@@ -385,7 +385,7 @@ nv31_chipset = {
 	.bus      = { 0x00000001, nv31_bus_new },
 	.clk      = { 0x00000001, nv04_clk_new },
 	.devinit  = { 0x00000001, nv20_devinit_new },
-	.fb = nv30_fb_new,
+	.fb       = { 0x00000001, nv30_fb_new },
 	.gpio = nv10_gpio_new,
 	.i2c = nv04_i2c_new,
 	.imem = nv04_instmem_new,
@@ -408,7 +408,7 @@ nv34_chipset = {
 	.bus      = { 0x00000001, nv31_bus_new },
 	.clk      = { 0x00000001, nv04_clk_new },
 	.devinit  = { 0x00000001, nv10_devinit_new },
-	.fb = nv10_fb_new,
+	.fb       = { 0x00000001, nv10_fb_new },
 	.gpio = nv10_gpio_new,
 	.i2c = nv04_i2c_new,
 	.imem = nv04_instmem_new,
@@ -431,7 +431,7 @@ nv35_chipset = {
 	.bus      = { 0x00000001, nv04_bus_new },
 	.clk      = { 0x00000001, nv04_clk_new },
 	.devinit  = { 0x00000001, nv20_devinit_new },
-	.fb = nv35_fb_new,
+	.fb       = { 0x00000001, nv35_fb_new },
 	.gpio = nv10_gpio_new,
 	.i2c = nv04_i2c_new,
 	.imem = nv04_instmem_new,
@@ -453,7 +453,7 @@ nv36_chipset = {
 	.bus      = { 0x00000001, nv31_bus_new },
 	.clk      = { 0x00000001, nv04_clk_new },
 	.devinit  = { 0x00000001, nv20_devinit_new },
-	.fb = nv36_fb_new,
+	.fb       = { 0x00000001, nv36_fb_new },
 	.gpio = nv10_gpio_new,
 	.i2c = nv04_i2c_new,
 	.imem = nv04_instmem_new,
@@ -476,7 +476,7 @@ nv40_chipset = {
 	.bus      = { 0x00000001, nv31_bus_new },
 	.clk      = { 0x00000001, nv40_clk_new },
 	.devinit  = { 0x00000001, nv1a_devinit_new },
-	.fb = nv40_fb_new,
+	.fb       = { 0x00000001, nv40_fb_new },
 	.gpio = nv10_gpio_new,
 	.i2c = nv04_i2c_new,
 	.imem = nv40_instmem_new,
@@ -502,7 +502,7 @@ nv41_chipset = {
 	.bus      = { 0x00000001, nv31_bus_new },
 	.clk      = { 0x00000001, nv40_clk_new },
 	.devinit  = { 0x00000001, nv1a_devinit_new },
-	.fb = nv41_fb_new,
+	.fb       = { 0x00000001, nv41_fb_new },
 	.gpio = nv10_gpio_new,
 	.i2c = nv04_i2c_new,
 	.imem = nv40_instmem_new,
@@ -528,7 +528,7 @@ nv42_chipset = {
 	.bus      = { 0x00000001, nv31_bus_new },
 	.clk      = { 0x00000001, nv40_clk_new },
 	.devinit  = { 0x00000001, nv1a_devinit_new },
-	.fb = nv41_fb_new,
+	.fb       = { 0x00000001, nv41_fb_new },
 	.gpio = nv10_gpio_new,
 	.i2c = nv04_i2c_new,
 	.imem = nv40_instmem_new,
@@ -554,7 +554,7 @@ nv43_chipset = {
 	.bus      = { 0x00000001, nv31_bus_new },
 	.clk      = { 0x00000001, nv40_clk_new },
 	.devinit  = { 0x00000001, nv1a_devinit_new },
-	.fb = nv41_fb_new,
+	.fb       = { 0x00000001, nv41_fb_new },
 	.gpio = nv10_gpio_new,
 	.i2c = nv04_i2c_new,
 	.imem = nv40_instmem_new,
@@ -580,7 +580,7 @@ nv44_chipset = {
 	.bus      = { 0x00000001, nv31_bus_new },
 	.clk      = { 0x00000001, nv40_clk_new },
 	.devinit  = { 0x00000001, nv1a_devinit_new },
-	.fb = nv44_fb_new,
+	.fb       = { 0x00000001, nv44_fb_new },
 	.gpio = nv10_gpio_new,
 	.i2c = nv04_i2c_new,
 	.imem = nv40_instmem_new,
@@ -606,7 +606,7 @@ nv45_chipset = {
 	.bus      = { 0x00000001, nv31_bus_new },
 	.clk      = { 0x00000001, nv40_clk_new },
 	.devinit  = { 0x00000001, nv1a_devinit_new },
-	.fb = nv40_fb_new,
+	.fb       = { 0x00000001, nv40_fb_new },
 	.gpio = nv10_gpio_new,
 	.i2c = nv04_i2c_new,
 	.imem = nv40_instmem_new,
@@ -632,7 +632,7 @@ nv46_chipset = {
 	.bus      = { 0x00000001, nv31_bus_new },
 	.clk      = { 0x00000001, nv40_clk_new },
 	.devinit  = { 0x00000001, nv1a_devinit_new },
-	.fb = nv46_fb_new,
+	.fb       = { 0x00000001, nv46_fb_new },
 	.gpio = nv10_gpio_new,
 	.i2c = nv04_i2c_new,
 	.imem = nv40_instmem_new,
@@ -658,7 +658,7 @@ nv47_chipset = {
 	.bus      = { 0x00000001, nv31_bus_new },
 	.clk      = { 0x00000001, nv40_clk_new },
 	.devinit  = { 0x00000001, nv1a_devinit_new },
-	.fb = nv47_fb_new,
+	.fb       = { 0x00000001, nv47_fb_new },
 	.gpio = nv10_gpio_new,
 	.i2c = nv04_i2c_new,
 	.imem = nv40_instmem_new,
@@ -684,7 +684,7 @@ nv49_chipset = {
 	.bus      = { 0x00000001, nv31_bus_new },
 	.clk      = { 0x00000001, nv40_clk_new },
 	.devinit  = { 0x00000001, nv1a_devinit_new },
-	.fb = nv49_fb_new,
+	.fb       = { 0x00000001, nv49_fb_new },
 	.gpio = nv10_gpio_new,
 	.i2c = nv04_i2c_new,
 	.imem = nv40_instmem_new,
@@ -710,7 +710,7 @@ nv4a_chipset = {
 	.bus      = { 0x00000001, nv31_bus_new },
 	.clk      = { 0x00000001, nv40_clk_new },
 	.devinit  = { 0x00000001, nv1a_devinit_new },
-	.fb = nv44_fb_new,
+	.fb       = { 0x00000001, nv44_fb_new },
 	.gpio = nv10_gpio_new,
 	.i2c = nv04_i2c_new,
 	.imem = nv40_instmem_new,
@@ -736,7 +736,7 @@ nv4b_chipset = {
 	.bus      = { 0x00000001, nv31_bus_new },
 	.clk      = { 0x00000001, nv40_clk_new },
 	.devinit  = { 0x00000001, nv1a_devinit_new },
-	.fb = nv49_fb_new,
+	.fb       = { 0x00000001, nv49_fb_new },
 	.gpio = nv10_gpio_new,
 	.i2c = nv04_i2c_new,
 	.imem = nv40_instmem_new,
@@ -762,7 +762,7 @@ nv4c_chipset = {
 	.bus      = { 0x00000001, nv31_bus_new },
 	.clk      = { 0x00000001, nv40_clk_new },
 	.devinit  = { 0x00000001, nv1a_devinit_new },
-	.fb = nv46_fb_new,
+	.fb       = { 0x00000001, nv46_fb_new },
 	.gpio = nv10_gpio_new,
 	.i2c = nv04_i2c_new,
 	.imem = nv40_instmem_new,
@@ -788,7 +788,7 @@ nv4e_chipset = {
 	.bus      = { 0x00000001, nv31_bus_new },
 	.clk      = { 0x00000001, nv40_clk_new },
 	.devinit  = { 0x00000001, nv1a_devinit_new },
-	.fb = nv4e_fb_new,
+	.fb       = { 0x00000001, nv4e_fb_new },
 	.gpio = nv10_gpio_new,
 	.i2c = nv4e_i2c_new,
 	.imem = nv40_instmem_new,
@@ -815,7 +815,7 @@ nv50_chipset = {
 	.bus      = { 0x00000001, nv50_bus_new },
 	.clk      = { 0x00000001, nv50_clk_new },
 	.devinit  = { 0x00000001, nv50_devinit_new },
-	.fb = nv50_fb_new,
+	.fb       = { 0x00000001, nv50_fb_new },
 	.fuse = nv50_fuse_new,
 	.gpio = nv50_gpio_new,
 	.i2c = nv50_i2c_new,
@@ -843,7 +843,7 @@ nv63_chipset = {
 	.bus      = { 0x00000001, nv31_bus_new },
 	.clk      = { 0x00000001, nv40_clk_new },
 	.devinit  = { 0x00000001, nv1a_devinit_new },
-	.fb = nv46_fb_new,
+	.fb       = { 0x00000001, nv46_fb_new },
 	.gpio = nv10_gpio_new,
 	.i2c = nv04_i2c_new,
 	.imem = nv40_instmem_new,
@@ -869,7 +869,7 @@ nv67_chipset = {
 	.bus      = { 0x00000001, nv31_bus_new },
 	.clk      = { 0x00000001, nv40_clk_new },
 	.devinit  = { 0x00000001, nv1a_devinit_new },
-	.fb = nv46_fb_new,
+	.fb       = { 0x00000001, nv46_fb_new },
 	.gpio = nv10_gpio_new,
 	.i2c = nv04_i2c_new,
 	.imem = nv40_instmem_new,
@@ -895,7 +895,7 @@ nv68_chipset = {
 	.bus      = { 0x00000001, nv31_bus_new },
 	.clk      = { 0x00000001, nv40_clk_new },
 	.devinit  = { 0x00000001, nv1a_devinit_new },
-	.fb = nv46_fb_new,
+	.fb       = { 0x00000001, nv46_fb_new },
 	.gpio = nv10_gpio_new,
 	.i2c = nv04_i2c_new,
 	.imem = nv40_instmem_new,
@@ -922,7 +922,7 @@ nv84_chipset = {
 	.bus      = { 0x00000001, nv50_bus_new },
 	.clk      = { 0x00000001, g84_clk_new },
 	.devinit  = { 0x00000001, g84_devinit_new },
-	.fb = g84_fb_new,
+	.fb       = { 0x00000001, g84_fb_new },
 	.fuse = nv50_fuse_new,
 	.gpio = nv50_gpio_new,
 	.i2c = nv50_i2c_new,
@@ -954,7 +954,7 @@ nv86_chipset = {
 	.bus      = { 0x00000001, nv50_bus_new },
 	.clk      = { 0x00000001, g84_clk_new },
 	.devinit  = { 0x00000001, g84_devinit_new },
-	.fb = g84_fb_new,
+	.fb       = { 0x00000001, g84_fb_new },
 	.fuse = nv50_fuse_new,
 	.gpio = nv50_gpio_new,
 	.i2c = nv50_i2c_new,
@@ -986,7 +986,7 @@ nv92_chipset = {
 	.bus      = { 0x00000001, nv50_bus_new },
 	.clk      = { 0x00000001, g84_clk_new },
 	.devinit  = { 0x00000001, g84_devinit_new },
-	.fb = g84_fb_new,
+	.fb       = { 0x00000001, g84_fb_new },
 	.fuse = nv50_fuse_new,
 	.gpio = nv50_gpio_new,
 	.i2c = nv50_i2c_new,
@@ -1018,7 +1018,7 @@ nv94_chipset = {
 	.bus      = { 0x00000001, g94_bus_new },
 	.clk      = { 0x00000001, g84_clk_new },
 	.devinit  = { 0x00000001, g84_devinit_new },
-	.fb = g84_fb_new,
+	.fb       = { 0x00000001, g84_fb_new },
 	.fuse = nv50_fuse_new,
 	.gpio = g94_gpio_new,
 	.i2c = g94_i2c_new,
@@ -1050,7 +1050,7 @@ nv96_chipset = {
 	.bus      = { 0x00000001, g94_bus_new },
 	.clk      = { 0x00000001, g84_clk_new },
 	.devinit  = { 0x00000001, g84_devinit_new },
-	.fb = g84_fb_new,
+	.fb       = { 0x00000001, g84_fb_new },
 	.fuse = nv50_fuse_new,
 	.gpio = g94_gpio_new,
 	.i2c = g94_i2c_new,
@@ -1082,7 +1082,7 @@ nv98_chipset = {
 	.bus      = { 0x00000001, g94_bus_new },
 	.clk      = { 0x00000001, g84_clk_new },
 	.devinit  = { 0x00000001, g98_devinit_new },
-	.fb = g84_fb_new,
+	.fb       = { 0x00000001, g84_fb_new },
 	.fuse = nv50_fuse_new,
 	.gpio = g94_gpio_new,
 	.i2c = g94_i2c_new,
@@ -1114,7 +1114,7 @@ nva0_chipset = {
 	.bus      = { 0x00000001, g94_bus_new },
 	.clk      = { 0x00000001, g84_clk_new },
 	.devinit  = { 0x00000001, g84_devinit_new },
-	.fb = g84_fb_new,
+	.fb       = { 0x00000001, g84_fb_new },
 	.fuse = nv50_fuse_new,
 	.gpio = g94_gpio_new,
 	.i2c = nv50_i2c_new,
@@ -1146,7 +1146,7 @@ nva3_chipset = {
 	.bus      = { 0x00000001, g94_bus_new },
 	.clk      = { 0x00000001, gt215_clk_new },
 	.devinit  = { 0x00000001, gt215_devinit_new },
-	.fb = gt215_fb_new,
+	.fb       = { 0x00000001, gt215_fb_new },
 	.fuse = nv50_fuse_new,
 	.gpio = g94_gpio_new,
 	.i2c = g94_i2c_new,
@@ -1180,7 +1180,7 @@ nva5_chipset = {
 	.bus      = { 0x00000001, g94_bus_new },
 	.clk      = { 0x00000001, gt215_clk_new },
 	.devinit  = { 0x00000001, gt215_devinit_new },
-	.fb = gt215_fb_new,
+	.fb       = { 0x00000001, gt215_fb_new },
 	.fuse = nv50_fuse_new,
 	.gpio = g94_gpio_new,
 	.i2c = g94_i2c_new,
@@ -1213,7 +1213,7 @@ nva8_chipset = {
 	.bus      = { 0x00000001, g94_bus_new },
 	.clk      = { 0x00000001, gt215_clk_new },
 	.devinit  = { 0x00000001, gt215_devinit_new },
-	.fb = gt215_fb_new,
+	.fb       = { 0x00000001, gt215_fb_new },
 	.fuse = nv50_fuse_new,
 	.gpio = g94_gpio_new,
 	.i2c = g94_i2c_new,
@@ -1246,7 +1246,7 @@ nvaa_chipset = {
 	.bus      = { 0x00000001, g94_bus_new },
 	.clk      = { 0x00000001, mcp77_clk_new },
 	.devinit  = { 0x00000001, g98_devinit_new },
-	.fb = mcp77_fb_new,
+	.fb       = { 0x00000001, mcp77_fb_new },
 	.fuse = nv50_fuse_new,
 	.gpio = g94_gpio_new,
 	.i2c = g94_i2c_new,
@@ -1278,7 +1278,7 @@ nvac_chipset = {
 	.bus      = { 0x00000001, g94_bus_new },
 	.clk      = { 0x00000001, mcp77_clk_new },
 	.devinit  = { 0x00000001, g98_devinit_new },
-	.fb = mcp77_fb_new,
+	.fb       = { 0x00000001, mcp77_fb_new },
 	.fuse = nv50_fuse_new,
 	.gpio = g94_gpio_new,
 	.i2c = g94_i2c_new,
@@ -1310,7 +1310,7 @@ nvaf_chipset = {
 	.bus      = { 0x00000001, g94_bus_new },
 	.clk      = { 0x00000001, gt215_clk_new },
 	.devinit  = { 0x00000001, mcp89_devinit_new },
-	.fb = mcp89_fb_new,
+	.fb       = { 0x00000001, mcp89_fb_new },
 	.fuse = nv50_fuse_new,
 	.gpio = g94_gpio_new,
 	.i2c = g94_i2c_new,
@@ -1343,7 +1343,7 @@ nvc0_chipset = {
 	.bus      = { 0x00000001, gf100_bus_new },
 	.clk      = { 0x00000001, gf100_clk_new },
 	.devinit  = { 0x00000001, gf100_devinit_new },
-	.fb = gf100_fb_new,
+	.fb       = { 0x00000001, gf100_fb_new },
 	.fuse = gf100_fuse_new,
 	.gpio = g94_gpio_new,
 	.i2c = g94_i2c_new,
@@ -1380,7 +1380,7 @@ nvc1_chipset = {
 	.bus      = { 0x00000001, gf100_bus_new },
 	.clk      = { 0x00000001, gf100_clk_new },
 	.devinit  = { 0x00000001, gf100_devinit_new },
-	.fb = gf108_fb_new,
+	.fb       = { 0x00000001, gf108_fb_new },
 	.fuse = gf100_fuse_new,
 	.gpio = g94_gpio_new,
 	.i2c = g94_i2c_new,
@@ -1416,7 +1416,7 @@ nvc3_chipset = {
 	.bus      = { 0x00000001, gf100_bus_new },
 	.clk      = { 0x00000001, gf100_clk_new },
 	.devinit  = { 0x00000001, gf100_devinit_new },
-	.fb = gf100_fb_new,
+	.fb       = { 0x00000001, gf100_fb_new },
 	.fuse = gf100_fuse_new,
 	.gpio = g94_gpio_new,
 	.i2c = g94_i2c_new,
@@ -1452,7 +1452,7 @@ nvc4_chipset = {
 	.bus      = { 0x00000001, gf100_bus_new },
 	.clk      = { 0x00000001, gf100_clk_new },
 	.devinit  = { 0x00000001, gf100_devinit_new },
-	.fb = gf100_fb_new,
+	.fb       = { 0x00000001, gf100_fb_new },
 	.fuse = gf100_fuse_new,
 	.gpio = g94_gpio_new,
 	.i2c = g94_i2c_new,
@@ -1489,7 +1489,7 @@ nvc8_chipset = {
 	.bus      = { 0x00000001, gf100_bus_new },
 	.clk      = { 0x00000001, gf100_clk_new },
 	.devinit  = { 0x00000001, gf100_devinit_new },
-	.fb = gf100_fb_new,
+	.fb       = { 0x00000001, gf100_fb_new },
 	.fuse = gf100_fuse_new,
 	.gpio = g94_gpio_new,
 	.i2c = g94_i2c_new,
@@ -1526,7 +1526,7 @@ nvce_chipset = {
 	.bus      = { 0x00000001, gf100_bus_new },
 	.clk      = { 0x00000001, gf100_clk_new },
 	.devinit  = { 0x00000001, gf100_devinit_new },
-	.fb = gf100_fb_new,
+	.fb       = { 0x00000001, gf100_fb_new },
 	.fuse = gf100_fuse_new,
 	.gpio = g94_gpio_new,
 	.i2c = g94_i2c_new,
@@ -1563,7 +1563,7 @@ nvcf_chipset = {
 	.bus      = { 0x00000001, gf100_bus_new },
 	.clk      = { 0x00000001, gf100_clk_new },
 	.devinit  = { 0x00000001, gf100_devinit_new },
-	.fb = gf100_fb_new,
+	.fb       = { 0x00000001, gf100_fb_new },
 	.fuse = gf100_fuse_new,
 	.gpio = g94_gpio_new,
 	.i2c = g94_i2c_new,
@@ -1599,7 +1599,7 @@ nvd7_chipset = {
 	.bus      = { 0x00000001, gf100_bus_new },
 	.clk      = { 0x00000001, gf100_clk_new },
 	.devinit  = { 0x00000001, gf100_devinit_new },
-	.fb = gf100_fb_new,
+	.fb       = { 0x00000001, gf100_fb_new },
 	.fuse = gf100_fuse_new,
 	.gpio = gf119_gpio_new,
 	.i2c = gf117_i2c_new,
@@ -1634,7 +1634,7 @@ nvd9_chipset = {
 	.bus      = { 0x00000001, gf100_bus_new },
 	.clk      = { 0x00000001, gf100_clk_new },
 	.devinit  = { 0x00000001, gf100_devinit_new },
-	.fb = gf100_fb_new,
+	.fb       = { 0x00000001, gf100_fb_new },
 	.fuse = gf100_fuse_new,
 	.gpio = gf119_gpio_new,
 	.i2c = gf119_i2c_new,
@@ -1670,7 +1670,7 @@ nve4_chipset = {
 	.bus      = { 0x00000001, gf100_bus_new },
 	.clk      = { 0x00000001, gk104_clk_new },
 	.devinit  = { 0x00000001, gf100_devinit_new },
-	.fb = gk104_fb_new,
+	.fb       = { 0x00000001, gk104_fb_new },
 	.fuse = gf100_fuse_new,
 	.gpio = gk104_gpio_new,
 	.i2c = gk104_i2c_new,
@@ -1709,7 +1709,7 @@ nve6_chipset = {
 	.bus      = { 0x00000001, gf100_bus_new },
 	.clk      = { 0x00000001, gk104_clk_new },
 	.devinit  = { 0x00000001, gf100_devinit_new },
-	.fb = gk104_fb_new,
+	.fb       = { 0x00000001, gk104_fb_new },
 	.fuse = gf100_fuse_new,
 	.gpio = gk104_gpio_new,
 	.i2c = gk104_i2c_new,
@@ -1748,7 +1748,7 @@ nve7_chipset = {
 	.bus      = { 0x00000001, gf100_bus_new },
 	.clk      = { 0x00000001, gk104_clk_new },
 	.devinit  = { 0x00000001, gf100_devinit_new },
-	.fb = gk104_fb_new,
+	.fb       = { 0x00000001, gk104_fb_new },
 	.fuse = gf100_fuse_new,
 	.gpio = gk104_gpio_new,
 	.i2c = gk104_i2c_new,
@@ -1785,7 +1785,7 @@ nvea_chipset = {
 	.bar      = { 0x00000001, gk20a_bar_new },
 	.bus      = { 0x00000001, gf100_bus_new },
 	.clk      = { 0x00000001, gk20a_clk_new },
-	.fb = gk20a_fb_new,
+	.fb       = { 0x00000001, gk20a_fb_new },
 	.fuse = gf100_fuse_new,
 	.ibus = gk20a_ibus_new,
 	.imem = gk20a_instmem_new,
@@ -1812,7 +1812,7 @@ nvf0_chipset = {
 	.bus      = { 0x00000001, gf100_bus_new },
 	.clk      = { 0x00000001, gk104_clk_new },
 	.devinit  = { 0x00000001, gf100_devinit_new },
-	.fb = gk110_fb_new,
+	.fb       = { 0x00000001, gk110_fb_new },
 	.fuse = gf100_fuse_new,
 	.gpio = gk104_gpio_new,
 	.i2c = gk110_i2c_new,
@@ -1850,7 +1850,7 @@ nvf1_chipset = {
 	.bus      = { 0x00000001, gf100_bus_new },
 	.clk      = { 0x00000001, gk104_clk_new },
 	.devinit  = { 0x00000001, gf100_devinit_new },
-	.fb = gk110_fb_new,
+	.fb       = { 0x00000001, gk110_fb_new },
 	.fuse = gf100_fuse_new,
 	.gpio = gk104_gpio_new,
 	.i2c = gk110_i2c_new,
@@ -1888,7 +1888,7 @@ nv106_chipset = {
 	.bus      = { 0x00000001, gf100_bus_new },
 	.clk      = { 0x00000001, gk104_clk_new },
 	.devinit  = { 0x00000001, gf100_devinit_new },
-	.fb = gk110_fb_new,
+	.fb       = { 0x00000001, gk110_fb_new },
 	.fuse = gf100_fuse_new,
 	.gpio = gk104_gpio_new,
 	.i2c = gk110_i2c_new,
@@ -1926,7 +1926,7 @@ nv108_chipset = {
 	.bus      = { 0x00000001, gf100_bus_new },
 	.clk      = { 0x00000001, gk104_clk_new },
 	.devinit  = { 0x00000001, gf100_devinit_new },
-	.fb = gk110_fb_new,
+	.fb       = { 0x00000001, gk110_fb_new },
 	.fuse = gf100_fuse_new,
 	.gpio = gk104_gpio_new,
 	.i2c = gk110_i2c_new,
@@ -1964,7 +1964,7 @@ nv117_chipset = {
 	.bus      = { 0x00000001, gf100_bus_new },
 	.clk      = { 0x00000001, gk104_clk_new },
 	.devinit  = { 0x00000001, gm107_devinit_new },
-	.fb = gm107_fb_new,
+	.fb       = { 0x00000001, gm107_fb_new },
 	.fuse = gm107_fuse_new,
 	.gpio = gk104_gpio_new,
 	.i2c = gk110_i2c_new,
@@ -2000,7 +2000,7 @@ nv118_chipset = {
 	.bus      = { 0x00000001, gf100_bus_new },
 	.clk      = { 0x00000001, gk104_clk_new },
 	.devinit  = { 0x00000001, gm107_devinit_new },
-	.fb = gm107_fb_new,
+	.fb       = { 0x00000001, gm107_fb_new },
 	.fuse = gm107_fuse_new,
 	.gpio = gk104_gpio_new,
 	.i2c = gk110_i2c_new,
@@ -2034,7 +2034,7 @@ nv120_chipset = {
 	.bios     = { 0x00000001, nvkm_bios_new },
 	.bus      = { 0x00000001, gf100_bus_new },
 	.devinit  = { 0x00000001, gm200_devinit_new },
-	.fb = gm200_fb_new,
+	.fb       = { 0x00000001, gm200_fb_new },
 	.fuse = gm107_fuse_new,
 	.gpio = gk104_gpio_new,
 	.i2c = gm200_i2c_new,
@@ -2072,7 +2072,7 @@ nv124_chipset = {
 	.bios     = { 0x00000001, nvkm_bios_new },
 	.bus      = { 0x00000001, gf100_bus_new },
 	.devinit  = { 0x00000001, gm200_devinit_new },
-	.fb = gm200_fb_new,
+	.fb       = { 0x00000001, gm200_fb_new },
 	.fuse = gm107_fuse_new,
 	.gpio = gk104_gpio_new,
 	.i2c = gm200_i2c_new,
@@ -2110,7 +2110,7 @@ nv126_chipset = {
 	.bios     = { 0x00000001, nvkm_bios_new },
 	.bus      = { 0x00000001, gf100_bus_new },
 	.devinit  = { 0x00000001, gm200_devinit_new },
-	.fb = gm200_fb_new,
+	.fb       = { 0x00000001, gm200_fb_new },
 	.fuse = gm107_fuse_new,
 	.gpio = gk104_gpio_new,
 	.i2c = gm200_i2c_new,
@@ -2146,7 +2146,7 @@ nv12b_chipset = {
 	.bar      = { 0x00000001, gm20b_bar_new },
 	.bus      = { 0x00000001, gf100_bus_new },
 	.clk      = { 0x00000001, gm20b_clk_new },
-	.fb = gm20b_fb_new,
+	.fb       = { 0x00000001, gm20b_fb_new },
 	.fuse = gm107_fuse_new,
 	.ibus = gk20a_ibus_new,
 	.imem = gk20a_instmem_new,
@@ -2173,7 +2173,7 @@ nv130_chipset = {
 	.bus      = { 0x00000001, gf100_bus_new },
 	.devinit  = { 0x00000001, gm200_devinit_new },
 	.fault    = { 0x00000001, gp100_fault_new },
-	.fb = gp100_fb_new,
+	.fb       = { 0x00000001, gp100_fb_new },
 	.fuse = gm107_fuse_new,
 	.gpio = gk104_gpio_new,
 	.i2c = gm200_i2c_new,
@@ -2213,7 +2213,7 @@ nv132_chipset = {
 	.bus      = { 0x00000001, gf100_bus_new },
 	.devinit  = { 0x00000001, gm200_devinit_new },
 	.fault    = { 0x00000001, gp100_fault_new },
-	.fb = gp102_fb_new,
+	.fb       = { 0x00000001, gp102_fb_new },
 	.fuse = gm107_fuse_new,
 	.gpio = gk104_gpio_new,
 	.i2c = gm200_i2c_new,
@@ -2251,7 +2251,7 @@ nv134_chipset = {
 	.bus      = { 0x00000001, gf100_bus_new },
 	.devinit  = { 0x00000001, gm200_devinit_new },
 	.fault    = { 0x00000001, gp100_fault_new },
-	.fb = gp102_fb_new,
+	.fb       = { 0x00000001, gp102_fb_new },
 	.fuse = gm107_fuse_new,
 	.gpio = gk104_gpio_new,
 	.i2c = gm200_i2c_new,
@@ -2289,7 +2289,7 @@ nv136_chipset = {
 	.bus      = { 0x00000001, gf100_bus_new },
 	.devinit  = { 0x00000001, gm200_devinit_new },
 	.fault    = { 0x00000001, gp100_fault_new },
-	.fb = gp102_fb_new,
+	.fb       = { 0x00000001, gp102_fb_new },
 	.fuse = gm107_fuse_new,
 	.gpio = gk104_gpio_new,
 	.i2c = gm200_i2c_new,
@@ -2326,7 +2326,7 @@ nv137_chipset = {
 	.bus      = { 0x00000001, gf100_bus_new },
 	.devinit  = { 0x00000001, gm200_devinit_new },
 	.fault    = { 0x00000001, gp100_fault_new },
-	.fb = gp102_fb_new,
+	.fb       = { 0x00000001, gp102_fb_new },
 	.fuse = gm107_fuse_new,
 	.gpio = gk104_gpio_new,
 	.i2c = gm200_i2c_new,
@@ -2364,7 +2364,7 @@ nv138_chipset = {
 	.bus      = { 0x00000001, gf100_bus_new },
 	.devinit  = { 0x00000001, gm200_devinit_new },
 	.fault    = { 0x00000001, gp100_fault_new },
-	.fb = gp102_fb_new,
+	.fb       = { 0x00000001, gp102_fb_new },
 	.fuse = gm107_fuse_new,
 	.gpio = gk104_gpio_new,
 	.i2c = gm200_i2c_new,
@@ -2398,7 +2398,7 @@ nv13b_chipset = {
 	.bar      = { 0x00000001, gm20b_bar_new },
 	.bus      = { 0x00000001, gf100_bus_new },
 	.fault    = { 0x00000001, gp10b_fault_new },
-	.fb = gp10b_fb_new,
+	.fb       = { 0x00000001, gp10b_fb_new },
 	.fuse = gm107_fuse_new,
 	.ibus = gp10b_ibus_new,
 	.imem = gk20a_instmem_new,
@@ -2424,7 +2424,7 @@ nv140_chipset = {
 	.bus      = { 0x00000001, gf100_bus_new },
 	.devinit  = { 0x00000001, gv100_devinit_new },
 	.fault    = { 0x00000001, gv100_fault_new },
-	.fb = gv100_fb_new,
+	.fb       = { 0x00000001, gv100_fb_new },
 	.fuse = gm107_fuse_new,
 	.gpio = gk104_gpio_new,
 	.gsp = gv100_gsp_new,
@@ -2468,7 +2468,7 @@ nv162_chipset = {
 	.bus      = { 0x00000001, gf100_bus_new },
 	.devinit  = { 0x00000001, tu102_devinit_new },
 	.fault    = { 0x00000001, tu102_fault_new },
-	.fb = gv100_fb_new,
+	.fb       = { 0x00000001, gv100_fb_new },
 	.fuse = gm107_fuse_new,
 	.gpio = gk104_gpio_new,
 	.gsp = gv100_gsp_new,
@@ -2506,7 +2506,7 @@ nv164_chipset = {
 	.bus      = { 0x00000001, gf100_bus_new },
 	.devinit  = { 0x00000001, tu102_devinit_new },
 	.fault    = { 0x00000001, tu102_fault_new },
-	.fb = gv100_fb_new,
+	.fb       = { 0x00000001, gv100_fb_new },
 	.fuse = gm107_fuse_new,
 	.gpio = gk104_gpio_new,
 	.gsp = gv100_gsp_new,
@@ -2545,7 +2545,7 @@ nv166_chipset = {
 	.bus      = { 0x00000001, gf100_bus_new },
 	.devinit  = { 0x00000001, tu102_devinit_new },
 	.fault    = { 0x00000001, tu102_fault_new },
-	.fb = gv100_fb_new,
+	.fb       = { 0x00000001, gv100_fb_new },
 	.fuse = gm107_fuse_new,
 	.gpio = gk104_gpio_new,
 	.gsp = gv100_gsp_new,
@@ -2585,7 +2585,7 @@ nv167_chipset = {
 	.bus      = { 0x00000001, gf100_bus_new },
 	.devinit  = { 0x00000001, tu102_devinit_new },
 	.fault    = { 0x00000001, tu102_fault_new },
-	.fb = gv100_fb_new,
+	.fb       = { 0x00000001, gv100_fb_new },
 	.fuse = gm107_fuse_new,
 	.gpio = gk104_gpio_new,
 	.gsp = gv100_gsp_new,
@@ -2623,7 +2623,7 @@ nv168_chipset = {
 	.bus      = { 0x00000001, gf100_bus_new },
 	.devinit  = { 0x00000001, tu102_devinit_new },
 	.fault    = { 0x00000001, tu102_fault_new },
-	.fb = gv100_fb_new,
+	.fb       = { 0x00000001, gv100_fb_new },
 	.fuse = gm107_fuse_new,
 	.gpio = gk104_gpio_new,
 	.gsp = gv100_gsp_new,
@@ -2658,7 +2658,7 @@ nv170_chipset = {
 	.bar      = { 0x00000001, tu102_bar_new },
 	.bios     = { 0x00000001, nvkm_bios_new },
 	.devinit  = { 0x00000001, ga100_devinit_new },
-	.fb = ga100_fb_new,
+	.fb       = { 0x00000001, ga100_fb_new },
 	.gpio = gk104_gpio_new,
 	.i2c = gm200_i2c_new,
 	.ibus = gm200_ibus_new,
@@ -2675,7 +2675,7 @@ nv172_chipset = {
 	.bar      = { 0x00000001, tu102_bar_new },
 	.bios     = { 0x00000001, nvkm_bios_new },
 	.devinit  = { 0x00000001, ga100_devinit_new },
-	.fb = ga102_fb_new,
+	.fb       = { 0x00000001, ga102_fb_new },
 	.gpio = ga102_gpio_new,
 	.i2c = gm200_i2c_new,
 	.ibus = gm200_ibus_new,
@@ -2694,7 +2694,7 @@ nv174_chipset = {
 	.bar      = { 0x00000001, tu102_bar_new },
 	.bios     = { 0x00000001, nvkm_bios_new },
 	.devinit  = { 0x00000001, ga100_devinit_new },
-	.fb = ga102_fb_new,
+	.fb       = { 0x00000001, ga102_fb_new },
 	.gpio = ga102_gpio_new,
 	.i2c = gm200_i2c_new,
 	.ibus = gm200_ibus_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_FB      ,       fb);
 		_(NVKM_SUBDEV_FUSE    ,     fuse);
 		_(NVKM_SUBDEV_GPIO    ,     gpio);
 		_(NVKM_SUBDEV_GSP     ,      gsp);