diff --git a/drivers/gpu/drm/nouveau/core/engine/copy/fuc/nva3.fuc.h b/drivers/gpu/drm/nouveau/core/engine/copy/fuc/nva3.fuc.h
index c92520f3ed46f2c11d49de137ae366ddb4e0fc8c..241b272012062b71c90f16f703d7ec9fb1663c38 100644
--- a/drivers/gpu/drm/nouveau/core/engine/copy/fuc/nva3.fuc.h
+++ b/drivers/gpu/drm/nouveau/core/engine/copy/fuc/nva3.fuc.h
@@ -1,4 +1,4 @@
-static u32 nva3_pcopy_data[] = {
+uint32_t nva3_pcopy_data[] = {
 /* 0x0000: ctx_object */
 	0x00000000,
 /* 0x0004: ctx_dma */
@@ -183,7 +183,7 @@ static u32 nva3_pcopy_data[] = {
 	0x00000800,
 };
 
-static u32 nva3_pcopy_code[] = {
+uint32_t nva3_pcopy_code[] = {
 /* 0x0000: main */
 	0x04fe04bd,
 	0x3517f000,
diff --git a/drivers/gpu/drm/nouveau/core/engine/copy/fuc/nvc0.fuc.h b/drivers/gpu/drm/nouveau/core/engine/copy/fuc/nvc0.fuc.h
index 0d98c6c0958d5f9853a428d242d934ccd3b162ca..98cc4216a3722d190fe815620ab6068c2941f4a2 100644
--- a/drivers/gpu/drm/nouveau/core/engine/copy/fuc/nvc0.fuc.h
+++ b/drivers/gpu/drm/nouveau/core/engine/copy/fuc/nvc0.fuc.h
@@ -1,4 +1,4 @@
-static u32 nvc0_pcopy_data[] = {
+uint32_t nvc0_pcopy_data[] = {
 /* 0x0000: ctx_object */
 	0x00000000,
 /* 0x0004: ctx_query_address_high */
@@ -171,7 +171,7 @@ static u32 nvc0_pcopy_data[] = {
 	0x00000800,
 };
 
-static u32 nvc0_pcopy_code[] = {
+uint32_t nvc0_pcopy_code[] = {
 /* 0x0000: main */
 	0x04fe04bd,
 	0x3517f000,
diff --git a/drivers/gpu/drm/nouveau/core/engine/crypt/fuc/nv98.fuc.h b/drivers/gpu/drm/nouveau/core/engine/crypt/fuc/nv98.fuc.h
index 09962e4210e9e617033aceedad79542528f52d9f..38676c74e6e04873e071f34a8e4863366e42bdf8 100644
--- a/drivers/gpu/drm/nouveau/core/engine/crypt/fuc/nv98.fuc.h
+++ b/drivers/gpu/drm/nouveau/core/engine/crypt/fuc/nv98.fuc.h
@@ -1,4 +1,4 @@
-static uint32_t nv98_pcrypt_data[] = {
+uint32_t nv98_pcrypt_data[] = {
 /* 0x0000: ctx_dma */
 /* 0x0000: ctx_dma_query */
 	0x00000000,
@@ -150,7 +150,7 @@ static uint32_t nv98_pcrypt_data[] = {
 	0x00000000,
 };
 
-static uint32_t nv98_pcrypt_code[] = {
+uint32_t nv98_pcrypt_code[] = {
 	0x17f004bd,
 	0x0010fe35,
 	0xf10004fe,
diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnvc0.fuc.h b/drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnvc0.fuc.h
index 96050ddb22ca628c4117eb94d986c2efc89c2e05..a9711712de57811748f4e99a13b65e2882a4d929 100644
--- a/drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnvc0.fuc.h
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnvc0.fuc.h
@@ -34,31 +34,34 @@ uint32_t nvc0_grgpc_data[] = {
 	0x00000000,
 /* 0x0064: chipsets */
 	0x000000c0,
-	0x012800c8,
-	0x01e40194,
+	0x013400d4,
+	0x01f001a0,
 	0x000000c1,
-	0x012c00c8,
-	0x01f80194,
+	0x013800d4,
+	0x020401a0,
 	0x000000c3,
-	0x012800c8,
-	0x01f40194,
+	0x013400d4,
+	0x020001a0,
 	0x000000c4,
-	0x012800c8,
-	0x01f40194,
+	0x013400d4,
+	0x020001a0,
 	0x000000c8,
-	0x012800c8,
-	0x01e40194,
+	0x013400d4,
+	0x01f001a0,
 	0x000000ce,
-	0x012800c8,
-	0x01f40194,
+	0x013400d4,
+	0x020001a0,
 	0x000000cf,
-	0x012800c8,
-	0x01f00194,
+	0x013400d4,
+	0x01fc01a0,
 	0x000000d9,
-	0x0194012c,
-	0x025401f8,
+	0x01a00138,
+	0x02600204,
+	0x000000d7,
+	0x01a00138,
+	0x02600204,
 	0x00000000,
-/* 0x00c8: nvc0_gpc_mmio_head */
+/* 0x00d4: nvc0_gpc_mmio_head */
 	0x00000380,
 	0x14000400,
 	0x20000450,
@@ -83,10 +86,10 @@ uint32_t nvc0_grgpc_data[] = {
 	0x00000c8c,
 	0x08001000,
 	0x00001014,
-/* 0x0128: nvc0_gpc_mmio_tail */
+/* 0x0134: nvc0_gpc_mmio_tail */
 	0x00000c6c,
-/* 0x012c: nvc1_gpc_mmio_tail */
-/* 0x012c: nvd9_gpc_mmio_head */
+/* 0x0138: nvc1_gpc_mmio_tail */
+/* 0x0138: nvd9_gpc_mmio_head */
 	0x00000380,
 	0x04000400,
 	0x0800040c,
@@ -113,8 +116,8 @@ uint32_t nvc0_grgpc_data[] = {
 	0x00000c8c,
 	0x08001000,
 	0x00001014,
-/* 0x0194: nvd9_gpc_mmio_tail */
-/* 0x0194: nvc0_tpc_mmio_head */
+/* 0x01a0: nvd9_gpc_mmio_tail */
+/* 0x01a0: nvc0_tpc_mmio_head */
 	0x00000018,
 	0x0000003c,
 	0x00000048,
@@ -135,16 +138,16 @@ uint32_t nvc0_grgpc_data[] = {
 	0x4c000644,
 	0x00000698,
 	0x04000750,
-/* 0x01e4: nvc0_tpc_mmio_tail */
+/* 0x01f0: nvc0_tpc_mmio_tail */
 	0x00000758,
 	0x000002c4,
 	0x000006e0,
-/* 0x01f0: nvcf_tpc_mmio_tail */
+/* 0x01fc: nvcf_tpc_mmio_tail */
 	0x000004bc,
-/* 0x01f4: nvc3_tpc_mmio_tail */
+/* 0x0200: nvc3_tpc_mmio_tail */
 	0x00000544,
-/* 0x01f8: nvc1_tpc_mmio_tail */
-/* 0x01f8: nvd9_tpc_mmio_head */
+/* 0x0204: nvc1_tpc_mmio_tail */
+/* 0x0204: nvd9_tpc_mmio_head */
 	0x00000018,
 	0x0000003c,
 	0x00000048,
diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnvc0.fuc.h b/drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnvc0.fuc.h
index bb03d2a1d57b51a8469447c562a08448ccf499ef..b655117e8dac7a88e2253d50444499ccf7cab5c1 100644
--- a/drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnvc0.fuc.h
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnvc0.fuc.h
@@ -30,23 +30,25 @@ uint32_t nvc0_grhub_data[] = {
 	0x00000000,
 /* 0x005c: chipsets */
 	0x000000c0,
-	0x013c00a0,
+	0x014400a8,
 	0x000000c1,
-	0x014000a0,
+	0x014800a8,
 	0x000000c3,
-	0x013c00a0,
+	0x014400a8,
 	0x000000c4,
-	0x013c00a0,
+	0x014400a8,
 	0x000000c8,
-	0x013c00a0,
+	0x014400a8,
 	0x000000ce,
-	0x013c00a0,
+	0x014400a8,
 	0x000000cf,
-	0x013c00a0,
+	0x014400a8,
 	0x000000d9,
-	0x01dc0140,
+	0x01e40148,
+	0x000000d7,
+	0x01e40148,
 	0x00000000,
-/* 0x00a0: nvc0_hub_mmio_head */
+/* 0x00a8: nvc0_hub_mmio_head */
 	0x0417e91c,
 	0x04400204,
 	0x28404004,
@@ -86,10 +88,10 @@ uint32_t nvc0_grhub_data[] = {
 	0x08408800,
 	0x0c408900,
 	0x00408980,
-/* 0x013c: nvc0_hub_mmio_tail */
+/* 0x0144: nvc0_hub_mmio_tail */
 	0x044064c0,
-/* 0x0140: nvc1_hub_mmio_tail */
-/* 0x0140: nvd9_hub_mmio_head */
+/* 0x0148: nvc1_hub_mmio_tail */
+/* 0x0148: nvd9_hub_mmio_head */
 	0x0417e91c,
 	0x04400204,
 	0x24404004,
@@ -129,9 +131,7 @@ uint32_t nvc0_grhub_data[] = {
 	0x08408800,
 	0x0c408900,
 	0x00408980,
-/* 0x01dc: nvd9_hub_mmio_tail */
-	0x00000000,
-	0x00000000,
+/* 0x01e4: nvd9_hub_mmio_tail */
 	0x00000000,
 	0x00000000,
 	0x00000000,