From 6b360f268df53ae6daf758e4fc9947846513ec84 Mon Sep 17 00:00:00 2001
From: Roy Spliet <nouveau@spliet.org>
Date: Tue, 10 May 2016 18:54:59 +0100
Subject: [PATCH] nvkm/gr/fuc: XXX: Fix race condition between interrupt and
 sleep

Clearing $p0 in the interrupt handler has little effect if it is set just
before sleeping, so make sure it's cleared
1) When an interrupt occurs
2) When a queue_get does not pop the last item off the queue

And set when queue_get results in an empty queue. Plox test!
---
 drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/com.fuc |    7 +
 drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpc.fuc |    4 +-
 .../drm/nouveau/nvkm/engine/gr/fuc/gpcgf100.fuc3.h |  796 +++++------
 .../drm/nouveau/nvkm/engine/gr/fuc/gpcgf117.fuc3.h |  854 ++++++------
 .../drm/nouveau/nvkm/engine/gr/fuc/gpcgk104.fuc3.h |  854 ++++++------
 .../drm/nouveau/nvkm/engine/gr/fuc/gpcgk110.fuc3.h |  854 ++++++------
 .../drm/nouveau/nvkm/engine/gr/fuc/gpcgk208.fuc5.h |  776 +++++------
 .../drm/nouveau/nvkm/engine/gr/fuc/gpcgm107.fuc5.h |  958 ++++++-------
 drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hub.fuc |    4 +-
 .../drm/nouveau/nvkm/engine/gr/fuc/hubgf100.fuc3.h | 1426 ++++++++++----------
 .../drm/nouveau/nvkm/engine/gr/fuc/hubgf117.fuc3.h | 1426 ++++++++++----------
 .../drm/nouveau/nvkm/engine/gr/fuc/hubgk104.fuc3.h | 1386 +++++++++----------
 .../drm/nouveau/nvkm/engine/gr/fuc/hubgk110.fuc3.h | 1386 +++++++++----------
 .../drm/nouveau/nvkm/engine/gr/fuc/hubgk208.fuc5.h | 1250 ++++++++---------
 .../drm/nouveau/nvkm/engine/gr/fuc/hubgm107.fuc5.h | 1250 ++++++++---------
 15 files changed, 6621 insertions(+), 6610 deletions(-)

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/com.fuc b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/com.fuc
index 64208bf..f0e2c0f 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/com.fuc
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/com.fuc
@@ -61,11 +61,13 @@ queue_put:
 // In : $r13 queue pointer
 //
 // Out:	$p1  clear on success (data available)
+//      $p0  clear when more data available
 //	$r14 command
 // 	$r15 data
 //
 queue_get:
 	bset $flags $p1
+	bset $flags $p0
 	ld b32 $r8 D[$r13 + 0x0]	// GET
 	ld b32 $r9 D[$r13 + 0x4]	// PUT
 	cmpu b32 $r8 $r9
@@ -83,6 +85,11 @@ queue_get:
 		and $r8 0xf
 		st b32 D[$r13 + 0x0] $r8
 		bclr $flags $p1
+		
+		ld b32 $r9 D[$r13 + 0x4]
+		cmpu b32 $r8 $r9
+		bra e #queue_get_done
+			bclr $flags $p0
 queue_get_done:
 	ret
 
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpc.fuc b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpc.fuc
index dc60509..f3a7e81 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpc.fuc
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpc.fuc
@@ -134,6 +134,9 @@ init:
 	mov $r2 NV_PGRAPH_GPCX_GPCCS_ACCESS_FIFO
 	nv_iowr(NV_PGRAPH_GPCX_GPCCS_ACCESS, 0, $r2)
 
+	// Mark fifo empty
+	bclr $flags $p0 
+
 	// setup i0 handler, and route all interrupts to it
 	mov $r1 #ih
 	mov $iv0 $r1
@@ -292,7 +295,6 @@ init:
 // handler, pulls a command from the queue and executes its handler
 //
 main:
-	bset $flags $p0
 	sleep $p0
 	mov $r13 #cmd_queue
 	call(queue_get)
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgf100.fuc3.h b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgf100.fuc3.h
index 5f4ddfe..457dc18 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgf100.fuc3.h
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgf100.fuc3.h
@@ -37,14 +37,14 @@ uint32_t gf100_grgpc_data[] = {
 };
 
 uint32_t gf100_grgpc_code[] = {
-	0x03a10ef5,
+	0x03b00ef5,
 /* 0x0004: queue_put */
 	0x9800d898,
 	0x86f001d9,
 	0x0489b808,
 	0xf00c1bf4,
 	0x21f502f7,
-	0x00f8037e,
+	0x00f8038d,
 /* 0x001c: queue_put_next */
 	0xb60798c4,
 	0x8dbb0384,
@@ -55,436 +55,436 @@ uint32_t gf100_grgpc_code[] = {
 	0xf801d980,
 /* 0x0039: queue_get */
 	0x0131f400,
-	0x9800d898,
-	0x89b801d9,
-	0x210bf404,
-	0xb60789c4,
-	0x9dbb0394,
-	0x0890b600,
-	0x98009e98,
-	0x80b6019f,
-	0x0f84f001,
-	0xf400d880,
-/* 0x0066: queue_get_done */
-	0x00f80132,
-/* 0x0068: nv_rd32 */
+	0x980031f4,
+	0xd99800d8,
+	0x0489b801,
+	0xc42d0bf4,
+	0x94b60789,
+	0x009dbb03,
+	0x980890b6,
+	0x9f98009e,
+	0x0180b601,
+	0x800f84f0,
+	0x32f400d8,
+	0x01d99801,
+	0xf40489b8,
+	0x32f4060b,
+/* 0x0075: queue_get_done */
+/* 0x0077: nv_rd32 */
+	0xb900f800,
+	0xc9f002ec,
+	0x0007f11f,
+	0x0103f0ca,
+	0xbd000cd0,
+/* 0x0089: nv_rd32_wait */
+	0x00c7f104,
+	0x01c3f0ca,
+	0xc800cccf,
+	0x1bf41fcc,
+	0x06a7f0f3,
+	0x011f21f5,
+	0xcb00f7f1,
+	0xcf01f3f0,
+	0x00f800ff,
+/* 0x00ac: nv_wr32 */
+	0xcc0007f1,
+	0xd00103f0,
+	0x04bd000f,
 	0xf002ecb9,
-	0x07f11fc9,
-	0x03f0ca00,
-	0x000cd001,
-/* 0x007a: nv_rd32_wait */
-	0xc7f104bd,
-	0xc3f0ca00,
-	0x00cccf01,
-	0xf41fccc8,
-	0xa7f0f31b,
-	0x1021f506,
-	0x00f7f101,
-	0x01f3f0cb,
-	0xf800ffcf,
-/* 0x009d: nv_wr32 */
-	0x0007f100,
-	0x0103f0cc,
-	0xbd000fd0,
-	0x02ecb904,
-	0xf01fc9f0,
-	0x07f11ec9,
-	0x03f0ca00,
-	0x000cd001,
-/* 0x00be: nv_wr32_wait */
-	0xc7f104bd,
-	0xc3f0ca00,
-	0x00cccf01,
-	0xf41fccc8,
-	0x00f8f31b,
-/* 0x00d0: wait_donez */
-	0x99f094bd,
-	0x0007f100,
-	0x0203f00f,
-	0xbd0009d0,
-	0x0007f104,
-	0x0203f006,
-	0xbd000ad0,
-/* 0x00ed: wait_donez_ne */
-	0x0087f104,
-	0x0183f000,
-	0xff0088cf,
-	0x1bf4888a,
-	0xf094bdf3,
-	0x07f10099,
-	0x03f01700,
-	0x0009d002,
-	0x00f804bd,
-/* 0x0110: wait_doneo */
+	0xc9f01fc9,
+	0x0007f11e,
+	0x0103f0ca,
+	0xbd000cd0,
+/* 0x00cd: nv_wr32_wait */
+	0x00c7f104,
+	0x01c3f0ca,
+	0xc800cccf,
+	0x1bf41fcc,
+/* 0x00df: wait_donez */
+	0xbd00f8f3,
+	0x0099f094,
+	0x0f0007f1,
+	0xd00203f0,
+	0x04bd0009,
+	0x060007f1,
+	0xd00203f0,
+	0x04bd000a,
+/* 0x00fc: wait_donez_ne */
+	0x000087f1,
+	0xcf0183f0,
+	0x8aff0088,
+	0xf31bf488,
 	0x99f094bd,
 	0x0007f100,
-	0x0203f00f,
+	0x0203f017,
 	0xbd0009d0,
-	0x0007f104,
-	0x0203f006,
-	0xbd000ad0,
-/* 0x012d: wait_doneo_e */
-	0x0087f104,
-	0x0183f000,
-	0xff0088cf,
-	0x0bf4888a,
-	0xf094bdf3,
-	0x07f10099,
-	0x03f01700,
-	0x0009d002,
-	0x00f804bd,
-/* 0x0150: mmctx_size */
-/* 0x0152: nv_mmctx_size_loop */
-	0xe89894bd,
-	0x1a85b600,
-	0xb60180b6,
-	0x98bb0284,
-	0x04e0b600,
-	0xf404efb8,
-	0x9fb9eb1b,
-/* 0x016f: mmctx_xfer */
-	0xbd00f802,
-	0x0199f094,
+/* 0x011f: wait_doneo */
+	0xbd00f804,
+	0x0099f094,
 	0x0f0007f1,
 	0xd00203f0,
 	0x04bd0009,
-	0xbbfd94bd,
-	0x120bf405,
-	0xc40007f1,
-	0xd00103f0,
-	0x04bd000b,
-/* 0x0197: mmctx_base_disabled */
-	0xfd0099f0,
-	0x0bf405ee,
-	0x0007f11e,
-	0x0103f0c6,
-	0xbd000ed0,
-	0x0007f104,
-	0x0103f0c7,
-	0xbd000fd0,
-	0x0199f004,
-/* 0x01b8: mmctx_multi_disabled */
-	0xb600abc8,
-	0xb9f010b4,
-	0x01aec80c,
-	0xfd11e4b6,
-	0x07f105be,
-	0x03f0c500,
-	0x000bd001,
-/* 0x01d6: mmctx_exec_loop */
-/* 0x01d6: mmctx_wait_free */
-	0xe7f104bd,
-	0xe3f0c500,
-	0x00eecf01,
-	0xf41fe4f0,
-	0xce98f30b,
-	0x05e9fd00,
-	0xc80007f1,
+	0x060007f1,
+	0xd00203f0,
+	0x04bd000a,
+/* 0x013c: wait_doneo_e */
+	0x000087f1,
+	0xcf0183f0,
+	0x8aff0088,
+	0xf30bf488,
+	0x99f094bd,
+	0x0007f100,
+	0x0203f017,
+	0xbd0009d0,
+/* 0x015f: mmctx_size */
+	0xbd00f804,
+/* 0x0161: nv_mmctx_size_loop */
+	0x00e89894,
+	0xb61a85b6,
+	0x84b60180,
+	0x0098bb02,
+	0xb804e0b6,
+	0x1bf404ef,
+	0x029fb9eb,
+/* 0x017e: mmctx_xfer */
+	0x94bd00f8,
+	0xf10199f0,
+	0xf00f0007,
+	0x09d00203,
+	0xbd04bd00,
+	0x05bbfd94,
+	0xf1120bf4,
+	0xf0c40007,
+	0x0bd00103,
+	0xf004bd00,
+/* 0x01a6: mmctx_base_disabled */
+	0xeefd0099,
+	0x1e0bf405,
+	0xc60007f1,
 	0xd00103f0,
 	0x04bd000e,
-	0xb804c0b6,
-	0x1bf404cd,
-	0x02abc8d8,
-/* 0x0207: mmctx_fini_wait */
-	0xf11f1bf4,
-	0xf0c500b7,
-	0xbbcf01b3,
-	0x1fb4f000,
-	0xf410b4b0,
-	0xa7f0f01b,
-	0xd021f405,
-/* 0x0223: mmctx_stop */
-	0xc82b0ef4,
+	0xc70007f1,
+	0xd00103f0,
+	0x04bd000f,
+/* 0x01c7: mmctx_multi_disabled */
+	0xc80199f0,
 	0xb4b600ab,
 	0x0cb9f010,
-	0xf112b9f0,
-	0xf0c50007,
-	0x0bd00103,
-/* 0x023b: mmctx_stop_wait */
-	0xf104bd00,
-	0xf0c500b7,
-	0xbbcf01b3,
-	0x12bbc800,
-/* 0x024b: mmctx_done */
-	0xbdf31bf4,
-	0x0199f094,
-	0x170007f1,
+	0xb601aec8,
+	0xbefd11e4,
+	0x0007f105,
+	0x0103f0c5,
+	0xbd000bd0,
+/* 0x01e5: mmctx_exec_loop */
+/* 0x01e5: mmctx_wait_free */
+	0x00e7f104,
+	0x01e3f0c5,
+	0xf000eecf,
+	0x0bf41fe4,
+	0x00ce98f3,
+	0xf105e9fd,
+	0xf0c80007,
+	0x0ed00103,
+	0xb604bd00,
+	0xcdb804c0,
+	0xd81bf404,
+	0xf402abc8,
+/* 0x0216: mmctx_fini_wait */
+	0xb7f11f1b,
+	0xb3f0c500,
+	0x00bbcf01,
+	0xb01fb4f0,
+	0x1bf410b4,
+	0x05a7f0f0,
+	0xf4df21f4,
+/* 0x0232: mmctx_stop */
+	0xabc82b0e,
+	0x10b4b600,
+	0xf00cb9f0,
+	0x07f112b9,
+	0x03f0c500,
+	0x000bd001,
+/* 0x024a: mmctx_stop_wait */
+	0xb7f104bd,
+	0xb3f0c500,
+	0x00bbcf01,
+	0xf412bbc8,
+/* 0x025a: mmctx_done */
+	0x94bdf31b,
+	0xf10199f0,
+	0xf0170007,
+	0x09d00203,
+	0xf804bd00,
+/* 0x026d: strand_wait */
+	0xf0a0f900,
+	0x21f402a7,
+	0xf8a0fcdf,
+/* 0x0279: strand_pre */
+	0x0c97f000,
+	0x4afc07f1,
 	0xd00203f0,
 	0x04bd0009,
-/* 0x025e: strand_wait */
-	0xa0f900f8,
-	0xf402a7f0,
-	0xa0fcd021,
-/* 0x026a: strand_pre */
+	0x026d21f5,
+/* 0x028e: strand_post */
 	0x97f000f8,
-	0xfc07f10c,
+	0xfc07f10d,
 	0x0203f04a,
 	0xbd0009d0,
-	0x5e21f504,
-/* 0x027f: strand_post */
+	0x6d21f504,
+/* 0x02a3: strand_set */
 	0xf000f802,
-	0x07f10d97,
-	0x03f04afc,
-	0x0009d002,
-	0x21f504bd,
-	0x00f8025e,
-/* 0x0294: strand_set */
-	0xf10fc7f0,
-	0xf04ffc07,
-	0x0cd00203,
-	0xf004bd00,
-	0x07f10bc7,
-	0x03f04afc,
-	0x000cd002,
-	0x07f104bd,
+	0x07f10fc7,
 	0x03f04ffc,
-	0x000ed002,
+	0x000cd002,
 	0xc7f004bd,
-	0xfc07f10a,
+	0xfc07f10b,
 	0x0203f04a,
 	0xbd000cd0,
-	0x5e21f504,
-/* 0x02d3: strand_ctx_init */
-	0xbd00f802,
-	0x0399f094,
-	0x0f0007f1,
-	0xd00203f0,
-	0x04bd0009,
-	0x026a21f5,
-	0xf503e7f0,
-	0xbd029421,
-	0xfc07f1c4,
-	0x0203f047,
-	0xbd000cd0,
-	0x01c7f004,
+	0xfc07f104,
+	0x0203f04f,
+	0xbd000ed0,
+	0x0ac7f004,
 	0x4afc07f1,
 	0xd00203f0,
 	0x04bd000c,
-	0x025e21f5,
-	0xf1010c92,
-	0xf046fc07,
+	0x026d21f5,
+/* 0x02e2: strand_ctx_init */
+	0x94bd00f8,
+	0xf10399f0,
+	0xf00f0007,
+	0x09d00203,
+	0xf504bd00,
+	0xf0027921,
+	0x21f503e7,
+	0xc4bd02a3,
+	0x47fc07f1,
+	0xd00203f0,
+	0x04bd000c,
+	0xf101c7f0,
+	0xf04afc07,
 	0x0cd00203,
-	0xf004bd00,
-	0x07f102c7,
-	0x03f04afc,
+	0xf504bd00,
+	0x92026d21,
+	0x07f1010c,
+	0x03f046fc,
 	0x000cd002,
-	0x21f504bd,
-	0x21f5025e,
-	0x87f1027f,
-	0x83f04200,
-	0x0097f102,
-	0x0293f020,
-	0x950099cf,
-/* 0x034a: ctx_init_strand_loop */
-	0x8ed008fe,
-	0x408ed000,
-	0xb6808acf,
-	0xa0b606a5,
-	0x00eabb01,
-	0xb60480b6,
-	0x1bf40192,
-	0x08e4b6e8,
-	0xbdf2efbc,
-	0x0399f094,
-	0x170007f1,
-	0xd00203f0,
-	0x04bd0009,
-/* 0x037e: error */
-	0xe0f900f8,
-	0xf102ffb9,
-	0xf09814e7,
-	0x21f440e3,
-	0x01f7f09d,
-	0xf102ffb9,
-	0xf09c1ce7,
-	0x21f440e3,
-	0xf8e0fc9d,
-/* 0x03a1: init */
-	0xf104bd00,
-	0xf0420017,
-	0x11cf0013,
-	0x0911e700,
-	0x0814b601,
-	0xf00014fe,
-	0x07f10227,
-	0x03f01200,
-	0x0002d000,
+	0xc7f004bd,
+	0xfc07f102,
+	0x0203f04a,
+	0xbd000cd0,
+	0x6d21f504,
+	0x8e21f502,
+	0x0087f102,
+	0x0283f042,
+	0x200097f1,
+	0xcf0293f0,
+	0xfe950099,
+/* 0x0359: ctx_init_strand_loop */
+	0x008ed008,
+	0xcf408ed0,
+	0xa5b6808a,
+	0x01a0b606,
+	0xb600eabb,
+	0x92b60480,
+	0xe81bf401,
+	0xbc08e4b6,
+	0x94bdf2ef,
+	0xf10399f0,
+	0xf0170007,
+	0x09d00203,
+	0xf804bd00,
+/* 0x038d: error */
+	0xb9e0f900,
+	0xe7f102ff,
+	0xe3f09814,
+	0xac21f440,
+	0xb901f7f0,
+	0xe7f102ff,
+	0xe3f09c1c,
+	0xac21f440,
+	0x00f8e0fc,
+/* 0x03b0: init */
 	0x17f104bd,
-	0x10fe04f8,
-	0x0007f100,
-	0x0003f007,
-	0xbd0000d0,
-	0x0427f004,
-	0x040007f1,
-	0xd00003f0,
-	0x04bd0002,
-	0xf11031f4,
-	0xf0820027,
-	0x22cf0123,
-	0x0137f000,
-	0xbb1f24f0,
-	0x32b60432,
-	0x05028001,
-	0xf1060380,
-	0xf0860027,
-	0x22cf0123,
-	0x04028000,
-	0xf10f24b6,
-	0xf0c90007,
-	0x02d00103,
-	0xf104bd00,
-	0xf0010027,
-	0x22cf0223,
-	0x9534bd00,
-	0x07f10825,
-	0x03f0c000,
-	0x0005d001,
-	0x07f104bd,
-	0x03f0c100,
-	0x0005d001,
-	0x0e9804bd,
-	0x010f9800,
-	0x015021f5,
-	0xbb002fbb,
-	0x0e98003f,
-	0x020f9801,
-	0x015021f5,
-	0xfd050e98,
-	0x2ebb00ef,
-	0x003ebb00,
-	0xf10235b6,
-	0xf0d30007,
-	0x03d00103,
-	0xb604bd00,
-	0x35b60825,
-	0x0120b606,
-	0xb60130b6,
-	0x34b60824,
-	0x022fb908,
-	0x02d321f5,
-	0xbb002fbb,
-	0x07f1003f,
-	0x03f00100,
-	0x0003d002,
-	0x24bd04bd,
-	0xf11f29f0,
-	0xf0080007,
-	0x02d00203,
-/* 0x04bb: main */
-	0xf404bd00,
-	0x28f40031,
-	0x1cd7f000,
-	0xf43921f4,
-	0xe4b0f401,
-	0x1e18f404,
-	0xf00181fe,
-	0x20bd0627,
-	0xb60412fd,
-	0x1efd01e4,
-	0x0018fe05,
-	0x05b421f5,
-/* 0x04eb: main_not_ctx_xfer */
-	0x94d30ef4,
-	0xf5f010ef,
-	0x7e21f501,
-	0xc60ef403,
-/* 0x04f8: ih */
-	0x80f900f9,
-	0xf90188fe,
-	0xf990f980,
-	0xf9b0f9a0,
-	0xf9e0f9d0,
-	0xf104bdf0,
-	0xf00200a7,
-	0xaacf00a3,
-	0x04abc400,
-	0xf02c0bf4,
-	0xe7f11cd7,
-	0xe3f01a00,
-	0x00eecf00,
-	0x1900f7f1,
-	0xcf00f3f0,
-	0x21f400ff,
-	0x01e7f004,
-	0x1d0007f1,
-	0xd00003f0,
-	0x04bd000e,
-/* 0x0548: ih_no_fifo */
+	0x13f04200,
+	0x0011cf00,
+	0x010911e7,
+	0xfe0814b6,
+	0x27f00014,
+	0x0007f102,
+	0x0003f012,
+	0xbd0002d0,
+	0x0032f404,
+	0x050717f1,
+	0xf10010fe,
+	0xf0070007,
+	0x00d00003,
+	0xf004bd00,
+	0x07f10427,
+	0x03f00400,
+	0x0002d000,
+	0x31f404bd,
+	0x0027f110,
+	0x0123f082,
+	0xf00022cf,
+	0x24f00137,
+	0x0432bb1f,
+	0x800132b6,
+	0x03800502,
+	0x0027f106,
+	0x0123f086,
+	0x800022cf,
+	0x24b60402,
+	0x0007f10f,
+	0x0103f0c9,
+	0xbd0002d0,
+	0x0027f104,
+	0x0223f001,
+	0xbd0022cf,
+	0x08259534,
+	0xc00007f1,
+	0xd00103f0,
+	0x04bd0005,
+	0xc10007f1,
+	0xd00103f0,
+	0x04bd0005,
+	0x98000e98,
+	0x21f5010f,
+	0x2fbb015f,
+	0x003fbb00,
+	0x98010e98,
+	0x21f5020f,
+	0x0e98015f,
+	0x00effd05,
+	0xbb002ebb,
+	0x35b6003e,
+	0x0007f102,
+	0x0103f0d3,
+	0xbd0003d0,
+	0x0825b604,
+	0xb60635b6,
+	0x30b60120,
+	0x0824b601,
+	0xb90834b6,
+	0x21f5022f,
+	0x2fbb02e2,
+	0x003fbb00,
 	0x010007f1,
-	0xd00003f0,
-	0x04bd000a,
-	0xe0fcf0fc,
-	0xb0fcd0fc,
-	0x90fca0fc,
-	0x88fe80fc,
-	0xfc80fc00,
-	0x0032f400,
-/* 0x056e: hub_barrier_done */
-	0xf7f001f8,
-	0x040e9801,
-	0xb904febb,
-	0xe7f102ff,
-	0xe3f09418,
-	0x9d21f440,
-/* 0x0586: ctx_redswitch */
-	0xf7f000f8,
-	0x0007f120,
+	0xd00203f0,
+	0x04bd0003,
+	0x29f024bd,
+	0x0007f11f,
+	0x0203f008,
+	0xbd0002d0,
+/* 0x04cd: main */
+	0x0028f404,
+	0xf41cd7f0,
+	0x01f43921,
+	0x04e4b0f7,
+	0xfe1e18f4,
+	0x27f00181,
+	0xfd20bd06,
+	0xe4b60412,
+	0x051efd01,
+	0xf50018fe,
+	0xf405c321,
+/* 0x04fa: main_not_ctx_xfer */
+	0xef94d60e,
+	0x01f5f010,
+	0x038d21f5,
+/* 0x0507: ih */
+	0xf9c90ef4,
+	0xfe80f900,
+	0x80f90188,
+	0xa0f990f9,
+	0xd0f9b0f9,
+	0xf0f9e0f9,
+	0xa7f104bd,
+	0xa3f00200,
+	0x00aacf00,
+	0xf404abc4,
+	0xd7f02c0b,
+	0x00e7f11c,
+	0x00e3f01a,
+	0xf100eecf,
+	0xf01900f7,
+	0xffcf00f3,
+	0x0421f400,
+	0xf101e7f0,
+	0xf01d0007,
+	0x0ed00003,
+/* 0x0557: ih_no_fifo */
+	0xf104bd00,
+	0xf0010007,
+	0x0ad00003,
+	0xfc04bd00,
+	0xfce0fcf0,
+	0xfcb0fcd0,
+	0xfc90fca0,
+	0x0088fe80,
+	0x00fc80fc,
+	0xf80032f4,
+/* 0x057d: hub_barrier_done */
+	0x01f7f001,
+	0xbb040e98,
+	0xffb904fe,
+	0x18e7f102,
+	0x40e3f094,
+	0xf8ac21f4,
+/* 0x0595: ctx_redswitch */
+	0x20f7f000,
+	0x850007f1,
+	0xd00103f0,
+	0x04bd000f,
+/* 0x05a7: ctx_redswitch_delay */
+	0xb608e7f0,
+	0x1bf401e2,
+	0x00f5f1fd,
+	0x00f5f108,
+	0x0007f102,
 	0x0103f085,
 	0xbd000fd0,
-	0x08e7f004,
-/* 0x0598: ctx_redswitch_delay */
-	0xf401e2b6,
-	0xf5f1fd1b,
-	0xf5f10800,
-	0x07f10200,
-	0x03f08500,
-	0x000fd001,
-	0x00f804bd,
-/* 0x05b4: ctx_xfer */
-	0x810007f1,
+/* 0x05c3: ctx_xfer */
+	0xf100f804,
+	0xf0810007,
+	0x0fd00203,
+	0xf404bd00,
+	0x21f50711,
+/* 0x05d6: ctx_xfer_not_load */
+	0x21f50595,
+	0x24bd0279,
+	0x47fc07f1,
 	0xd00203f0,
-	0x04bd000f,
-	0xf50711f4,
-/* 0x05c7: ctx_xfer_not_load */
-	0xf5058621,
-	0xbd026a21,
-	0xfc07f124,
-	0x0203f047,
-	0xbd0002d0,
-	0x012cf004,
-	0xf10320b6,
-	0xf04afc07,
-	0x02d00203,
-	0xf004bd00,
-	0xa5f001ac,
-	0x00b7f102,
-	0x50b3f000,
-	0xb6040c98,
-	0xbcbb0fc4,
-	0x000c9800,
-	0xf0010d98,
-	0x21f500e7,
-	0xacf0016f,
-	0x04a5f001,
-	0x4000b7f1,
+	0x04bd0002,
+	0xb6012cf0,
+	0x07f10320,
+	0x03f04afc,
+	0x0002d002,
+	0xacf004bd,
+	0x02a5f001,
+	0x0000b7f1,
 	0x9850b3f0,
 	0xc4b6040c,
 	0x00bcbb0f,
-	0x98010c98,
-	0x0f98020d,
-	0x00e7f106,
-	0x6f21f508,
-	0x5e21f501,
-	0x0601f402,
-/* 0x063f: ctx_xfer_post */
-	0xf50712f4,
-/* 0x0643: ctx_xfer_done */
-	0xf5027f21,
-	0xf8056e21,
-	0x00000000,
-	0x00000000,
-	0x00000000,
-	0x00000000,
+	0x98000c98,
+	0xe7f0010d,
+	0x7e21f500,
+	0x01acf001,
+	0xf104a5f0,
+	0xf04000b7,
+	0x0c9850b3,
+	0x0fc4b604,
+	0x9800bcbb,
+	0x0d98010c,
+	0x060f9802,
+	0x0800e7f1,
+	0x017e21f5,
+	0x026d21f5,
+	0xf40601f4,
+/* 0x064e: ctx_xfer_post */
+	0x21f50712,
+/* 0x0652: ctx_xfer_done */
+	0x21f5028e,
+	0x00f8057d,
 	0x00000000,
 	0x00000000,
 	0x00000000,
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgf117.fuc3.h b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgf117.fuc3.h
index 03381b1..430547b 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgf117.fuc3.h
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgf117.fuc3.h
@@ -41,14 +41,14 @@ uint32_t gf117_grgpc_data[] = {
 };
 
 uint32_t gf117_grgpc_code[] = {
-	0x03a10ef5,
+	0x03b00ef5,
 /* 0x0004: queue_put */
 	0x9800d898,
 	0x86f001d9,
 	0x0489b808,
 	0xf00c1bf4,
 	0x21f502f7,
-	0x00f8037e,
+	0x00f8038d,
 /* 0x001c: queue_put_next */
 	0xb60798c4,
 	0x8dbb0384,
@@ -59,467 +59,467 @@ uint32_t gf117_grgpc_code[] = {
 	0xf801d980,
 /* 0x0039: queue_get */
 	0x0131f400,
-	0x9800d898,
-	0x89b801d9,
-	0x210bf404,
-	0xb60789c4,
-	0x9dbb0394,
-	0x0890b600,
-	0x98009e98,
-	0x80b6019f,
-	0x0f84f001,
-	0xf400d880,
-/* 0x0066: queue_get_done */
-	0x00f80132,
-/* 0x0068: nv_rd32 */
+	0x980031f4,
+	0xd99800d8,
+	0x0489b801,
+	0xc42d0bf4,
+	0x94b60789,
+	0x009dbb03,
+	0x980890b6,
+	0x9f98009e,
+	0x0180b601,
+	0x800f84f0,
+	0x32f400d8,
+	0x01d99801,
+	0xf40489b8,
+	0x32f4060b,
+/* 0x0075: queue_get_done */
+/* 0x0077: nv_rd32 */
+	0xb900f800,
+	0xc9f002ec,
+	0x0007f11f,
+	0x0103f0ca,
+	0xbd000cd0,
+/* 0x0089: nv_rd32_wait */
+	0x00c7f104,
+	0x01c3f0ca,
+	0xc800cccf,
+	0x1bf41fcc,
+	0x06a7f0f3,
+	0x011f21f5,
+	0xcb00f7f1,
+	0xcf01f3f0,
+	0x00f800ff,
+/* 0x00ac: nv_wr32 */
+	0xcc0007f1,
+	0xd00103f0,
+	0x04bd000f,
 	0xf002ecb9,
-	0x07f11fc9,
-	0x03f0ca00,
-	0x000cd001,
-/* 0x007a: nv_rd32_wait */
-	0xc7f104bd,
-	0xc3f0ca00,
-	0x00cccf01,
-	0xf41fccc8,
-	0xa7f0f31b,
-	0x1021f506,
-	0x00f7f101,
-	0x01f3f0cb,
-	0xf800ffcf,
-/* 0x009d: nv_wr32 */
-	0x0007f100,
-	0x0103f0cc,
-	0xbd000fd0,
-	0x02ecb904,
-	0xf01fc9f0,
-	0x07f11ec9,
-	0x03f0ca00,
-	0x000cd001,
-/* 0x00be: nv_wr32_wait */
-	0xc7f104bd,
-	0xc3f0ca00,
-	0x00cccf01,
-	0xf41fccc8,
-	0x00f8f31b,
-/* 0x00d0: wait_donez */
-	0x99f094bd,
-	0x0007f100,
-	0x0203f00f,
-	0xbd0009d0,
-	0x0007f104,
-	0x0203f006,
-	0xbd000ad0,
-/* 0x00ed: wait_donez_ne */
-	0x0087f104,
-	0x0183f000,
-	0xff0088cf,
-	0x1bf4888a,
-	0xf094bdf3,
-	0x07f10099,
-	0x03f01700,
-	0x0009d002,
-	0x00f804bd,
-/* 0x0110: wait_doneo */
+	0xc9f01fc9,
+	0x0007f11e,
+	0x0103f0ca,
+	0xbd000cd0,
+/* 0x00cd: nv_wr32_wait */
+	0x00c7f104,
+	0x01c3f0ca,
+	0xc800cccf,
+	0x1bf41fcc,
+/* 0x00df: wait_donez */
+	0xbd00f8f3,
+	0x0099f094,
+	0x0f0007f1,
+	0xd00203f0,
+	0x04bd0009,
+	0x060007f1,
+	0xd00203f0,
+	0x04bd000a,
+/* 0x00fc: wait_donez_ne */
+	0x000087f1,
+	0xcf0183f0,
+	0x8aff0088,
+	0xf31bf488,
 	0x99f094bd,
 	0x0007f100,
-	0x0203f00f,
+	0x0203f017,
 	0xbd0009d0,
-	0x0007f104,
-	0x0203f006,
-	0xbd000ad0,
-/* 0x012d: wait_doneo_e */
-	0x0087f104,
-	0x0183f000,
-	0xff0088cf,
-	0x0bf4888a,
-	0xf094bdf3,
-	0x07f10099,
-	0x03f01700,
-	0x0009d002,
-	0x00f804bd,
-/* 0x0150: mmctx_size */
-/* 0x0152: nv_mmctx_size_loop */
-	0xe89894bd,
-	0x1a85b600,
-	0xb60180b6,
-	0x98bb0284,
-	0x04e0b600,
-	0xf404efb8,
-	0x9fb9eb1b,
-/* 0x016f: mmctx_xfer */
-	0xbd00f802,
-	0x0199f094,
+/* 0x011f: wait_doneo */
+	0xbd00f804,
+	0x0099f094,
 	0x0f0007f1,
 	0xd00203f0,
 	0x04bd0009,
-	0xbbfd94bd,
-	0x120bf405,
-	0xc40007f1,
-	0xd00103f0,
-	0x04bd000b,
-/* 0x0197: mmctx_base_disabled */
-	0xfd0099f0,
-	0x0bf405ee,
-	0x0007f11e,
-	0x0103f0c6,
-	0xbd000ed0,
-	0x0007f104,
-	0x0103f0c7,
-	0xbd000fd0,
-	0x0199f004,
-/* 0x01b8: mmctx_multi_disabled */
-	0xb600abc8,
-	0xb9f010b4,
-	0x01aec80c,
-	0xfd11e4b6,
-	0x07f105be,
-	0x03f0c500,
-	0x000bd001,
-/* 0x01d6: mmctx_exec_loop */
-/* 0x01d6: mmctx_wait_free */
-	0xe7f104bd,
-	0xe3f0c500,
-	0x00eecf01,
-	0xf41fe4f0,
-	0xce98f30b,
-	0x05e9fd00,
-	0xc80007f1,
+	0x060007f1,
+	0xd00203f0,
+	0x04bd000a,
+/* 0x013c: wait_doneo_e */
+	0x000087f1,
+	0xcf0183f0,
+	0x8aff0088,
+	0xf30bf488,
+	0x99f094bd,
+	0x0007f100,
+	0x0203f017,
+	0xbd0009d0,
+/* 0x015f: mmctx_size */
+	0xbd00f804,
+/* 0x0161: nv_mmctx_size_loop */
+	0x00e89894,
+	0xb61a85b6,
+	0x84b60180,
+	0x0098bb02,
+	0xb804e0b6,
+	0x1bf404ef,
+	0x029fb9eb,
+/* 0x017e: mmctx_xfer */
+	0x94bd00f8,
+	0xf10199f0,
+	0xf00f0007,
+	0x09d00203,
+	0xbd04bd00,
+	0x05bbfd94,
+	0xf1120bf4,
+	0xf0c40007,
+	0x0bd00103,
+	0xf004bd00,
+/* 0x01a6: mmctx_base_disabled */
+	0xeefd0099,
+	0x1e0bf405,
+	0xc60007f1,
 	0xd00103f0,
 	0x04bd000e,
-	0xb804c0b6,
-	0x1bf404cd,
-	0x02abc8d8,
-/* 0x0207: mmctx_fini_wait */
-	0xf11f1bf4,
-	0xf0c500b7,
-	0xbbcf01b3,
-	0x1fb4f000,
-	0xf410b4b0,
-	0xa7f0f01b,
-	0xd021f405,
-/* 0x0223: mmctx_stop */
-	0xc82b0ef4,
+	0xc70007f1,
+	0xd00103f0,
+	0x04bd000f,
+/* 0x01c7: mmctx_multi_disabled */
+	0xc80199f0,
 	0xb4b600ab,
 	0x0cb9f010,
-	0xf112b9f0,
-	0xf0c50007,
-	0x0bd00103,
-/* 0x023b: mmctx_stop_wait */
-	0xf104bd00,
-	0xf0c500b7,
-	0xbbcf01b3,
-	0x12bbc800,
-/* 0x024b: mmctx_done */
-	0xbdf31bf4,
-	0x0199f094,
-	0x170007f1,
+	0xb601aec8,
+	0xbefd11e4,
+	0x0007f105,
+	0x0103f0c5,
+	0xbd000bd0,
+/* 0x01e5: mmctx_exec_loop */
+/* 0x01e5: mmctx_wait_free */
+	0x00e7f104,
+	0x01e3f0c5,
+	0xf000eecf,
+	0x0bf41fe4,
+	0x00ce98f3,
+	0xf105e9fd,
+	0xf0c80007,
+	0x0ed00103,
+	0xb604bd00,
+	0xcdb804c0,
+	0xd81bf404,
+	0xf402abc8,
+/* 0x0216: mmctx_fini_wait */
+	0xb7f11f1b,
+	0xb3f0c500,
+	0x00bbcf01,
+	0xb01fb4f0,
+	0x1bf410b4,
+	0x05a7f0f0,
+	0xf4df21f4,
+/* 0x0232: mmctx_stop */
+	0xabc82b0e,
+	0x10b4b600,
+	0xf00cb9f0,
+	0x07f112b9,
+	0x03f0c500,
+	0x000bd001,
+/* 0x024a: mmctx_stop_wait */
+	0xb7f104bd,
+	0xb3f0c500,
+	0x00bbcf01,
+	0xf412bbc8,
+/* 0x025a: mmctx_done */
+	0x94bdf31b,
+	0xf10199f0,
+	0xf0170007,
+	0x09d00203,
+	0xf804bd00,
+/* 0x026d: strand_wait */
+	0xf0a0f900,
+	0x21f402a7,
+	0xf8a0fcdf,
+/* 0x0279: strand_pre */
+	0x0c97f000,
+	0x4afc07f1,
 	0xd00203f0,
 	0x04bd0009,
-/* 0x025e: strand_wait */
-	0xa0f900f8,
-	0xf402a7f0,
-	0xa0fcd021,
-/* 0x026a: strand_pre */
+	0x026d21f5,
+/* 0x028e: strand_post */
 	0x97f000f8,
-	0xfc07f10c,
+	0xfc07f10d,
 	0x0203f04a,
 	0xbd0009d0,
-	0x5e21f504,
-/* 0x027f: strand_post */
+	0x6d21f504,
+/* 0x02a3: strand_set */
 	0xf000f802,
-	0x07f10d97,
-	0x03f04afc,
-	0x0009d002,
-	0x21f504bd,
-	0x00f8025e,
-/* 0x0294: strand_set */
-	0xf10fc7f0,
-	0xf04ffc07,
-	0x0cd00203,
-	0xf004bd00,
-	0x07f10bc7,
-	0x03f04afc,
-	0x000cd002,
-	0x07f104bd,
+	0x07f10fc7,
 	0x03f04ffc,
-	0x000ed002,
+	0x000cd002,
 	0xc7f004bd,
-	0xfc07f10a,
+	0xfc07f10b,
 	0x0203f04a,
 	0xbd000cd0,
-	0x5e21f504,
-/* 0x02d3: strand_ctx_init */
-	0xbd00f802,
-	0x0399f094,
-	0x0f0007f1,
-	0xd00203f0,
-	0x04bd0009,
-	0x026a21f5,
-	0xf503e7f0,
-	0xbd029421,
-	0xfc07f1c4,
-	0x0203f047,
-	0xbd000cd0,
-	0x01c7f004,
+	0xfc07f104,
+	0x0203f04f,
+	0xbd000ed0,
+	0x0ac7f004,
 	0x4afc07f1,
 	0xd00203f0,
 	0x04bd000c,
-	0x025e21f5,
-	0xf1010c92,
-	0xf046fc07,
+	0x026d21f5,
+/* 0x02e2: strand_ctx_init */
+	0x94bd00f8,
+	0xf10399f0,
+	0xf00f0007,
+	0x09d00203,
+	0xf504bd00,
+	0xf0027921,
+	0x21f503e7,
+	0xc4bd02a3,
+	0x47fc07f1,
+	0xd00203f0,
+	0x04bd000c,
+	0xf101c7f0,
+	0xf04afc07,
 	0x0cd00203,
-	0xf004bd00,
-	0x07f102c7,
-	0x03f04afc,
+	0xf504bd00,
+	0x92026d21,
+	0x07f1010c,
+	0x03f046fc,
 	0x000cd002,
-	0x21f504bd,
-	0x21f5025e,
-	0x87f1027f,
-	0x83f04200,
-	0x0097f102,
-	0x0293f020,
-	0x950099cf,
-/* 0x034a: ctx_init_strand_loop */
-	0x8ed008fe,
-	0x408ed000,
-	0xb6808acf,
-	0xa0b606a5,
-	0x00eabb01,
-	0xb60480b6,
-	0x1bf40192,
-	0x08e4b6e8,
-	0xbdf2efbc,
-	0x0399f094,
-	0x170007f1,
-	0xd00203f0,
-	0x04bd0009,
-/* 0x037e: error */
-	0xe0f900f8,
-	0xf102ffb9,
-	0xf09814e7,
-	0x21f440e3,
-	0x01f7f09d,
-	0xf102ffb9,
-	0xf09c1ce7,
-	0x21f440e3,
-	0xf8e0fc9d,
-/* 0x03a1: init */
-	0xf104bd00,
-	0xf0420017,
-	0x11cf0013,
-	0x0911e700,
-	0x0814b601,
-	0xf00014fe,
-	0x07f10227,
-	0x03f01200,
-	0x0002d000,
+	0xc7f004bd,
+	0xfc07f102,
+	0x0203f04a,
+	0xbd000cd0,
+	0x6d21f504,
+	0x8e21f502,
+	0x0087f102,
+	0x0283f042,
+	0x200097f1,
+	0xcf0293f0,
+	0xfe950099,
+/* 0x0359: ctx_init_strand_loop */
+	0x008ed008,
+	0xcf408ed0,
+	0xa5b6808a,
+	0x01a0b606,
+	0xb600eabb,
+	0x92b60480,
+	0xe81bf401,
+	0xbc08e4b6,
+	0x94bdf2ef,
+	0xf10399f0,
+	0xf0170007,
+	0x09d00203,
+	0xf804bd00,
+/* 0x038d: error */
+	0xb9e0f900,
+	0xe7f102ff,
+	0xe3f09814,
+	0xac21f440,
+	0xb901f7f0,
+	0xe7f102ff,
+	0xe3f09c1c,
+	0xac21f440,
+	0x00f8e0fc,
+/* 0x03b0: init */
 	0x17f104bd,
-	0x10fe0545,
-	0x0007f100,
-	0x0003f007,
-	0xbd0000d0,
-	0x0427f004,
-	0x040007f1,
-	0xd00003f0,
-	0x04bd0002,
-	0xf11031f4,
-	0xf0820027,
-	0x22cf0123,
-	0x0137f000,
-	0xbb1f24f0,
-	0x32b60432,
-	0x05028001,
-	0xf1060380,
-	0xf0860027,
-	0x22cf0123,
-	0x04028000,
-	0xf10f24b6,
-	0xf0c90007,
-	0x02d00103,
+	0x13f04200,
+	0x0011cf00,
+	0x010911e7,
+	0xfe0814b6,
+	0x27f00014,
+	0x0007f102,
+	0x0003f012,
+	0xbd0002d0,
+	0x0032f404,
+	0x055417f1,
+	0xf10010fe,
+	0xf0070007,
+	0x00d00003,
+	0xf004bd00,
+	0x07f10427,
+	0x03f00400,
+	0x0002d000,
+	0x31f404bd,
+	0x0027f110,
+	0x0123f082,
+	0xf00022cf,
+	0x24f00137,
+	0x0432bb1f,
+	0x800132b6,
+	0x03800502,
+	0x0027f106,
+	0x0123f086,
+	0x800022cf,
+	0x24b60402,
+	0x0007f10f,
+	0x0103f0c9,
+	0xbd0002d0,
+	0x30e7f104,
+	0x50e3f00c,
+	0xbd01e5f0,
+	0xbd34bd24,
+/* 0x0445: init_unk_loop */
+	0x7721f444,
+	0xf400f6b0,
+	0xf7f00f0b,
+	0x04f2bb01,
+	0xb6054ffd,
+/* 0x045a: init_unk_next */
+	0x20b60130,
+	0x04e0b601,
+	0xf40126b0,
+/* 0x0466: init_unk_done */
+	0x0380e21b,
+	0x08048007,
+	0x010027f1,
+	0xcf0223f0,
+	0x34bd0022,
+	0xf1082595,
+	0xf0c00007,
+	0x05d00103,
 	0xf104bd00,
-	0xf00c30e7,
-	0xe5f050e3,
-	0xbd24bd01,
-/* 0x0433: init_unk_loop */
-	0xf444bd34,
-	0xf6b06821,
-	0x0f0bf400,
-	0xbb01f7f0,
-	0x4ffd04f2,
-	0x0130b605,
-/* 0x0448: init_unk_next */
-	0xb60120b6,
-	0x26b004e0,
-	0xe21bf401,
-/* 0x0454: init_unk_done */
-	0x80070380,
-	0x27f10804,
-	0x23f00100,
-	0x0022cf02,
-	0x259534bd,
-	0x0007f108,
-	0x0103f0c0,
-	0xbd0005d0,
-	0x0007f104,
-	0x0103f0c1,
-	0xbd0005d0,
-	0x000e9804,
-	0xf5010f98,
-	0xbb015021,
-	0x3fbb002f,
-	0x010e9800,
-	0xf5020f98,
-	0x98015021,
-	0xeffd050e,
-	0x002ebb00,
-	0x98003ebb,
-	0x0f98020e,
-	0x5021f503,
-	0x070e9801,
+	0xf0c10007,
+	0x05d00103,
+	0x9804bd00,
+	0x0f98000e,
+	0x5f21f501,
+	0x002fbb01,
+	0x98003fbb,
+	0x0f98010e,
+	0x5f21f502,
+	0x050e9801,
 	0xbb00effd,
 	0x3ebb002e,
-	0x0235b600,
-	0xd30007f1,
-	0xd00103f0,
-	0x04bd0003,
-	0xb60825b6,
-	0x20b60635,
-	0x0130b601,
-	0xb60824b6,
-	0x2fb90834,
-	0xd321f502,
-	0x002fbb02,
-	0xf1003fbb,
-	0xf0010007,
-	0x03d00203,
-	0xbd04bd00,
-	0x1f29f024,
-	0x080007f1,
-	0xd00203f0,
-	0x04bd0002,
-/* 0x0508: main */
-	0xf40031f4,
-	0xd7f00028,
-	0x3921f424,
-	0xb0f401f4,
-	0x18f404e4,
-	0x0181fe1e,
-	0xbd0627f0,
-	0x0412fd20,
-	0xfd01e4b6,
-	0x18fe051e,
-	0x0121f500,
-	0xd30ef406,
-/* 0x0538: main_not_ctx_xfer */
-	0xf010ef94,
-	0x21f501f5,
-	0x0ef4037e,
-/* 0x0545: ih */
-	0xf900f9c6,
-	0x0188fe80,
-	0x90f980f9,
-	0xb0f9a0f9,
-	0xe0f9d0f9,
-	0x04bdf0f9,
-	0x0200a7f1,
-	0xcf00a3f0,
-	0xabc400aa,
-	0x2c0bf404,
-	0xf124d7f0,
-	0xf01a00e7,
-	0xeecf00e3,
-	0x00f7f100,
-	0x00f3f019,
-	0xf400ffcf,
-	0xe7f00421,
-	0x0007f101,
-	0x0003f01d,
-	0xbd000ed0,
-/* 0x0595: ih_no_fifo */
-	0x0007f104,
-	0x0003f001,
-	0xbd000ad0,
-	0xfcf0fc04,
-	0xfcd0fce0,
-	0xfca0fcb0,
-	0xfe80fc90,
-	0x80fc0088,
-	0x32f400fc,
-/* 0x05bb: hub_barrier_done */
-	0xf001f800,
-	0x0e9801f7,
-	0x04febb04,
-	0xf102ffb9,
-	0xf09418e7,
-	0x21f440e3,
-/* 0x05d3: ctx_redswitch */
-	0xf000f89d,
-	0x07f120f7,
-	0x03f08500,
-	0x000fd001,
-	0xe7f004bd,
-/* 0x05e5: ctx_redswitch_delay */
-	0x01e2b608,
-	0xf1fd1bf4,
-	0xf10800f5,
-	0xf10200f5,
-	0xf0850007,
-	0x0fd00103,
-	0xf804bd00,
-/* 0x0601: ctx_xfer */
+	0x020e9800,
+	0xf5030f98,
+	0x98015f21,
+	0xeffd070e,
+	0x002ebb00,
+	0xb6003ebb,
+	0x07f10235,
+	0x03f0d300,
+	0x0003d001,
+	0x25b604bd,
+	0x0635b608,
+	0xb60120b6,
+	0x24b60130,
+	0x0834b608,
+	0xf5022fb9,
+	0xbb02e221,
+	0x3fbb002f,
 	0x0007f100,
-	0x0203f081,
-	0xbd000fd0,
-	0x0711f404,
-	0x05d321f5,
-/* 0x0614: ctx_xfer_not_load */
-	0x026a21f5,
-	0x07f124bd,
-	0x03f047fc,
+	0x0203f001,
+	0xbd0003d0,
+	0xf024bd04,
+	0x07f11f29,
+	0x03f00800,
 	0x0002d002,
-	0x2cf004bd,
-	0x0320b601,
-	0x4afc07f1,
+/* 0x051a: main */
+	0x28f404bd,
+	0x24d7f000,
+	0xf43921f4,
+	0xe4b0f701,
+	0x1e18f404,
+	0xf00181fe,
+	0x20bd0627,
+	0xb60412fd,
+	0x1efd01e4,
+	0x0018fe05,
+	0x061021f5,
+/* 0x0547: main_not_ctx_xfer */
+	0x94d60ef4,
+	0xf5f010ef,
+	0x8d21f501,
+	0xc90ef403,
+/* 0x0554: ih */
+	0x80f900f9,
+	0xf90188fe,
+	0xf990f980,
+	0xf9b0f9a0,
+	0xf9e0f9d0,
+	0xf104bdf0,
+	0xf00200a7,
+	0xaacf00a3,
+	0x04abc400,
+	0xf02c0bf4,
+	0xe7f124d7,
+	0xe3f01a00,
+	0x00eecf00,
+	0x1900f7f1,
+	0xcf00f3f0,
+	0x21f400ff,
+	0x01e7f004,
+	0x1d0007f1,
+	0xd00003f0,
+	0x04bd000e,
+/* 0x05a4: ih_no_fifo */
+	0x010007f1,
+	0xd00003f0,
+	0x04bd000a,
+	0xe0fcf0fc,
+	0xb0fcd0fc,
+	0x90fca0fc,
+	0x88fe80fc,
+	0xfc80fc00,
+	0x0032f400,
+/* 0x05ca: hub_barrier_done */
+	0xf7f001f8,
+	0x040e9801,
+	0xb904febb,
+	0xe7f102ff,
+	0xe3f09418,
+	0xac21f440,
+/* 0x05e2: ctx_redswitch */
+	0xf7f000f8,
+	0x0007f120,
+	0x0103f085,
+	0xbd000fd0,
+	0x08e7f004,
+/* 0x05f4: ctx_redswitch_delay */
+	0xf401e2b6,
+	0xf5f1fd1b,
+	0xf5f10800,
+	0x07f10200,
+	0x03f08500,
+	0x000fd001,
+	0x00f804bd,
+/* 0x0610: ctx_xfer */
+	0x810007f1,
 	0xd00203f0,
-	0x04bd0002,
-	0xf001acf0,
-	0xb7f102a5,
-	0xb3f00000,
-	0x040c9850,
-	0xbb0fc4b6,
-	0x0c9800bc,
-	0x010d9800,
-	0xf500e7f0,
-	0xf0016f21,
-	0xb7f101ac,
-	0xb3f04000,
-	0x040c9850,
-	0xbb0fc4b6,
-	0x0c9800bc,
-	0x020d9801,
-	0xf1060f98,
-	0xf50800e7,
-	0xf0016f21,
+	0x04bd000f,
+	0xf50711f4,
+/* 0x0623: ctx_xfer_not_load */
+	0xf505e221,
+	0xbd027921,
+	0xfc07f124,
+	0x0203f047,
+	0xbd0002d0,
+	0x012cf004,
+	0xf10320b6,
+	0xf04afc07,
+	0x02d00203,
+	0xf004bd00,
 	0xa5f001ac,
-	0x00b7f104,
-	0x50b3f030,
+	0x00b7f102,
+	0x50b3f000,
 	0xb6040c98,
 	0xbcbb0fc4,
-	0x020c9800,
-	0x98030d98,
-	0xe7f1080f,
-	0x21f50200,
-	0x21f5016f,
-	0x01f4025e,
-	0x0712f406,
-/* 0x06b0: ctx_xfer_post */
-	0x027f21f5,
-/* 0x06b4: ctx_xfer_done */
-	0x05bb21f5,
-	0x000000f8,
-	0x00000000,
-	0x00000000,
-	0x00000000,
+	0x000c9800,
+	0xf0010d98,
+	0x21f500e7,
+	0xacf0017e,
+	0x00b7f101,
+	0x50b3f040,
+	0xb6040c98,
+	0xbcbb0fc4,
+	0x010c9800,
+	0x98020d98,
+	0xe7f1060f,
+	0x21f50800,
+	0xacf0017e,
+	0x04a5f001,
+	0x3000b7f1,
+	0x9850b3f0,
+	0xc4b6040c,
+	0x00bcbb0f,
+	0x98020c98,
+	0x0f98030d,
+	0x00e7f108,
+	0x7e21f502,
+	0x6d21f501,
+	0x0601f402,
+/* 0x06bf: ctx_xfer_post */
+	0xf50712f4,
+/* 0x06c3: ctx_xfer_done */
+	0xf5028e21,
+	0xf805ca21,
 	0x00000000,
 	0x00000000,
 	0x00000000,
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk104.fuc3.h b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk104.fuc3.h
index 99d9b48..1f2fc8b3 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk104.fuc3.h
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk104.fuc3.h
@@ -41,14 +41,14 @@ uint32_t gk104_grgpc_data[] = {
 };
 
 uint32_t gk104_grgpc_code[] = {
-	0x03a10ef5,
+	0x03b00ef5,
 /* 0x0004: queue_put */
 	0x9800d898,
 	0x86f001d9,
 	0x0489b808,
 	0xf00c1bf4,
 	0x21f502f7,
-	0x00f8037e,
+	0x00f8038d,
 /* 0x001c: queue_put_next */
 	0xb60798c4,
 	0x8dbb0384,
@@ -59,467 +59,467 @@ uint32_t gk104_grgpc_code[] = {
 	0xf801d980,
 /* 0x0039: queue_get */
 	0x0131f400,
-	0x9800d898,
-	0x89b801d9,
-	0x210bf404,
-	0xb60789c4,
-	0x9dbb0394,
-	0x0890b600,
-	0x98009e98,
-	0x80b6019f,
-	0x0f84f001,
-	0xf400d880,
-/* 0x0066: queue_get_done */
-	0x00f80132,
-/* 0x0068: nv_rd32 */
+	0x980031f4,
+	0xd99800d8,
+	0x0489b801,
+	0xc42d0bf4,
+	0x94b60789,
+	0x009dbb03,
+	0x980890b6,
+	0x9f98009e,
+	0x0180b601,
+	0x800f84f0,
+	0x32f400d8,
+	0x01d99801,
+	0xf40489b8,
+	0x32f4060b,
+/* 0x0075: queue_get_done */
+/* 0x0077: nv_rd32 */
+	0xb900f800,
+	0xc9f002ec,
+	0x0007f11f,
+	0x0103f0ca,
+	0xbd000cd0,
+/* 0x0089: nv_rd32_wait */
+	0x00c7f104,
+	0x01c3f0ca,
+	0xc800cccf,
+	0x1bf41fcc,
+	0x06a7f0f3,
+	0x011f21f5,
+	0xcb00f7f1,
+	0xcf01f3f0,
+	0x00f800ff,
+/* 0x00ac: nv_wr32 */
+	0xcc0007f1,
+	0xd00103f0,
+	0x04bd000f,
 	0xf002ecb9,
-	0x07f11fc9,
-	0x03f0ca00,
-	0x000cd001,
-/* 0x007a: nv_rd32_wait */
-	0xc7f104bd,
-	0xc3f0ca00,
-	0x00cccf01,
-	0xf41fccc8,
-	0xa7f0f31b,
-	0x1021f506,
-	0x00f7f101,
-	0x01f3f0cb,
-	0xf800ffcf,
-/* 0x009d: nv_wr32 */
-	0x0007f100,
-	0x0103f0cc,
-	0xbd000fd0,
-	0x02ecb904,
-	0xf01fc9f0,
-	0x07f11ec9,
-	0x03f0ca00,
-	0x000cd001,
-/* 0x00be: nv_wr32_wait */
-	0xc7f104bd,
-	0xc3f0ca00,
-	0x00cccf01,
-	0xf41fccc8,
-	0x00f8f31b,
-/* 0x00d0: wait_donez */
-	0x99f094bd,
-	0x0007f100,
-	0x0203f00f,
-	0xbd0009d0,
-	0x0007f104,
-	0x0203f006,
-	0xbd000ad0,
-/* 0x00ed: wait_donez_ne */
-	0x0087f104,
-	0x0183f000,
-	0xff0088cf,
-	0x1bf4888a,
-	0xf094bdf3,
-	0x07f10099,
-	0x03f01700,
-	0x0009d002,
-	0x00f804bd,
-/* 0x0110: wait_doneo */
+	0xc9f01fc9,
+	0x0007f11e,
+	0x0103f0ca,
+	0xbd000cd0,
+/* 0x00cd: nv_wr32_wait */
+	0x00c7f104,
+	0x01c3f0ca,
+	0xc800cccf,
+	0x1bf41fcc,
+/* 0x00df: wait_donez */
+	0xbd00f8f3,
+	0x0099f094,
+	0x0f0007f1,
+	0xd00203f0,
+	0x04bd0009,
+	0x060007f1,
+	0xd00203f0,
+	0x04bd000a,
+/* 0x00fc: wait_donez_ne */
+	0x000087f1,
+	0xcf0183f0,
+	0x8aff0088,
+	0xf31bf488,
 	0x99f094bd,
 	0x0007f100,
-	0x0203f00f,
+	0x0203f017,
 	0xbd0009d0,
-	0x0007f104,
-	0x0203f006,
-	0xbd000ad0,
-/* 0x012d: wait_doneo_e */
-	0x0087f104,
-	0x0183f000,
-	0xff0088cf,
-	0x0bf4888a,
-	0xf094bdf3,
-	0x07f10099,
-	0x03f01700,
-	0x0009d002,
-	0x00f804bd,
-/* 0x0150: mmctx_size */
-/* 0x0152: nv_mmctx_size_loop */
-	0xe89894bd,
-	0x1a85b600,
-	0xb60180b6,
-	0x98bb0284,
-	0x04e0b600,
-	0xf404efb8,
-	0x9fb9eb1b,
-/* 0x016f: mmctx_xfer */
-	0xbd00f802,
-	0x0199f094,
+/* 0x011f: wait_doneo */
+	0xbd00f804,
+	0x0099f094,
 	0x0f0007f1,
 	0xd00203f0,
 	0x04bd0009,
-	0xbbfd94bd,
-	0x120bf405,
-	0xc40007f1,
-	0xd00103f0,
-	0x04bd000b,
-/* 0x0197: mmctx_base_disabled */
-	0xfd0099f0,
-	0x0bf405ee,
-	0x0007f11e,
-	0x0103f0c6,
-	0xbd000ed0,
-	0x0007f104,
-	0x0103f0c7,
-	0xbd000fd0,
-	0x0199f004,
-/* 0x01b8: mmctx_multi_disabled */
-	0xb600abc8,
-	0xb9f010b4,
-	0x01aec80c,
-	0xfd11e4b6,
-	0x07f105be,
-	0x03f0c500,
-	0x000bd001,
-/* 0x01d6: mmctx_exec_loop */
-/* 0x01d6: mmctx_wait_free */
-	0xe7f104bd,
-	0xe3f0c500,
-	0x00eecf01,
-	0xf41fe4f0,
-	0xce98f30b,
-	0x05e9fd00,
-	0xc80007f1,
+	0x060007f1,
+	0xd00203f0,
+	0x04bd000a,
+/* 0x013c: wait_doneo_e */
+	0x000087f1,
+	0xcf0183f0,
+	0x8aff0088,
+	0xf30bf488,
+	0x99f094bd,
+	0x0007f100,
+	0x0203f017,
+	0xbd0009d0,
+/* 0x015f: mmctx_size */
+	0xbd00f804,
+/* 0x0161: nv_mmctx_size_loop */
+	0x00e89894,
+	0xb61a85b6,
+	0x84b60180,
+	0x0098bb02,
+	0xb804e0b6,
+	0x1bf404ef,
+	0x029fb9eb,
+/* 0x017e: mmctx_xfer */
+	0x94bd00f8,
+	0xf10199f0,
+	0xf00f0007,
+	0x09d00203,
+	0xbd04bd00,
+	0x05bbfd94,
+	0xf1120bf4,
+	0xf0c40007,
+	0x0bd00103,
+	0xf004bd00,
+/* 0x01a6: mmctx_base_disabled */
+	0xeefd0099,
+	0x1e0bf405,
+	0xc60007f1,
 	0xd00103f0,
 	0x04bd000e,
-	0xb804c0b6,
-	0x1bf404cd,
-	0x02abc8d8,
-/* 0x0207: mmctx_fini_wait */
-	0xf11f1bf4,
-	0xf0c500b7,
-	0xbbcf01b3,
-	0x1fb4f000,
-	0xf410b4b0,
-	0xa7f0f01b,
-	0xd021f405,
-/* 0x0223: mmctx_stop */
-	0xc82b0ef4,
+	0xc70007f1,
+	0xd00103f0,
+	0x04bd000f,
+/* 0x01c7: mmctx_multi_disabled */
+	0xc80199f0,
 	0xb4b600ab,
 	0x0cb9f010,
-	0xf112b9f0,
-	0xf0c50007,
-	0x0bd00103,
-/* 0x023b: mmctx_stop_wait */
-	0xf104bd00,
-	0xf0c500b7,
-	0xbbcf01b3,
-	0x12bbc800,
-/* 0x024b: mmctx_done */
-	0xbdf31bf4,
-	0x0199f094,
-	0x170007f1,
+	0xb601aec8,
+	0xbefd11e4,
+	0x0007f105,
+	0x0103f0c5,
+	0xbd000bd0,
+/* 0x01e5: mmctx_exec_loop */
+/* 0x01e5: mmctx_wait_free */
+	0x00e7f104,
+	0x01e3f0c5,
+	0xf000eecf,
+	0x0bf41fe4,
+	0x00ce98f3,
+	0xf105e9fd,
+	0xf0c80007,
+	0x0ed00103,
+	0xb604bd00,
+	0xcdb804c0,
+	0xd81bf404,
+	0xf402abc8,
+/* 0x0216: mmctx_fini_wait */
+	0xb7f11f1b,
+	0xb3f0c500,
+	0x00bbcf01,
+	0xb01fb4f0,
+	0x1bf410b4,
+	0x05a7f0f0,
+	0xf4df21f4,
+/* 0x0232: mmctx_stop */
+	0xabc82b0e,
+	0x10b4b600,
+	0xf00cb9f0,
+	0x07f112b9,
+	0x03f0c500,
+	0x000bd001,
+/* 0x024a: mmctx_stop_wait */
+	0xb7f104bd,
+	0xb3f0c500,
+	0x00bbcf01,
+	0xf412bbc8,
+/* 0x025a: mmctx_done */
+	0x94bdf31b,
+	0xf10199f0,
+	0xf0170007,
+	0x09d00203,
+	0xf804bd00,
+/* 0x026d: strand_wait */
+	0xf0a0f900,
+	0x21f402a7,
+	0xf8a0fcdf,
+/* 0x0279: strand_pre */
+	0x0c97f000,
+	0x4afc07f1,
 	0xd00203f0,
 	0x04bd0009,
-/* 0x025e: strand_wait */
-	0xa0f900f8,
-	0xf402a7f0,
-	0xa0fcd021,
-/* 0x026a: strand_pre */
+	0x026d21f5,
+/* 0x028e: strand_post */
 	0x97f000f8,
-	0xfc07f10c,
+	0xfc07f10d,
 	0x0203f04a,
 	0xbd0009d0,
-	0x5e21f504,
-/* 0x027f: strand_post */
+	0x6d21f504,
+/* 0x02a3: strand_set */
 	0xf000f802,
-	0x07f10d97,
-	0x03f04afc,
-	0x0009d002,
-	0x21f504bd,
-	0x00f8025e,
-/* 0x0294: strand_set */
-	0xf10fc7f0,
-	0xf04ffc07,
-	0x0cd00203,
-	0xf004bd00,
-	0x07f10bc7,
-	0x03f04afc,
-	0x000cd002,
-	0x07f104bd,
+	0x07f10fc7,
 	0x03f04ffc,
-	0x000ed002,
+	0x000cd002,
 	0xc7f004bd,
-	0xfc07f10a,
+	0xfc07f10b,
 	0x0203f04a,
 	0xbd000cd0,
-	0x5e21f504,
-/* 0x02d3: strand_ctx_init */
-	0xbd00f802,
-	0x0399f094,
-	0x0f0007f1,
-	0xd00203f0,
-	0x04bd0009,
-	0x026a21f5,
-	0xf503e7f0,
-	0xbd029421,
-	0xfc07f1c4,
-	0x0203f047,
-	0xbd000cd0,
-	0x01c7f004,
+	0xfc07f104,
+	0x0203f04f,
+	0xbd000ed0,
+	0x0ac7f004,
 	0x4afc07f1,
 	0xd00203f0,
 	0x04bd000c,
-	0x025e21f5,
-	0xf1010c92,
-	0xf046fc07,
+	0x026d21f5,
+/* 0x02e2: strand_ctx_init */
+	0x94bd00f8,
+	0xf10399f0,
+	0xf00f0007,
+	0x09d00203,
+	0xf504bd00,
+	0xf0027921,
+	0x21f503e7,
+	0xc4bd02a3,
+	0x47fc07f1,
+	0xd00203f0,
+	0x04bd000c,
+	0xf101c7f0,
+	0xf04afc07,
 	0x0cd00203,
-	0xf004bd00,
-	0x07f102c7,
-	0x03f04afc,
+	0xf504bd00,
+	0x92026d21,
+	0x07f1010c,
+	0x03f046fc,
 	0x000cd002,
-	0x21f504bd,
-	0x21f5025e,
-	0x87f1027f,
-	0x83f04200,
-	0x0097f102,
-	0x0293f020,
-	0x950099cf,
-/* 0x034a: ctx_init_strand_loop */
-	0x8ed008fe,
-	0x408ed000,
-	0xb6808acf,
-	0xa0b606a5,
-	0x00eabb01,
-	0xb60480b6,
-	0x1bf40192,
-	0x08e4b6e8,
-	0xbdf2efbc,
-	0x0399f094,
-	0x170007f1,
-	0xd00203f0,
-	0x04bd0009,
-/* 0x037e: error */
-	0xe0f900f8,
-	0xf102ffb9,
-	0xf09814e7,
-	0x21f440e3,
-	0x01f7f09d,
-	0xf102ffb9,
-	0xf09c1ce7,
-	0x21f440e3,
-	0xf8e0fc9d,
-/* 0x03a1: init */
-	0xf104bd00,
-	0xf0420017,
-	0x11cf0013,
-	0x0911e700,
-	0x0814b601,
-	0xf00014fe,
-	0x07f10227,
-	0x03f01200,
-	0x0002d000,
+	0xc7f004bd,
+	0xfc07f102,
+	0x0203f04a,
+	0xbd000cd0,
+	0x6d21f504,
+	0x8e21f502,
+	0x0087f102,
+	0x0283f042,
+	0x200097f1,
+	0xcf0293f0,
+	0xfe950099,
+/* 0x0359: ctx_init_strand_loop */
+	0x008ed008,
+	0xcf408ed0,
+	0xa5b6808a,
+	0x01a0b606,
+	0xb600eabb,
+	0x92b60480,
+	0xe81bf401,
+	0xbc08e4b6,
+	0x94bdf2ef,
+	0xf10399f0,
+	0xf0170007,
+	0x09d00203,
+	0xf804bd00,
+/* 0x038d: error */
+	0xb9e0f900,
+	0xe7f102ff,
+	0xe3f09814,
+	0xac21f440,
+	0xb901f7f0,
+	0xe7f102ff,
+	0xe3f09c1c,
+	0xac21f440,
+	0x00f8e0fc,
+/* 0x03b0: init */
 	0x17f104bd,
-	0x10fe0545,
-	0x0007f100,
-	0x0003f007,
-	0xbd0000d0,
-	0x0427f004,
-	0x040007f1,
-	0xd00003f0,
-	0x04bd0002,
-	0xf11031f4,
-	0xf0820027,
-	0x22cf0123,
-	0x0137f000,
-	0xbb1f24f0,
-	0x32b60432,
-	0x05028001,
-	0xf1060380,
-	0xf0860027,
-	0x22cf0123,
-	0x04028000,
-	0xf10f24b6,
-	0xf0c90007,
-	0x02d00103,
+	0x13f04200,
+	0x0011cf00,
+	0x010911e7,
+	0xfe0814b6,
+	0x27f00014,
+	0x0007f102,
+	0x0003f012,
+	0xbd0002d0,
+	0x0032f404,
+	0x055417f1,
+	0xf10010fe,
+	0xf0070007,
+	0x00d00003,
+	0xf004bd00,
+	0x07f10427,
+	0x03f00400,
+	0x0002d000,
+	0x31f404bd,
+	0x0027f110,
+	0x0123f082,
+	0xf00022cf,
+	0x24f00137,
+	0x0432bb1f,
+	0x800132b6,
+	0x03800502,
+	0x0027f106,
+	0x0123f086,
+	0x800022cf,
+	0x24b60402,
+	0x0007f10f,
+	0x0103f0c9,
+	0xbd0002d0,
+	0x30e7f104,
+	0x50e3f00c,
+	0xbd01e5f0,
+	0xbd34bd24,
+/* 0x0445: init_unk_loop */
+	0x7721f444,
+	0xf400f6b0,
+	0xf7f00f0b,
+	0x04f2bb01,
+	0xb6054ffd,
+/* 0x045a: init_unk_next */
+	0x20b60130,
+	0x04e0b601,
+	0xf40126b0,
+/* 0x0466: init_unk_done */
+	0x0380e21b,
+	0x08048007,
+	0x010027f1,
+	0xcf0223f0,
+	0x34bd0022,
+	0xf1082595,
+	0xf0c00007,
+	0x05d00103,
 	0xf104bd00,
-	0xf00c30e7,
-	0xe5f050e3,
-	0xbd24bd01,
-/* 0x0433: init_unk_loop */
-	0xf444bd34,
-	0xf6b06821,
-	0x0f0bf400,
-	0xbb01f7f0,
-	0x4ffd04f2,
-	0x0130b605,
-/* 0x0448: init_unk_next */
-	0xb60120b6,
-	0x26b004e0,
-	0xe21bf401,
-/* 0x0454: init_unk_done */
-	0x80070380,
-	0x27f10804,
-	0x23f00100,
-	0x0022cf02,
-	0x259534bd,
-	0x0007f108,
-	0x0103f0c0,
-	0xbd0005d0,
-	0x0007f104,
-	0x0103f0c1,
-	0xbd0005d0,
-	0x000e9804,
-	0xf5010f98,
-	0xbb015021,
-	0x3fbb002f,
-	0x010e9800,
-	0xf5020f98,
-	0x98015021,
-	0xeffd050e,
-	0x002ebb00,
-	0x98003ebb,
-	0x0f98020e,
-	0x5021f503,
-	0x070e9801,
+	0xf0c10007,
+	0x05d00103,
+	0x9804bd00,
+	0x0f98000e,
+	0x5f21f501,
+	0x002fbb01,
+	0x98003fbb,
+	0x0f98010e,
+	0x5f21f502,
+	0x050e9801,
 	0xbb00effd,
 	0x3ebb002e,
-	0x0235b600,
-	0xd30007f1,
-	0xd00103f0,
-	0x04bd0003,
-	0xb60825b6,
-	0x20b60635,
-	0x0130b601,
-	0xb60824b6,
-	0x2fb90834,
-	0xd321f502,
-	0x002fbb02,
-	0xf1003fbb,
-	0xf0010007,
-	0x03d00203,
-	0xbd04bd00,
-	0x1f29f024,
-	0x080007f1,
-	0xd00203f0,
-	0x04bd0002,
-/* 0x0508: main */
-	0xf40031f4,
-	0xd7f00028,
-	0x3921f424,
-	0xb0f401f4,
-	0x18f404e4,
-	0x0181fe1e,
-	0xbd0627f0,
-	0x0412fd20,
-	0xfd01e4b6,
-	0x18fe051e,
-	0x0121f500,
-	0xd30ef406,
-/* 0x0538: main_not_ctx_xfer */
-	0xf010ef94,
-	0x21f501f5,
-	0x0ef4037e,
-/* 0x0545: ih */
-	0xf900f9c6,
-	0x0188fe80,
-	0x90f980f9,
-	0xb0f9a0f9,
-	0xe0f9d0f9,
-	0x04bdf0f9,
-	0x0200a7f1,
-	0xcf00a3f0,
-	0xabc400aa,
-	0x2c0bf404,
-	0xf124d7f0,
-	0xf01a00e7,
-	0xeecf00e3,
-	0x00f7f100,
-	0x00f3f019,
-	0xf400ffcf,
-	0xe7f00421,
-	0x0007f101,
-	0x0003f01d,
-	0xbd000ed0,
-/* 0x0595: ih_no_fifo */
-	0x0007f104,
-	0x0003f001,
-	0xbd000ad0,
-	0xfcf0fc04,
-	0xfcd0fce0,
-	0xfca0fcb0,
-	0xfe80fc90,
-	0x80fc0088,
-	0x32f400fc,
-/* 0x05bb: hub_barrier_done */
-	0xf001f800,
-	0x0e9801f7,
-	0x04febb04,
-	0xf102ffb9,
-	0xf09418e7,
-	0x21f440e3,
-/* 0x05d3: ctx_redswitch */
-	0xf000f89d,
-	0x07f120f7,
-	0x03f08500,
-	0x000fd001,
-	0xe7f004bd,
-/* 0x05e5: ctx_redswitch_delay */
-	0x01e2b608,
-	0xf1fd1bf4,
-	0xf10800f5,
-	0xf10200f5,
-	0xf0850007,
-	0x0fd00103,
-	0xf804bd00,
-/* 0x0601: ctx_xfer */
+	0x020e9800,
+	0xf5030f98,
+	0x98015f21,
+	0xeffd070e,
+	0x002ebb00,
+	0xb6003ebb,
+	0x07f10235,
+	0x03f0d300,
+	0x0003d001,
+	0x25b604bd,
+	0x0635b608,
+	0xb60120b6,
+	0x24b60130,
+	0x0834b608,
+	0xf5022fb9,
+	0xbb02e221,
+	0x3fbb002f,
 	0x0007f100,
-	0x0203f081,
-	0xbd000fd0,
-	0x0711f404,
-	0x05d321f5,
-/* 0x0614: ctx_xfer_not_load */
-	0x026a21f5,
-	0x07f124bd,
-	0x03f047fc,
+	0x0203f001,
+	0xbd0003d0,
+	0xf024bd04,
+	0x07f11f29,
+	0x03f00800,
 	0x0002d002,
-	0x2cf004bd,
-	0x0320b601,
-	0x4afc07f1,
+/* 0x051a: main */
+	0x28f404bd,
+	0x24d7f000,
+	0xf43921f4,
+	0xe4b0f701,
+	0x1e18f404,
+	0xf00181fe,
+	0x20bd0627,
+	0xb60412fd,
+	0x1efd01e4,
+	0x0018fe05,
+	0x061021f5,
+/* 0x0547: main_not_ctx_xfer */
+	0x94d60ef4,
+	0xf5f010ef,
+	0x8d21f501,
+	0xc90ef403,
+/* 0x0554: ih */
+	0x80f900f9,
+	0xf90188fe,
+	0xf990f980,
+	0xf9b0f9a0,
+	0xf9e0f9d0,
+	0xf104bdf0,
+	0xf00200a7,
+	0xaacf00a3,
+	0x04abc400,
+	0xf02c0bf4,
+	0xe7f124d7,
+	0xe3f01a00,
+	0x00eecf00,
+	0x1900f7f1,
+	0xcf00f3f0,
+	0x21f400ff,
+	0x01e7f004,
+	0x1d0007f1,
+	0xd00003f0,
+	0x04bd000e,
+/* 0x05a4: ih_no_fifo */
+	0x010007f1,
+	0xd00003f0,
+	0x04bd000a,
+	0xe0fcf0fc,
+	0xb0fcd0fc,
+	0x90fca0fc,
+	0x88fe80fc,
+	0xfc80fc00,
+	0x0032f400,
+/* 0x05ca: hub_barrier_done */
+	0xf7f001f8,
+	0x040e9801,
+	0xb904febb,
+	0xe7f102ff,
+	0xe3f09418,
+	0xac21f440,
+/* 0x05e2: ctx_redswitch */
+	0xf7f000f8,
+	0x0007f120,
+	0x0103f085,
+	0xbd000fd0,
+	0x08e7f004,
+/* 0x05f4: ctx_redswitch_delay */
+	0xf401e2b6,
+	0xf5f1fd1b,
+	0xf5f10800,
+	0x07f10200,
+	0x03f08500,
+	0x000fd001,
+	0x00f804bd,
+/* 0x0610: ctx_xfer */
+	0x810007f1,
 	0xd00203f0,
-	0x04bd0002,
-	0xf001acf0,
-	0xb7f102a5,
-	0xb3f00000,
-	0x040c9850,
-	0xbb0fc4b6,
-	0x0c9800bc,
-	0x010d9800,
-	0xf500e7f0,
-	0xf0016f21,
-	0xb7f101ac,
-	0xb3f04000,
-	0x040c9850,
-	0xbb0fc4b6,
-	0x0c9800bc,
-	0x020d9801,
-	0xf1060f98,
-	0xf50800e7,
-	0xf0016f21,
+	0x04bd000f,
+	0xf50711f4,
+/* 0x0623: ctx_xfer_not_load */
+	0xf505e221,
+	0xbd027921,
+	0xfc07f124,
+	0x0203f047,
+	0xbd0002d0,
+	0x012cf004,
+	0xf10320b6,
+	0xf04afc07,
+	0x02d00203,
+	0xf004bd00,
 	0xa5f001ac,
-	0x00b7f104,
-	0x50b3f030,
+	0x00b7f102,
+	0x50b3f000,
 	0xb6040c98,
 	0xbcbb0fc4,
-	0x020c9800,
-	0x98030d98,
-	0xe7f1080f,
-	0x21f50200,
-	0x21f5016f,
-	0x01f4025e,
-	0x0712f406,
-/* 0x06b0: ctx_xfer_post */
-	0x027f21f5,
-/* 0x06b4: ctx_xfer_done */
-	0x05bb21f5,
-	0x000000f8,
-	0x00000000,
-	0x00000000,
-	0x00000000,
+	0x000c9800,
+	0xf0010d98,
+	0x21f500e7,
+	0xacf0017e,
+	0x00b7f101,
+	0x50b3f040,
+	0xb6040c98,
+	0xbcbb0fc4,
+	0x010c9800,
+	0x98020d98,
+	0xe7f1060f,
+	0x21f50800,
+	0xacf0017e,
+	0x04a5f001,
+	0x3000b7f1,
+	0x9850b3f0,
+	0xc4b6040c,
+	0x00bcbb0f,
+	0x98020c98,
+	0x0f98030d,
+	0x00e7f108,
+	0x7e21f502,
+	0x6d21f501,
+	0x0601f402,
+/* 0x06bf: ctx_xfer_post */
+	0xf50712f4,
+/* 0x06c3: ctx_xfer_done */
+	0xf5028e21,
+	0xf805ca21,
 	0x00000000,
 	0x00000000,
 	0x00000000,
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk110.fuc3.h b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk110.fuc3.h
index f726769..ed17e7d 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk110.fuc3.h
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk110.fuc3.h
@@ -41,14 +41,14 @@ uint32_t gk110_grgpc_data[] = {
 };
 
 uint32_t gk110_grgpc_code[] = {
-	0x03a10ef5,
+	0x03b00ef5,
 /* 0x0004: queue_put */
 	0x9800d898,
 	0x86f001d9,
 	0x0489b808,
 	0xf00c1bf4,
 	0x21f502f7,
-	0x00f8037e,
+	0x00f8038d,
 /* 0x001c: queue_put_next */
 	0xb60798c4,
 	0x8dbb0384,
@@ -59,467 +59,467 @@ uint32_t gk110_grgpc_code[] = {
 	0xf801d980,
 /* 0x0039: queue_get */
 	0x0131f400,
-	0x9800d898,
-	0x89b801d9,
-	0x210bf404,
-	0xb60789c4,
-	0x9dbb0394,
-	0x0890b600,
-	0x98009e98,
-	0x80b6019f,
-	0x0f84f001,
-	0xf400d880,
-/* 0x0066: queue_get_done */
-	0x00f80132,
-/* 0x0068: nv_rd32 */
+	0x980031f4,
+	0xd99800d8,
+	0x0489b801,
+	0xc42d0bf4,
+	0x94b60789,
+	0x009dbb03,
+	0x980890b6,
+	0x9f98009e,
+	0x0180b601,
+	0x800f84f0,
+	0x32f400d8,
+	0x01d99801,
+	0xf40489b8,
+	0x32f4060b,
+/* 0x0075: queue_get_done */
+/* 0x0077: nv_rd32 */
+	0xb900f800,
+	0xc9f002ec,
+	0x0007f11f,
+	0x0103f0ca,
+	0xbd000cd0,
+/* 0x0089: nv_rd32_wait */
+	0x00c7f104,
+	0x01c3f0ca,
+	0xc800cccf,
+	0x1bf41fcc,
+	0x06a7f0f3,
+	0x011f21f5,
+	0xcb00f7f1,
+	0xcf01f3f0,
+	0x00f800ff,
+/* 0x00ac: nv_wr32 */
+	0xcc0007f1,
+	0xd00103f0,
+	0x04bd000f,
 	0xf002ecb9,
-	0x07f11fc9,
-	0x03f0ca00,
-	0x000cd001,
-/* 0x007a: nv_rd32_wait */
-	0xc7f104bd,
-	0xc3f0ca00,
-	0x00cccf01,
-	0xf41fccc8,
-	0xa7f0f31b,
-	0x1021f506,
-	0x00f7f101,
-	0x01f3f0cb,
-	0xf800ffcf,
-/* 0x009d: nv_wr32 */
-	0x0007f100,
-	0x0103f0cc,
-	0xbd000fd0,
-	0x02ecb904,
-	0xf01fc9f0,
-	0x07f11ec9,
-	0x03f0ca00,
-	0x000cd001,
-/* 0x00be: nv_wr32_wait */
-	0xc7f104bd,
-	0xc3f0ca00,
-	0x00cccf01,
-	0xf41fccc8,
-	0x00f8f31b,
-/* 0x00d0: wait_donez */
-	0x99f094bd,
-	0x0007f100,
-	0x0203f037,
-	0xbd0009d0,
-	0x0007f104,
-	0x0203f006,
-	0xbd000ad0,
-/* 0x00ed: wait_donez_ne */
-	0x0087f104,
-	0x0183f000,
-	0xff0088cf,
-	0x1bf4888a,
-	0xf094bdf3,
-	0x07f10099,
-	0x03f01700,
-	0x0009d002,
-	0x00f804bd,
-/* 0x0110: wait_doneo */
+	0xc9f01fc9,
+	0x0007f11e,
+	0x0103f0ca,
+	0xbd000cd0,
+/* 0x00cd: nv_wr32_wait */
+	0x00c7f104,
+	0x01c3f0ca,
+	0xc800cccf,
+	0x1bf41fcc,
+/* 0x00df: wait_donez */
+	0xbd00f8f3,
+	0x0099f094,
+	0x370007f1,
+	0xd00203f0,
+	0x04bd0009,
+	0x060007f1,
+	0xd00203f0,
+	0x04bd000a,
+/* 0x00fc: wait_donez_ne */
+	0x000087f1,
+	0xcf0183f0,
+	0x8aff0088,
+	0xf31bf488,
 	0x99f094bd,
 	0x0007f100,
-	0x0203f037,
+	0x0203f017,
 	0xbd0009d0,
-	0x0007f104,
-	0x0203f006,
-	0xbd000ad0,
-/* 0x012d: wait_doneo_e */
-	0x0087f104,
-	0x0183f000,
-	0xff0088cf,
-	0x0bf4888a,
-	0xf094bdf3,
-	0x07f10099,
-	0x03f01700,
-	0x0009d002,
-	0x00f804bd,
-/* 0x0150: mmctx_size */
-/* 0x0152: nv_mmctx_size_loop */
-	0xe89894bd,
-	0x1a85b600,
-	0xb60180b6,
-	0x98bb0284,
-	0x04e0b600,
-	0xf404efb8,
-	0x9fb9eb1b,
-/* 0x016f: mmctx_xfer */
-	0xbd00f802,
-	0x0199f094,
+/* 0x011f: wait_doneo */
+	0xbd00f804,
+	0x0099f094,
 	0x370007f1,
 	0xd00203f0,
 	0x04bd0009,
-	0xbbfd94bd,
-	0x120bf405,
-	0xc40007f1,
-	0xd00103f0,
-	0x04bd000b,
-/* 0x0197: mmctx_base_disabled */
-	0xfd0099f0,
-	0x0bf405ee,
-	0x0007f11e,
-	0x0103f0c6,
-	0xbd000ed0,
-	0x0007f104,
-	0x0103f0c7,
-	0xbd000fd0,
-	0x0199f004,
-/* 0x01b8: mmctx_multi_disabled */
-	0xb600abc8,
-	0xb9f010b4,
-	0x01aec80c,
-	0xfd11e4b6,
-	0x07f105be,
-	0x03f0c500,
-	0x000bd001,
-/* 0x01d6: mmctx_exec_loop */
-/* 0x01d6: mmctx_wait_free */
-	0xe7f104bd,
-	0xe3f0c500,
-	0x00eecf01,
-	0xf41fe4f0,
-	0xce98f30b,
-	0x05e9fd00,
-	0xc80007f1,
+	0x060007f1,
+	0xd00203f0,
+	0x04bd000a,
+/* 0x013c: wait_doneo_e */
+	0x000087f1,
+	0xcf0183f0,
+	0x8aff0088,
+	0xf30bf488,
+	0x99f094bd,
+	0x0007f100,
+	0x0203f017,
+	0xbd0009d0,
+/* 0x015f: mmctx_size */
+	0xbd00f804,
+/* 0x0161: nv_mmctx_size_loop */
+	0x00e89894,
+	0xb61a85b6,
+	0x84b60180,
+	0x0098bb02,
+	0xb804e0b6,
+	0x1bf404ef,
+	0x029fb9eb,
+/* 0x017e: mmctx_xfer */
+	0x94bd00f8,
+	0xf10199f0,
+	0xf0370007,
+	0x09d00203,
+	0xbd04bd00,
+	0x05bbfd94,
+	0xf1120bf4,
+	0xf0c40007,
+	0x0bd00103,
+	0xf004bd00,
+/* 0x01a6: mmctx_base_disabled */
+	0xeefd0099,
+	0x1e0bf405,
+	0xc60007f1,
 	0xd00103f0,
 	0x04bd000e,
-	0xb804c0b6,
-	0x1bf404cd,
-	0x02abc8d8,
-/* 0x0207: mmctx_fini_wait */
-	0xf11f1bf4,
-	0xf0c500b7,
-	0xbbcf01b3,
-	0x1fb4f000,
-	0xf410b4b0,
-	0xa7f0f01b,
-	0xd021f405,
-/* 0x0223: mmctx_stop */
-	0xc82b0ef4,
+	0xc70007f1,
+	0xd00103f0,
+	0x04bd000f,
+/* 0x01c7: mmctx_multi_disabled */
+	0xc80199f0,
 	0xb4b600ab,
 	0x0cb9f010,
-	0xf112b9f0,
-	0xf0c50007,
-	0x0bd00103,
-/* 0x023b: mmctx_stop_wait */
-	0xf104bd00,
-	0xf0c500b7,
-	0xbbcf01b3,
-	0x12bbc800,
-/* 0x024b: mmctx_done */
-	0xbdf31bf4,
-	0x0199f094,
-	0x170007f1,
+	0xb601aec8,
+	0xbefd11e4,
+	0x0007f105,
+	0x0103f0c5,
+	0xbd000bd0,
+/* 0x01e5: mmctx_exec_loop */
+/* 0x01e5: mmctx_wait_free */
+	0x00e7f104,
+	0x01e3f0c5,
+	0xf000eecf,
+	0x0bf41fe4,
+	0x00ce98f3,
+	0xf105e9fd,
+	0xf0c80007,
+	0x0ed00103,
+	0xb604bd00,
+	0xcdb804c0,
+	0xd81bf404,
+	0xf402abc8,
+/* 0x0216: mmctx_fini_wait */
+	0xb7f11f1b,
+	0xb3f0c500,
+	0x00bbcf01,
+	0xb01fb4f0,
+	0x1bf410b4,
+	0x05a7f0f0,
+	0xf4df21f4,
+/* 0x0232: mmctx_stop */
+	0xabc82b0e,
+	0x10b4b600,
+	0xf00cb9f0,
+	0x07f112b9,
+	0x03f0c500,
+	0x000bd001,
+/* 0x024a: mmctx_stop_wait */
+	0xb7f104bd,
+	0xb3f0c500,
+	0x00bbcf01,
+	0xf412bbc8,
+/* 0x025a: mmctx_done */
+	0x94bdf31b,
+	0xf10199f0,
+	0xf0170007,
+	0x09d00203,
+	0xf804bd00,
+/* 0x026d: strand_wait */
+	0xf0a0f900,
+	0x21f402a7,
+	0xf8a0fcdf,
+/* 0x0279: strand_pre */
+	0x0c97f000,
+	0x4afc07f1,
 	0xd00203f0,
 	0x04bd0009,
-/* 0x025e: strand_wait */
-	0xa0f900f8,
-	0xf402a7f0,
-	0xa0fcd021,
-/* 0x026a: strand_pre */
+	0x026d21f5,
+/* 0x028e: strand_post */
 	0x97f000f8,
-	0xfc07f10c,
+	0xfc07f10d,
 	0x0203f04a,
 	0xbd0009d0,
-	0x5e21f504,
-/* 0x027f: strand_post */
+	0x6d21f504,
+/* 0x02a3: strand_set */
 	0xf000f802,
-	0x07f10d97,
-	0x03f04afc,
-	0x0009d002,
-	0x21f504bd,
-	0x00f8025e,
-/* 0x0294: strand_set */
-	0xf10fc7f0,
-	0xf04ffc07,
-	0x0cd00203,
-	0xf004bd00,
-	0x07f10bc7,
-	0x03f04afc,
-	0x000cd002,
-	0x07f104bd,
+	0x07f10fc7,
 	0x03f04ffc,
-	0x000ed002,
+	0x000cd002,
 	0xc7f004bd,
-	0xfc07f10a,
+	0xfc07f10b,
 	0x0203f04a,
 	0xbd000cd0,
-	0x5e21f504,
-/* 0x02d3: strand_ctx_init */
-	0xbd00f802,
-	0x0399f094,
-	0x370007f1,
-	0xd00203f0,
-	0x04bd0009,
-	0x026a21f5,
-	0xf503e7f0,
-	0xbd029421,
-	0xfc07f1c4,
-	0x0203f047,
-	0xbd000cd0,
-	0x01c7f004,
+	0xfc07f104,
+	0x0203f04f,
+	0xbd000ed0,
+	0x0ac7f004,
 	0x4afc07f1,
 	0xd00203f0,
 	0x04bd000c,
-	0x025e21f5,
-	0xf1010c92,
-	0xf046fc07,
+	0x026d21f5,
+/* 0x02e2: strand_ctx_init */
+	0x94bd00f8,
+	0xf10399f0,
+	0xf0370007,
+	0x09d00203,
+	0xf504bd00,
+	0xf0027921,
+	0x21f503e7,
+	0xc4bd02a3,
+	0x47fc07f1,
+	0xd00203f0,
+	0x04bd000c,
+	0xf101c7f0,
+	0xf04afc07,
 	0x0cd00203,
-	0xf004bd00,
-	0x07f102c7,
-	0x03f04afc,
+	0xf504bd00,
+	0x92026d21,
+	0x07f1010c,
+	0x03f046fc,
 	0x000cd002,
-	0x21f504bd,
-	0x21f5025e,
-	0x87f1027f,
-	0x83f04200,
-	0x0097f102,
-	0x0293f020,
-	0x950099cf,
-/* 0x034a: ctx_init_strand_loop */
-	0x8ed008fe,
-	0x408ed000,
-	0xb6808acf,
-	0xa0b606a5,
-	0x00eabb01,
-	0xb60480b6,
-	0x1bf40192,
-	0x08e4b6e8,
-	0xbdf2efbc,
-	0x0399f094,
-	0x170007f1,
-	0xd00203f0,
-	0x04bd0009,
-/* 0x037e: error */
-	0xe0f900f8,
-	0xf102ffb9,
-	0xf09814e7,
-	0x21f440e3,
-	0x01f7f09d,
-	0xf102ffb9,
-	0xf09c1ce7,
-	0x21f440e3,
-	0xf8e0fc9d,
-/* 0x03a1: init */
-	0xf104bd00,
-	0xf0420017,
-	0x11cf0013,
-	0x0911e700,
-	0x0814b601,
-	0xf00014fe,
-	0x07f10227,
-	0x03f01200,
-	0x0002d000,
+	0xc7f004bd,
+	0xfc07f102,
+	0x0203f04a,
+	0xbd000cd0,
+	0x6d21f504,
+	0x8e21f502,
+	0x0087f102,
+	0x0283f042,
+	0x200097f1,
+	0xcf0293f0,
+	0xfe950099,
+/* 0x0359: ctx_init_strand_loop */
+	0x008ed008,
+	0xcf408ed0,
+	0xa5b6808a,
+	0x01a0b606,
+	0xb600eabb,
+	0x92b60480,
+	0xe81bf401,
+	0xbc08e4b6,
+	0x94bdf2ef,
+	0xf10399f0,
+	0xf0170007,
+	0x09d00203,
+	0xf804bd00,
+/* 0x038d: error */
+	0xb9e0f900,
+	0xe7f102ff,
+	0xe3f09814,
+	0xac21f440,
+	0xb901f7f0,
+	0xe7f102ff,
+	0xe3f09c1c,
+	0xac21f440,
+	0x00f8e0fc,
+/* 0x03b0: init */
 	0x17f104bd,
-	0x10fe0545,
-	0x0007f100,
-	0x0003f007,
-	0xbd0000d0,
-	0x0427f004,
-	0x040007f1,
-	0xd00003f0,
-	0x04bd0002,
-	0xf11031f4,
-	0xf0820027,
-	0x22cf0123,
-	0x0137f000,
-	0xbb1f24f0,
-	0x32b60432,
-	0x05028001,
-	0xf1060380,
-	0xf0860027,
-	0x22cf0123,
-	0x04028000,
-	0xf10f24b6,
-	0xf0c90007,
-	0x02d00103,
+	0x13f04200,
+	0x0011cf00,
+	0x010911e7,
+	0xfe0814b6,
+	0x27f00014,
+	0x0007f102,
+	0x0003f012,
+	0xbd0002d0,
+	0x0032f404,
+	0x055417f1,
+	0xf10010fe,
+	0xf0070007,
+	0x00d00003,
+	0xf004bd00,
+	0x07f10427,
+	0x03f00400,
+	0x0002d000,
+	0x31f404bd,
+	0x0027f110,
+	0x0123f082,
+	0xf00022cf,
+	0x24f00137,
+	0x0432bb1f,
+	0x800132b6,
+	0x03800502,
+	0x0027f106,
+	0x0123f086,
+	0x800022cf,
+	0x24b60402,
+	0x0007f10f,
+	0x0103f0c9,
+	0xbd0002d0,
+	0x30e7f104,
+	0x50e3f00c,
+	0xbd01e5f0,
+	0xbd34bd24,
+/* 0x0445: init_unk_loop */
+	0x7721f444,
+	0xf400f6b0,
+	0xf7f00f0b,
+	0x04f2bb01,
+	0xb6054ffd,
+/* 0x045a: init_unk_next */
+	0x20b60130,
+	0x04e0b601,
+	0xf40226b0,
+/* 0x0466: init_unk_done */
+	0x0380e21b,
+	0x08048007,
+	0x010027f1,
+	0xcf0223f0,
+	0x34bd0022,
+	0xf1082595,
+	0xf0c00007,
+	0x05d00103,
 	0xf104bd00,
-	0xf00c30e7,
-	0xe5f050e3,
-	0xbd24bd01,
-/* 0x0433: init_unk_loop */
-	0xf444bd34,
-	0xf6b06821,
-	0x0f0bf400,
-	0xbb01f7f0,
-	0x4ffd04f2,
-	0x0130b605,
-/* 0x0448: init_unk_next */
-	0xb60120b6,
-	0x26b004e0,
-	0xe21bf402,
-/* 0x0454: init_unk_done */
-	0x80070380,
-	0x27f10804,
-	0x23f00100,
-	0x0022cf02,
-	0x259534bd,
-	0x0007f108,
-	0x0103f0c0,
-	0xbd0005d0,
-	0x0007f104,
-	0x0103f0c1,
-	0xbd0005d0,
-	0x000e9804,
-	0xf5010f98,
-	0xbb015021,
-	0x3fbb002f,
-	0x010e9800,
-	0xf5020f98,
-	0x98015021,
-	0xeffd050e,
-	0x002ebb00,
-	0x98003ebb,
-	0x0f98020e,
-	0x5021f503,
-	0x070e9801,
+	0xf0c10007,
+	0x05d00103,
+	0x9804bd00,
+	0x0f98000e,
+	0x5f21f501,
+	0x002fbb01,
+	0x98003fbb,
+	0x0f98010e,
+	0x5f21f502,
+	0x050e9801,
 	0xbb00effd,
 	0x3ebb002e,
-	0x0235b600,
-	0xd30007f1,
-	0xd00103f0,
-	0x04bd0003,
-	0xb60825b6,
-	0x20b60635,
-	0x0130b601,
-	0xb60824b6,
-	0x2fb90834,
-	0xd321f502,
-	0x002fbb02,
-	0xf1003fbb,
-	0xf0010007,
-	0x03d00203,
-	0xbd04bd00,
-	0x1f29f024,
-	0x300007f1,
-	0xd00203f0,
-	0x04bd0002,
-/* 0x0508: main */
-	0xf40031f4,
-	0xd7f00028,
-	0x3921f424,
-	0xb0f401f4,
-	0x18f404e4,
-	0x0181fe1e,
-	0xbd0627f0,
-	0x0412fd20,
-	0xfd01e4b6,
-	0x18fe051e,
-	0x0121f500,
-	0xd30ef406,
-/* 0x0538: main_not_ctx_xfer */
-	0xf010ef94,
-	0x21f501f5,
-	0x0ef4037e,
-/* 0x0545: ih */
-	0xf900f9c6,
-	0x0188fe80,
-	0x90f980f9,
-	0xb0f9a0f9,
-	0xe0f9d0f9,
-	0x04bdf0f9,
-	0x0200a7f1,
-	0xcf00a3f0,
-	0xabc400aa,
-	0x2c0bf404,
-	0xf124d7f0,
-	0xf01a00e7,
-	0xeecf00e3,
-	0x00f7f100,
-	0x00f3f019,
-	0xf400ffcf,
-	0xe7f00421,
-	0x0007f101,
-	0x0003f01d,
-	0xbd000ed0,
-/* 0x0595: ih_no_fifo */
-	0x0007f104,
-	0x0003f001,
-	0xbd000ad0,
-	0xfcf0fc04,
-	0xfcd0fce0,
-	0xfca0fcb0,
-	0xfe80fc90,
-	0x80fc0088,
-	0x32f400fc,
-/* 0x05bb: hub_barrier_done */
-	0xf001f800,
-	0x0e9801f7,
-	0x04febb04,
-	0xf102ffb9,
-	0xf09418e7,
-	0x21f440e3,
-/* 0x05d3: ctx_redswitch */
-	0xf000f89d,
-	0x07f120f7,
-	0x03f08500,
-	0x000fd001,
-	0xe7f004bd,
-/* 0x05e5: ctx_redswitch_delay */
-	0x01e2b608,
-	0xf1fd1bf4,
-	0xf10800f5,
-	0xf10200f5,
-	0xf0850007,
-	0x0fd00103,
-	0xf804bd00,
-/* 0x0601: ctx_xfer */
+	0x020e9800,
+	0xf5030f98,
+	0x98015f21,
+	0xeffd070e,
+	0x002ebb00,
+	0xb6003ebb,
+	0x07f10235,
+	0x03f0d300,
+	0x0003d001,
+	0x25b604bd,
+	0x0635b608,
+	0xb60120b6,
+	0x24b60130,
+	0x0834b608,
+	0xf5022fb9,
+	0xbb02e221,
+	0x3fbb002f,
 	0x0007f100,
-	0x0203f081,
-	0xbd000fd0,
-	0x0711f404,
-	0x05d321f5,
-/* 0x0614: ctx_xfer_not_load */
-	0x026a21f5,
-	0x07f124bd,
-	0x03f047fc,
+	0x0203f001,
+	0xbd0003d0,
+	0xf024bd04,
+	0x07f11f29,
+	0x03f03000,
 	0x0002d002,
-	0x2cf004bd,
-	0x0320b601,
-	0x4afc07f1,
+/* 0x051a: main */
+	0x28f404bd,
+	0x24d7f000,
+	0xf43921f4,
+	0xe4b0f701,
+	0x1e18f404,
+	0xf00181fe,
+	0x20bd0627,
+	0xb60412fd,
+	0x1efd01e4,
+	0x0018fe05,
+	0x061021f5,
+/* 0x0547: main_not_ctx_xfer */
+	0x94d60ef4,
+	0xf5f010ef,
+	0x8d21f501,
+	0xc90ef403,
+/* 0x0554: ih */
+	0x80f900f9,
+	0xf90188fe,
+	0xf990f980,
+	0xf9b0f9a0,
+	0xf9e0f9d0,
+	0xf104bdf0,
+	0xf00200a7,
+	0xaacf00a3,
+	0x04abc400,
+	0xf02c0bf4,
+	0xe7f124d7,
+	0xe3f01a00,
+	0x00eecf00,
+	0x1900f7f1,
+	0xcf00f3f0,
+	0x21f400ff,
+	0x01e7f004,
+	0x1d0007f1,
+	0xd00003f0,
+	0x04bd000e,
+/* 0x05a4: ih_no_fifo */
+	0x010007f1,
+	0xd00003f0,
+	0x04bd000a,
+	0xe0fcf0fc,
+	0xb0fcd0fc,
+	0x90fca0fc,
+	0x88fe80fc,
+	0xfc80fc00,
+	0x0032f400,
+/* 0x05ca: hub_barrier_done */
+	0xf7f001f8,
+	0x040e9801,
+	0xb904febb,
+	0xe7f102ff,
+	0xe3f09418,
+	0xac21f440,
+/* 0x05e2: ctx_redswitch */
+	0xf7f000f8,
+	0x0007f120,
+	0x0103f085,
+	0xbd000fd0,
+	0x08e7f004,
+/* 0x05f4: ctx_redswitch_delay */
+	0xf401e2b6,
+	0xf5f1fd1b,
+	0xf5f10800,
+	0x07f10200,
+	0x03f08500,
+	0x000fd001,
+	0x00f804bd,
+/* 0x0610: ctx_xfer */
+	0x810007f1,
 	0xd00203f0,
-	0x04bd0002,
-	0xf001acf0,
-	0xb7f102a5,
-	0xb3f00000,
-	0x040c9850,
-	0xbb0fc4b6,
-	0x0c9800bc,
-	0x010d9800,
-	0xf500e7f0,
-	0xf0016f21,
-	0xb7f101ac,
-	0xb3f04000,
-	0x040c9850,
-	0xbb0fc4b6,
-	0x0c9800bc,
-	0x020d9801,
-	0xf1060f98,
-	0xf50800e7,
-	0xf0016f21,
+	0x04bd000f,
+	0xf50711f4,
+/* 0x0623: ctx_xfer_not_load */
+	0xf505e221,
+	0xbd027921,
+	0xfc07f124,
+	0x0203f047,
+	0xbd0002d0,
+	0x012cf004,
+	0xf10320b6,
+	0xf04afc07,
+	0x02d00203,
+	0xf004bd00,
 	0xa5f001ac,
-	0x00b7f104,
-	0x50b3f030,
+	0x00b7f102,
+	0x50b3f000,
 	0xb6040c98,
 	0xbcbb0fc4,
-	0x020c9800,
-	0x98030d98,
-	0xe7f1080f,
-	0x21f50200,
-	0x21f5016f,
-	0x01f4025e,
-	0x0712f406,
-/* 0x06b0: ctx_xfer_post */
-	0x027f21f5,
-/* 0x06b4: ctx_xfer_done */
-	0x05bb21f5,
-	0x000000f8,
-	0x00000000,
-	0x00000000,
-	0x00000000,
+	0x000c9800,
+	0xf0010d98,
+	0x21f500e7,
+	0xacf0017e,
+	0x00b7f101,
+	0x50b3f040,
+	0xb6040c98,
+	0xbcbb0fc4,
+	0x010c9800,
+	0x98020d98,
+	0xe7f1060f,
+	0x21f50800,
+	0xacf0017e,
+	0x04a5f001,
+	0x3000b7f1,
+	0x9850b3f0,
+	0xc4b6040c,
+	0x00bcbb0f,
+	0x98020c98,
+	0x0f98030d,
+	0x00e7f108,
+	0x7e21f502,
+	0x6d21f501,
+	0x0601f402,
+/* 0x06bf: ctx_xfer_post */
+	0xf50712f4,
+/* 0x06c3: ctx_xfer_done */
+	0xf5028e21,
+	0xf805ca21,
 	0x00000000,
 	0x00000000,
 	0x00000000,
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk208.fuc5.h b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk208.fuc5.h
index 387d1fa..dfe207a 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk208.fuc5.h
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgk208.fuc5.h
@@ -41,13 +41,13 @@ uint32_t gk208_grgpc_data[] = {
 };
 
 uint32_t gk208_grgpc_code[] = {
-	0x03140ef5,
+	0x03220ef5,
 /* 0x0004: queue_put */
 	0x9800d898,
 	0x86f001d9,
 	0xf489a408,
 	0x020f0b1b,
-	0x0002f87e,
+	0x0003067e,
 /* 0x001a: queue_put_next */
 	0x98c400f8,
 	0x0384b607,
@@ -58,406 +58,406 @@ uint32_t gk208_grgpc_code[] = {
 	0xd9b50f94,
 /* 0x0037: queue_get */
 	0xf400f801,
-	0xd8980131,
-	0x01d99800,
-	0x0bf489a4,
-	0x0789c421,
-	0xbb0394b6,
-	0x90b6009d,
-	0x009e9808,
-	0xb6019f98,
-	0x84f00180,
-	0x00d8b50f,
-/* 0x0063: queue_get_done */
-	0xf80132f4,
-/* 0x0065: nv_rd32 */
-	0xf0ecb200,
-	0x00801fc9,
-	0x0cf601ca,
-/* 0x0073: nv_rd32_wait */
-	0x8c04bd00,
-	0xcf01ca00,
-	0xccc800cc,
-	0xf61bf41f,
-	0xec7e060a,
-	0x008f0000,
-	0xffcf01cb,
-/* 0x008f: nv_wr32 */
-	0x8000f800,
-	0xf601cc00,
-	0x04bd000f,
-	0xc9f0ecb2,
-	0x1ec9f01f,
+	0x31f40131,
+	0x00d89800,
+	0xa401d998,
+	0x2c0bf489,
+	0xb60789c4,
+	0x9dbb0394,
+	0x0890b600,
+	0x98009e98,
+	0x80b6019f,
+	0x0f84f001,
+	0xf400d8b5,
+	0xd9980132,
+	0xf489a401,
+	0x32f4060b,
+/* 0x0071: queue_get_done */
+/* 0x0073: nv_rd32 */
+	0xb200f800,
+	0x1fc9f0ec,
 	0x01ca0080,
 	0xbd000cf6,
-/* 0x00a9: nv_wr32_wait */
+/* 0x0081: nv_rd32_wait */
 	0xca008c04,
 	0x00cccf01,
 	0xf41fccc8,
-	0x00f8f61b,
-/* 0x00b8: wait_donez */
-	0x99f094bd,
-	0x37008000,
-	0x0009f602,
-	0x008004bd,
-	0x0af60206,
-/* 0x00cf: wait_donez_ne */
-	0x8804bd00,
-	0xcf010000,
-	0x8aff0088,
-	0xf61bf488,
-	0x99f094bd,
-	0x17008000,
-	0x0009f602,
-	0x00f804bd,
-/* 0x00ec: wait_doneo */
-	0x99f094bd,
-	0x37008000,
-	0x0009f602,
-	0x008004bd,
-	0x0af60206,
-/* 0x0103: wait_doneo_e */
-	0x8804bd00,
-	0xcf010000,
-	0x8aff0088,
-	0xf60bf488,
-	0x99f094bd,
-	0x17008000,
-	0x0009f602,
-	0x00f804bd,
-/* 0x0120: mmctx_size */
-/* 0x0122: nv_mmctx_size_loop */
-	0xe89894bd,
-	0x1a85b600,
-	0xb60180b6,
-	0x98bb0284,
-	0x04e0b600,
-	0x1bf4efa4,
-	0xf89fb2ec,
-/* 0x013d: mmctx_xfer */
-	0xf094bd00,
-	0x00800199,
-	0x09f60237,
-	0xbd04bd00,
-	0x05bbfd94,
-	0x800f0bf4,
-	0xf601c400,
-	0x04bd000b,
-/* 0x015f: mmctx_base_disabled */
-	0xfd0099f0,
-	0x0bf405ee,
-	0xc6008018,
-	0x000ef601,
-	0x008004bd,
-	0x0ff601c7,
-	0xf004bd00,
-/* 0x017a: mmctx_multi_disabled */
-	0xabc80199,
-	0x10b4b600,
-	0xc80cb9f0,
-	0xe4b601ae,
-	0x05befd11,
-	0x01c50080,
-	0xbd000bf6,
-/* 0x0195: mmctx_exec_loop */
-/* 0x0195: mmctx_wait_free */
-	0xc5008e04,
-	0x00eecf01,
-	0xf41fe4f0,
-	0xce98f60b,
-	0x05e9fd00,
-	0x01c80080,
-	0xbd000ef6,
-	0x04c0b604,
-	0x1bf4cda4,
-	0x02abc8df,
-/* 0x01bf: mmctx_fini_wait */
-	0x8b1c1bf4,
-	0xcf01c500,
-	0xb4f000bb,
-	0x10b4b01f,
-	0x0af31bf4,
-	0x00b87e05,
-	0x250ef400,
-/* 0x01d8: mmctx_stop */
-	0xb600abc8,
-	0xb9f010b4,
-	0x12b9f00c,
-	0x01c50080,
-	0xbd000bf6,
-/* 0x01ed: mmctx_stop_wait */
-	0xc5008b04,
-	0x00bbcf01,
-	0xf412bbc8,
-/* 0x01fa: mmctx_done */
+	0x060af61b,
+	0x0000fa7e,
+	0x01cb008f,
+	0xf800ffcf,
+/* 0x009d: nv_wr32 */
+	0xcc008000,
+	0x000ff601,
+	0xecb204bd,
+	0xf01fc9f0,
+	0x00801ec9,
+	0x0cf601ca,
+/* 0x00b7: nv_wr32_wait */
+	0x8c04bd00,
+	0xcf01ca00,
+	0xccc800cc,
+	0xf61bf41f,
+/* 0x00c6: wait_donez */
+	0x94bd00f8,
+	0x800099f0,
+	0xf6023700,
+	0x04bd0009,
+	0x02060080,
+	0xbd000af6,
+/* 0x00dd: wait_donez_ne */
+	0x00008804,
+	0x0088cf01,
+	0xf4888aff,
 	0x94bdf61b,
-	0x800199f0,
+	0x800099f0,
+	0xf6021700,
+	0x04bd0009,
+/* 0x00fa: wait_doneo */
+	0x94bd00f8,
+	0x800099f0,
+	0xf6023700,
+	0x04bd0009,
+	0x02060080,
+	0xbd000af6,
+/* 0x0111: wait_doneo_e */
+	0x00008804,
+	0x0088cf01,
+	0xf4888aff,
+	0x94bdf60b,
+	0x800099f0,
 	0xf6021700,
 	0x04bd0009,
-/* 0x020a: strand_wait */
-	0xa0f900f8,
-	0xb87e020a,
-	0xa0fc0000,
-/* 0x0216: strand_pre */
-	0x0c0900f8,
-	0x024afc80,
+/* 0x012e: mmctx_size */
+	0x94bd00f8,
+/* 0x0130: nv_mmctx_size_loop */
+	0xb600e898,
+	0x80b61a85,
+	0x0284b601,
+	0xb60098bb,
+	0xefa404e0,
+	0xb2ec1bf4,
+/* 0x014b: mmctx_xfer */
+	0xbd00f89f,
+	0x0199f094,
+	0x02370080,
 	0xbd0009f6,
-	0x020a7e04,
-/* 0x0227: strand_post */
-	0x0900f800,
-	0x4afc800d,
-	0x0009f602,
-	0x0a7e04bd,
-	0x00f80002,
-/* 0x0238: strand_set */
-	0xfc800f0c,
-	0x0cf6024f,
-	0x0c04bd00,
-	0x4afc800b,
-	0x000cf602,
-	0xfc8004bd,
-	0x0ef6024f,
-	0x0c04bd00,
-	0x4afc800a,
-	0x000cf602,
-	0x0a7e04bd,
-	0x00f80002,
-/* 0x0268: strand_ctx_init */
-	0x99f094bd,
-	0x37008003,
-	0x0009f602,
-	0x167e04bd,
-	0x030e0002,
-	0x0002387e,
-	0xfc80c4bd,
-	0x0cf60247,
-	0x0c04bd00,
-	0x4afc8001,
-	0x000cf602,
-	0x0a7e04bd,
-	0x0c920002,
-	0x46fc8001,
-	0x000cf602,
-	0x020c04bd,
-	0x024afc80,
-	0xbd000cf6,
-	0x020a7e04,
-	0x02277e00,
-	0x42008800,
-	0x20008902,
-	0x0099cf02,
-/* 0x02c7: ctx_init_strand_loop */
-	0xf608fe95,
-	0x8ef6008e,
-	0x808acf40,
-	0xb606a5b6,
-	0xeabb01a0,
-	0x0480b600,
-	0xf40192b6,
-	0xe4b6e81b,
-	0xf2efbc08,
+	0xfd94bd04,
+	0x0bf405bb,
+	0xc400800f,
+	0x000bf601,
+	0x99f004bd,
+/* 0x016d: mmctx_base_disabled */
+	0x05eefd00,
+	0x80180bf4,
+	0xf601c600,
+	0x04bd000e,
+	0x01c70080,
+	0xbd000ff6,
+	0x0199f004,
+/* 0x0188: mmctx_multi_disabled */
+	0xb600abc8,
+	0xb9f010b4,
+	0x01aec80c,
+	0xfd11e4b6,
+	0x008005be,
+	0x0bf601c5,
+/* 0x01a3: mmctx_exec_loop */
+/* 0x01a3: mmctx_wait_free */
+	0x8e04bd00,
+	0xcf01c500,
+	0xe4f000ee,
+	0xf60bf41f,
+	0xfd00ce98,
+	0x008005e9,
+	0x0ef601c8,
+	0xb604bd00,
+	0xcda404c0,
+	0xc8df1bf4,
+	0x1bf402ab,
+/* 0x01cd: mmctx_fini_wait */
+	0xc5008b1c,
+	0x00bbcf01,
+	0xb01fb4f0,
+	0x1bf410b4,
+	0x7e050af3,
+	0xf40000c6,
+/* 0x01e6: mmctx_stop */
+	0xabc8250e,
+	0x10b4b600,
+	0xf00cb9f0,
+	0x008012b9,
+	0x0bf601c5,
+/* 0x01fb: mmctx_stop_wait */
+	0x8b04bd00,
+	0xcf01c500,
+	0xbbc800bb,
+	0xf61bf412,
+/* 0x0208: mmctx_done */
 	0x99f094bd,
-	0x17008003,
+	0x17008001,
 	0x0009f602,
 	0x00f804bd,
-/* 0x02f8: error */
-	0xffb2e0f9,
-	0x4098148e,
-	0x00008f7e,
-	0xffb2010f,
-	0x409c1c8e,
-	0x00008f7e,
-	0x00f8e0fc,
-/* 0x0314: init */
-	0x004104bd,
-	0x0011cf42,
-	0x010911e7,
-	0xfe0814b6,
-	0x02020014,
-	0xf6120040,
-	0x04bd0002,
-	0xfe048441,
-	0x00400010,
-	0x0000f607,
-	0x040204bd,
-	0xf6040040,
-	0x04bd0002,
-	0x821031f4,
-	0xcf018200,
-	0x01030022,
-	0xbb1f24f0,
-	0x32b60432,
-	0x0502b501,
-	0x820603b5,
-	0xcf018600,
-	0x02b50022,
-	0x0f24b604,
-	0x01c90080,
+/* 0x0218: strand_wait */
+	0x020aa0f9,
+	0x0000c67e,
+	0x00f8a0fc,
+/* 0x0224: strand_pre */
+	0xfc800c09,
+	0x09f6024a,
+	0x7e04bd00,
+	0xf8000218,
+/* 0x0235: strand_post */
+	0x800d0900,
+	0xf6024afc,
+	0x04bd0009,
+	0x0002187e,
+/* 0x0246: strand_set */
+	0x0f0c00f8,
+	0x024ffc80,
+	0xbd000cf6,
+	0x800b0c04,
+	0xf6024afc,
+	0x04bd000c,
+	0x024ffc80,
+	0xbd000ef6,
+	0x800a0c04,
+	0xf6024afc,
+	0x04bd000c,
+	0x0002187e,
+/* 0x0276: strand_ctx_init */
+	0x94bd00f8,
+	0x800399f0,
+	0xf6023700,
+	0x04bd0009,
+	0x0002247e,
+	0x467e030e,
+	0xc4bd0002,
+	0x0247fc80,
+	0xbd000cf6,
+	0x80010c04,
+	0xf6024afc,
+	0x04bd000c,
+	0x0002187e,
+	0x80010c92,
+	0xf60246fc,
+	0x04bd000c,
+	0xfc80020c,
+	0x0cf6024a,
+	0x7e04bd00,
+	0x7e000218,
+	0x88000235,
+	0x89024200,
+	0xcf022000,
+	0xfe950099,
+/* 0x02d5: ctx_init_strand_loop */
+	0x008ef608,
+	0xcf408ef6,
+	0xa5b6808a,
+	0x01a0b606,
+	0xb600eabb,
+	0x92b60480,
+	0xe81bf401,
+	0xbc08e4b6,
+	0x94bdf2ef,
+	0x800399f0,
+	0xf6021700,
+	0x04bd0009,
+/* 0x0306: error */
+	0xe0f900f8,
+	0x148effb2,
+	0x9d7e4098,
+	0x010f0000,
+	0x1c8effb2,
+	0x9d7e409c,
+	0xe0fc0000,
+/* 0x0322: init */
+	0x04bd00f8,
+	0xcf420041,
+	0x11e70011,
+	0x14b60109,
+	0x0014fe08,
+	0x00400202,
+	0x0002f612,
+	0x32f404bd,
+	0x04924100,
+	0x400010fe,
+	0x00f60700,
+	0x0204bd00,
+	0x04004004,
 	0xbd0002f6,
-	0x0c308e04,
-	0x01e5f050,
-	0x34bd24bd,
-/* 0x0386: init_unk_loop */
-	0x657e44bd,
-	0xf6b00000,
-	0x0e0bf400,
-	0xf2bb010f,
-	0x054ffd04,
-/* 0x039b: init_unk_next */
-	0xb60130b6,
-	0xe0b60120,
-	0x0126b004,
-/* 0x03a7: init_unk_done */
-	0xb5e21bf4,
-	0x04b50703,
-	0x01008208,
-	0x0022cf02,
-	0x259534bd,
-	0xc0008008,
-	0x0005f601,
-	0x008004bd,
-	0x05f601c1,
-	0x9804bd00,
-	0x0f98000e,
-	0x01207e01,
-	0x002fbb00,
-	0x98003fbb,
-	0x0f98010e,
-	0x01207e02,
-	0x050e9800,
-	0xbb00effd,
-	0x3ebb002e,
-	0x020e9800,
-	0x7e030f98,
-	0x98000120,
-	0xeffd070e,
-	0x002ebb00,
-	0xb6003ebb,
-	0x00800235,
-	0x03f601d3,
-	0xb604bd00,
-	0x35b60825,
-	0x0120b606,
-	0xb60130b6,
-	0x34b60824,
-	0x7e2fb208,
-	0xbb000268,
-	0x3fbb002f,
-	0x01008000,
-	0x0003f602,
-	0x24bd04bd,
-	0x801f29f0,
-	0xf6023000,
-	0x04bd0002,
-/* 0x0448: main */
-	0xf40031f4,
-	0x240d0028,
-	0x0000377e,
-	0xb0f401f4,
-	0x18f404e4,
-	0x0181fe1d,
-	0x20bd0602,
-	0xb60412fd,
-	0x1efd01e4,
-	0x0018fe05,
-	0x00051f7e,
-/* 0x0477: main_not_ctx_xfer */
-	0x94d40ef4,
-	0xf5f010ef,
-	0x02f87e01,
-	0xc70ef400,
-/* 0x0484: ih */
-	0x80f900f9,
-	0xf90188fe,
-	0xf990f980,
-	0xf9b0f9a0,
-	0xf9e0f9d0,
-	0x4a04bdf0,
-	0xaacf0200,
-	0x04abc400,
-	0x0d1f0bf4,
-	0x1a004e24,
-	0x4f00eecf,
-	0xffcf1900,
-	0x00047e00,
-	0x40010e00,
-	0x0ef61d00,
-/* 0x04c3: ih_no_fifo */
-	0x4004bd00,
-	0x0af60100,
-	0xfc04bd00,
-	0xfce0fcf0,
-	0xfcb0fcd0,
-	0xfc90fca0,
-	0x0088fe80,
-	0x00fc80fc,
-	0xf80032f4,
-/* 0x04e5: hub_barrier_done */
-	0x98010f01,
-	0xfebb040e,
-	0x8effb204,
-	0x7e409418,
-	0xf800008f,
-/* 0x04f9: ctx_redswitch */
-	0x80200f00,
-	0xf6018500,
-	0x04bd000f,
-/* 0x0506: ctx_redswitch_delay */
-	0xe2b6080e,
-	0xfd1bf401,
-	0x0800f5f1,
-	0x0200f5f1,
-	0x01850080,
-	0xbd000ff6,
-/* 0x051f: ctx_xfer */
-	0x8000f804,
-	0xf6028100,
-	0x04bd000f,
-	0x7e0711f4,
-/* 0x052f: ctx_xfer_not_load */
-	0x7e0004f9,
-	0xbd000216,
-	0x47fc8024,
-	0x0002f602,
-	0x2cf004bd,
-	0x0320b601,
-	0x024afc80,
+	0x1031f404,
+	0x01820082,
+	0x030022cf,
+	0x1f24f001,
+	0xb60432bb,
+	0x02b50132,
+	0x0603b505,
+	0x01860082,
+	0xb50022cf,
+	0x24b60402,
+	0xc900800f,
+	0x0002f601,
+	0x308e04bd,
+	0xe5f0500c,
+	0xbd24bd01,
+/* 0x0397: init_unk_loop */
+	0x7e44bd34,
+	0xb0000073,
+	0x0bf400f6,
+	0xbb010f0e,
+	0x4ffd04f2,
+	0x0130b605,
+/* 0x03ac: init_unk_next */
+	0xb60120b6,
+	0x26b004e0,
+	0xe21bf401,
+/* 0x03b8: init_unk_done */
+	0xb50703b5,
+	0x00820804,
+	0x22cf0201,
+	0x9534bd00,
+	0x00800825,
+	0x05f601c0,
+	0x8004bd00,
+	0xf601c100,
+	0x04bd0005,
+	0x98000e98,
+	0x2e7e010f,
+	0x2fbb0001,
+	0x003fbb00,
+	0x98010e98,
+	0x2e7e020f,
+	0x0e980001,
+	0x00effd05,
+	0xbb002ebb,
+	0x0e98003e,
+	0x030f9802,
+	0x00012e7e,
+	0xfd070e98,
+	0x2ebb00ef,
+	0x003ebb00,
+	0x800235b6,
+	0xf601d300,
+	0x04bd0003,
+	0xb60825b6,
+	0x20b60635,
+	0x0130b601,
+	0xb60824b6,
+	0x2fb20834,
+	0x0002767e,
+	0xbb002fbb,
+	0x0080003f,
+	0x03f60201,
+	0xbd04bd00,
+	0x1f29f024,
+	0x02300080,
 	0xbd0002f6,
-	0x01acf004,
-	0x8b02a5f0,
-	0x98500000,
-	0xc4b6040c,
-	0x00bcbb0f,
-	0x98000c98,
-	0x000e010d,
-	0x00013d7e,
-	0x8b01acf0,
-	0x98504000,
-	0xc4b6040c,
-	0x00bcbb0f,
-	0x98010c98,
-	0x0f98020d,
-	0x08004e06,
-	0x00013d7e,
-	0xf001acf0,
-	0x008b04a5,
-	0x0c985030,
-	0x0fc4b604,
-	0x9800bcbb,
-	0x0d98020c,
-	0x080f9803,
-	0x7e02004e,
-	0x7e00013d,
-	0xf400020a,
-	0x12f40601,
-/* 0x05b9: ctx_xfer_post */
-	0x02277e07,
-/* 0x05bd: ctx_xfer_done */
-	0x04e57e00,
-	0x0000f800,
-	0x00000000,
-	0x00000000,
-	0x00000000,
+/* 0x0459: main */
+	0x0028f404,
+	0x377e240d,
+	0x01f40000,
+	0x04e4b0f7,
+	0xfe1d18f4,
+	0x06020181,
+	0x12fd20bd,
+	0x01e4b604,
+	0xfe051efd,
+	0x2d7e0018,
+	0x0ef40005,
+/* 0x0485: main_not_ctx_xfer */
+	0x10ef94d7,
+	0x7e01f5f0,
+	0xf4000306,
+/* 0x0492: ih */
+	0x00f9ca0e,
+	0x88fe80f9,
+	0xf980f901,
+	0xf9a0f990,
+	0xf9d0f9b0,
+	0xbdf0f9e0,
+	0x02004a04,
+	0xc400aacf,
+	0x0bf404ab,
+	0x4e240d1f,
+	0xeecf1a00,
+	0x19004f00,
+	0x7e00ffcf,
+	0x0e000004,
+	0x1d004001,
+	0xbd000ef6,
+/* 0x04d1: ih_no_fifo */
+	0x01004004,
+	0xbd000af6,
+	0xfcf0fc04,
+	0xfcd0fce0,
+	0xfca0fcb0,
+	0xfe80fc90,
+	0x80fc0088,
+	0x32f400fc,
+/* 0x04f3: hub_barrier_done */
+	0x0f01f800,
+	0x040e9801,
+	0xb204febb,
+	0x94188eff,
+	0x009d7e40,
+/* 0x0507: ctx_redswitch */
+	0x0f00f800,
+	0x85008020,
+	0x000ff601,
+	0x080e04bd,
+/* 0x0514: ctx_redswitch_delay */
+	0xf401e2b6,
+	0xf5f1fd1b,
+	0xf5f10800,
+	0x00800200,
+	0x0ff60185,
+	0xf804bd00,
+/* 0x052d: ctx_xfer */
+	0x81008000,
+	0x000ff602,
+	0x11f404bd,
+	0x05077e07,
+/* 0x053d: ctx_xfer_not_load */
+	0x02247e00,
+	0x8024bd00,
+	0xf60247fc,
+	0x04bd0002,
+	0xb6012cf0,
+	0xfc800320,
+	0x02f6024a,
+	0xf004bd00,
+	0xa5f001ac,
+	0x00008b02,
+	0x040c9850,
+	0xbb0fc4b6,
+	0x0c9800bc,
+	0x010d9800,
+	0x4b7e000e,
+	0xacf00001,
+	0x40008b01,
+	0x040c9850,
+	0xbb0fc4b6,
+	0x0c9800bc,
+	0x020d9801,
+	0x4e060f98,
+	0x4b7e0800,
+	0xacf00001,
+	0x04a5f001,
+	0x5030008b,
+	0xb6040c98,
+	0xbcbb0fc4,
+	0x020c9800,
+	0x98030d98,
+	0x004e080f,
+	0x014b7e02,
+	0x02187e00,
+	0x0601f400,
+/* 0x05c7: ctx_xfer_post */
+	0x7e0712f4,
+/* 0x05cb: ctx_xfer_done */
+	0x7e000235,
+	0xf80004f3,
 	0x00000000,
 	0x00000000,
 	0x00000000,
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgm107.fuc5.h b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgm107.fuc5.h
index fa9f3c0..4a61214 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgm107.fuc5.h
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpcgm107.fuc5.h
@@ -41,13 +41,13 @@ uint32_t gm107_grgpc_data[] = {
 };
 
 uint32_t gm107_grgpc_code[] = {
-	0x03410ef5,
+	0x034f0ef5,
 /* 0x0004: queue_put */
 	0x9800d898,
 	0x86f001d9,
 	0xf489a408,
 	0x020f0b1b,
-	0x0002f87e,
+	0x0003067e,
 /* 0x001a: queue_put_next */
 	0x98c400f8,
 	0x0384b607,
@@ -58,512 +58,512 @@ uint32_t gm107_grgpc_code[] = {
 	0xd9b50f94,
 /* 0x0037: queue_get */
 	0xf400f801,
-	0xd8980131,
-	0x01d99800,
-	0x0bf489a4,
-	0x0789c421,
-	0xbb0394b6,
-	0x90b6009d,
-	0x009e9808,
-	0xb6019f98,
-	0x84f00180,
-	0x00d8b50f,
-/* 0x0063: queue_get_done */
-	0xf80132f4,
-/* 0x0065: nv_rd32 */
-	0xf0ecb200,
-	0x00801fc9,
-	0x0cf601ca,
-/* 0x0073: nv_rd32_wait */
-	0x8c04bd00,
-	0xcf01ca00,
-	0xccc800cc,
-	0xf61bf41f,
-	0xec7e060a,
-	0x008f0000,
-	0xffcf01cb,
-/* 0x008f: nv_wr32 */
-	0x8000f800,
-	0xf601cc00,
-	0x04bd000f,
-	0xc9f0ecb2,
-	0x1ec9f01f,
+	0x31f40131,
+	0x00d89800,
+	0xa401d998,
+	0x2c0bf489,
+	0xb60789c4,
+	0x9dbb0394,
+	0x0890b600,
+	0x98009e98,
+	0x80b6019f,
+	0x0f84f001,
+	0xf400d8b5,
+	0xd9980132,
+	0xf489a401,
+	0x32f4060b,
+/* 0x0071: queue_get_done */
+/* 0x0073: nv_rd32 */
+	0xb200f800,
+	0x1fc9f0ec,
 	0x01ca0080,
 	0xbd000cf6,
-/* 0x00a9: nv_wr32_wait */
+/* 0x0081: nv_rd32_wait */
 	0xca008c04,
 	0x00cccf01,
 	0xf41fccc8,
-	0x00f8f61b,
-/* 0x00b8: wait_donez */
-	0x99f094bd,
-	0x37008000,
-	0x0009f602,
-	0x008004bd,
-	0x0af60206,
-/* 0x00cf: wait_donez_ne */
-	0x8804bd00,
-	0xcf010000,
-	0x8aff0088,
-	0xf61bf488,
-	0x99f094bd,
-	0x17008000,
-	0x0009f602,
-	0x00f804bd,
-/* 0x00ec: wait_doneo */
-	0x99f094bd,
-	0x37008000,
-	0x0009f602,
-	0x008004bd,
-	0x0af60206,
-/* 0x0103: wait_doneo_e */
-	0x8804bd00,
-	0xcf010000,
-	0x8aff0088,
-	0xf60bf488,
-	0x99f094bd,
-	0x17008000,
-	0x0009f602,
-	0x00f804bd,
-/* 0x0120: mmctx_size */
-/* 0x0122: nv_mmctx_size_loop */
-	0xe89894bd,
-	0x1a85b600,
-	0xb60180b6,
-	0x98bb0284,
-	0x04e0b600,
-	0x1bf4efa4,
-	0xf89fb2ec,
-/* 0x013d: mmctx_xfer */
-	0xf094bd00,
-	0x00800199,
-	0x09f60237,
-	0xbd04bd00,
-	0x05bbfd94,
-	0x800f0bf4,
-	0xf601c400,
-	0x04bd000b,
-/* 0x015f: mmctx_base_disabled */
-	0xfd0099f0,
-	0x0bf405ee,
-	0xc6008018,
-	0x000ef601,
-	0x008004bd,
-	0x0ff601c7,
-	0xf004bd00,
-/* 0x017a: mmctx_multi_disabled */
-	0xabc80199,
-	0x10b4b600,
-	0xc80cb9f0,
-	0xe4b601ae,
-	0x05befd11,
-	0x01c50080,
-	0xbd000bf6,
-/* 0x0195: mmctx_exec_loop */
-/* 0x0195: mmctx_wait_free */
-	0xc5008e04,
-	0x00eecf01,
-	0xf41fe4f0,
-	0xce98f60b,
-	0x05e9fd00,
-	0x01c80080,
-	0xbd000ef6,
-	0x04c0b604,
-	0x1bf4cda4,
-	0x02abc8df,
-/* 0x01bf: mmctx_fini_wait */
-	0x8b1c1bf4,
-	0xcf01c500,
-	0xb4f000bb,
-	0x10b4b01f,
-	0x0af31bf4,
-	0x00b87e05,
-	0x250ef400,
-/* 0x01d8: mmctx_stop */
-	0xb600abc8,
-	0xb9f010b4,
-	0x12b9f00c,
-	0x01c50080,
-	0xbd000bf6,
-/* 0x01ed: mmctx_stop_wait */
-	0xc5008b04,
-	0x00bbcf01,
-	0xf412bbc8,
-/* 0x01fa: mmctx_done */
+	0x060af61b,
+	0x0000fa7e,
+	0x01cb008f,
+	0xf800ffcf,
+/* 0x009d: nv_wr32 */
+	0xcc008000,
+	0x000ff601,
+	0xecb204bd,
+	0xf01fc9f0,
+	0x00801ec9,
+	0x0cf601ca,
+/* 0x00b7: nv_wr32_wait */
+	0x8c04bd00,
+	0xcf01ca00,
+	0xccc800cc,
+	0xf61bf41f,
+/* 0x00c6: wait_donez */
+	0x94bd00f8,
+	0x800099f0,
+	0xf6023700,
+	0x04bd0009,
+	0x02060080,
+	0xbd000af6,
+/* 0x00dd: wait_donez_ne */
+	0x00008804,
+	0x0088cf01,
+	0xf4888aff,
 	0x94bdf61b,
-	0x800199f0,
+	0x800099f0,
 	0xf6021700,
 	0x04bd0009,
-/* 0x020a: strand_wait */
-	0xa0f900f8,
-	0xb87e020a,
-	0xa0fc0000,
-/* 0x0216: strand_pre */
-	0x0c0900f8,
-	0x024afc80,
+/* 0x00fa: wait_doneo */
+	0x94bd00f8,
+	0x800099f0,
+	0xf6023700,
+	0x04bd0009,
+	0x02060080,
+	0xbd000af6,
+/* 0x0111: wait_doneo_e */
+	0x00008804,
+	0x0088cf01,
+	0xf4888aff,
+	0x94bdf60b,
+	0x800099f0,
+	0xf6021700,
+	0x04bd0009,
+/* 0x012e: mmctx_size */
+	0x94bd00f8,
+/* 0x0130: nv_mmctx_size_loop */
+	0xb600e898,
+	0x80b61a85,
+	0x0284b601,
+	0xb60098bb,
+	0xefa404e0,
+	0xb2ec1bf4,
+/* 0x014b: mmctx_xfer */
+	0xbd00f89f,
+	0x0199f094,
+	0x02370080,
 	0xbd0009f6,
-	0x020a7e04,
-/* 0x0227: strand_post */
-	0x0900f800,
-	0x4afc800d,
-	0x0009f602,
-	0x0a7e04bd,
-	0x00f80002,
-/* 0x0238: strand_set */
-	0xfc800f0c,
-	0x0cf6024f,
-	0x0c04bd00,
-	0x4afc800b,
-	0x000cf602,
-	0xfc8004bd,
-	0x0ef6024f,
-	0x0c04bd00,
-	0x4afc800a,
-	0x000cf602,
-	0x0a7e04bd,
-	0x00f80002,
-/* 0x0268: strand_ctx_init */
-	0x99f094bd,
-	0x37008003,
-	0x0009f602,
-	0x167e04bd,
-	0x030e0002,
-	0x0002387e,
-	0xfc80c4bd,
-	0x0cf60247,
-	0x0c04bd00,
-	0x4afc8001,
-	0x000cf602,
-	0x0a7e04bd,
-	0x0c920002,
-	0x46fc8001,
-	0x000cf602,
-	0x020c04bd,
-	0x024afc80,
-	0xbd000cf6,
-	0x020a7e04,
-	0x02277e00,
-	0x42008800,
-	0x20008902,
-	0x0099cf02,
-/* 0x02c7: ctx_init_strand_loop */
-	0xf608fe95,
-	0x8ef6008e,
-	0x808acf40,
-	0xb606a5b6,
-	0xeabb01a0,
-	0x0480b600,
-	0xf40192b6,
-	0xe4b6e81b,
-	0xf2efbc08,
+	0xfd94bd04,
+	0x0bf405bb,
+	0xc400800f,
+	0x000bf601,
+	0x99f004bd,
+/* 0x016d: mmctx_base_disabled */
+	0x05eefd00,
+	0x80180bf4,
+	0xf601c600,
+	0x04bd000e,
+	0x01c70080,
+	0xbd000ff6,
+	0x0199f004,
+/* 0x0188: mmctx_multi_disabled */
+	0xb600abc8,
+	0xb9f010b4,
+	0x01aec80c,
+	0xfd11e4b6,
+	0x008005be,
+	0x0bf601c5,
+/* 0x01a3: mmctx_exec_loop */
+/* 0x01a3: mmctx_wait_free */
+	0x8e04bd00,
+	0xcf01c500,
+	0xe4f000ee,
+	0xf60bf41f,
+	0xfd00ce98,
+	0x008005e9,
+	0x0ef601c8,
+	0xb604bd00,
+	0xcda404c0,
+	0xc8df1bf4,
+	0x1bf402ab,
+/* 0x01cd: mmctx_fini_wait */
+	0xc5008b1c,
+	0x00bbcf01,
+	0xb01fb4f0,
+	0x1bf410b4,
+	0x7e050af3,
+	0xf40000c6,
+/* 0x01e6: mmctx_stop */
+	0xabc8250e,
+	0x10b4b600,
+	0xf00cb9f0,
+	0x008012b9,
+	0x0bf601c5,
+/* 0x01fb: mmctx_stop_wait */
+	0x8b04bd00,
+	0xcf01c500,
+	0xbbc800bb,
+	0xf61bf412,
+/* 0x0208: mmctx_done */
 	0x99f094bd,
-	0x17008003,
+	0x17008001,
 	0x0009f602,
 	0x00f804bd,
-/* 0x02f8: error */
-	0xffb2e0f9,
-	0x4098148e,
-	0x00008f7e,
-	0xffb2010f,
-	0x409c1c8e,
-	0x00008f7e,
-	0x00f8e0fc,
-/* 0x0314: tpc_strand_wait */
-	0x94bd90f9,
-	0x800a99f0,
+/* 0x0218: strand_wait */
+	0x020aa0f9,
+	0x0000c67e,
+	0x00f8a0fc,
+/* 0x0224: strand_pre */
+	0xfc800c09,
+	0x09f6024a,
+	0x7e04bd00,
+	0xf8000218,
+/* 0x0235: strand_post */
+	0x800d0900,
+	0xf6024afc,
+	0x04bd0009,
+	0x0002187e,
+/* 0x0246: strand_set */
+	0x0f0c00f8,
+	0x024ffc80,
+	0xbd000cf6,
+	0x800b0c04,
+	0xf6024afc,
+	0x04bd000c,
+	0x024ffc80,
+	0xbd000ef6,
+	0x800a0c04,
+	0xf6024afc,
+	0x04bd000c,
+	0x0002187e,
+/* 0x0276: strand_ctx_init */
+	0x94bd00f8,
+	0x800399f0,
 	0xf6023700,
 	0x04bd0009,
-/* 0x0324: tpc_strand_busy */
-	0x033f0089,
-	0xb30099cf,
-	0xbdf90094,
-	0x0a99f094,
-	0x02170080,
-	0xbd0009f6,
-	0xf890fc04,
-/* 0x0341: init */
-	0x4104bd00,
-	0x11cf4200,
-	0x0911e700,
-	0x0814b601,
-	0x020014fe,
-	0x12004002,
-	0xbd0002f6,
-	0x05ad4104,
-	0x400010fe,
-	0x00f60700,
-	0x0204bd00,
-	0x04004004,
-	0xbd0002f6,
-	0x1031f404,
-	0x01820082,
-	0x030022cf,
-	0x1f24f001,
-	0xb60432bb,
-	0x02b50132,
-	0x0603b505,
-	0x01860082,
-	0xb50022cf,
-	0x24b60402,
-	0xc900800f,
-	0x0002f601,
-	0x308e04bd,
-	0xe5f0500c,
-	0xbd24bd01,
-/* 0x03b3: init_unk_loop */
-	0x7e44bd34,
-	0xb0000065,
-	0x0bf400f6,
-	0xbb010f0e,
-	0x4ffd04f2,
-	0x0130b605,
-/* 0x03c8: init_unk_next */
-	0xb60120b6,
-	0x26b004e0,
-	0xe21bf402,
-/* 0x03d4: init_unk_done */
-	0xb50703b5,
-	0x00820804,
-	0x22cf0201,
-	0x9534bd00,
-	0x00800825,
-	0x05f601c0,
-	0x8004bd00,
-	0xf601c100,
+	0x0002247e,
+	0x467e030e,
+	0xc4bd0002,
+	0x0247fc80,
+	0xbd000cf6,
+	0x80010c04,
+	0xf6024afc,
+	0x04bd000c,
+	0x0002187e,
+	0x80010c92,
+	0xf60246fc,
+	0x04bd000c,
+	0xfc80020c,
+	0x0cf6024a,
+	0x7e04bd00,
+	0x7e000218,
+	0x88000235,
+	0x89024200,
+	0xcf022000,
+	0xfe950099,
+/* 0x02d5: ctx_init_strand_loop */
+	0x008ef608,
+	0xcf408ef6,
+	0xa5b6808a,
+	0x01a0b606,
+	0xb600eabb,
+	0x92b60480,
+	0xe81bf401,
+	0xbc08e4b6,
+	0x94bdf2ef,
+	0x800399f0,
+	0xf6021700,
+	0x04bd0009,
+/* 0x0306: error */
+	0xe0f900f8,
+	0x148effb2,
+	0x9d7e4098,
+	0x010f0000,
+	0x1c8effb2,
+	0x9d7e409c,
+	0xe0fc0000,
+/* 0x0322: tpc_strand_wait */
+	0x90f900f8,
+	0x99f094bd,
+	0x3700800a,
+	0x0009f602,
+/* 0x0332: tpc_strand_busy */
+	0x008904bd,
+	0x99cf033f,
+	0x0094b300,
+	0xf094bdf9,
+	0x00800a99,
+	0x09f60217,
+	0xfc04bd00,
+/* 0x034f: init */
+	0xbd00f890,
+	0x42004104,
+	0xe70011cf,
+	0xb6010911,
+	0x14fe0814,
+	0x40020200,
+	0x02f61200,
+	0xf404bd00,
+	0xbb410032,
+	0x0010fe05,
+	0xf6070040,
+	0x04bd0000,
+	0x00400402,
+	0x0002f604,
+	0x31f404bd,
+	0x82008210,
+	0x0022cf01,
+	0x24f00103,
+	0x0432bb1f,
+	0xb50132b6,
+	0x03b50502,
+	0x86008206,
+	0x0022cf01,
+	0xb60402b5,
+	0x00800f24,
+	0x02f601c9,
+	0x8e04bd00,
+	0xf0500c30,
+	0x24bd01e5,
+	0x44bd34bd,
+/* 0x03c4: init_unk_loop */
+	0x0000737e,
+	0xf400f6b0,
+	0x010f0e0b,
+	0xfd04f2bb,
+	0x30b6054f,
+/* 0x03d9: init_unk_next */
+	0x0120b601,
+	0xb004e0b6,
+	0x1bf40226,
+/* 0x03e5: init_unk_done */
+	0x0703b5e2,
+	0x820804b5,
+	0xcf020100,
+	0x34bd0022,
+	0x80082595,
+	0xf601c000,
 	0x04bd0005,
-	0x98000e98,
-	0x207e010f,
-	0x2fbb0001,
-	0x003fbb00,
-	0x98010e98,
-	0x207e020f,
-	0x0e980001,
-	0x00effd05,
-	0xbb002ebb,
-	0x0e98003e,
-	0x030f9802,
-	0x0001207e,
-	0xfd070e98,
-	0x2ebb00ef,
-	0x003ebb00,
-	0x800235b6,
-	0xf601d300,
-	0x04bd0003,
-	0xb60825b6,
-	0x20b60635,
-	0x0130b601,
-	0xb60824b6,
-	0x2fb20834,
-	0x0002687e,
-	0xbb002fbb,
-	0x3f0f003f,
-	0x501d608e,
+	0x01c10080,
+	0xbd0005f6,
+	0x000e9804,
+	0x7e010f98,
+	0xbb00012e,
+	0x3fbb002f,
+	0x010e9800,
+	0x7e020f98,
+	0x9800012e,
+	0xeffd050e,
+	0x002ebb00,
+	0x98003ebb,
+	0x0f98020e,
+	0x012e7e03,
+	0x070e9800,
+	0xbb00effd,
+	0x3ebb002e,
+	0x0235b600,
+	0x01d30080,
+	0xbd0003f6,
+	0x0825b604,
+	0xb60635b6,
+	0x30b60120,
+	0x0824b601,
+	0xb20834b6,
+	0x02767e2f,
+	0x002fbb00,
+	0x0f003fbb,
+	0x1d608e3f,
+	0x01e5f050,
+	0x9d7effb2,
+	0x0c0f0000,
+	0x501da88e,
 	0xb201e5f0,
-	0x008f7eff,
-	0x8e0c0f00,
-	0xf0501da8,
+	0x009d7eff,
+	0x03227e00,
+	0x8e3f0f00,
+	0xf0501d60,
 	0xffb201e5,
-	0x00008f7e,
-	0x0003147e,
-	0x608e3f0f,
+	0x00009d7e,
+	0x9c8e000f,
 	0xe5f0501d,
 	0x7effb201,
-	0x0f00008f,
-	0x1d9c8e00,
+	0x0f00009d,
+	0x03227e01,
+	0x1da88e00,
 	0x01e5f050,
-	0x8f7effb2,
-	0x010f0000,
-	0x0003147e,
-	0x501da88e,
+	0x9d7effb2,
+	0xff0f0000,
+	0x501d988e,
 	0xb201e5f0,
-	0x008f7eff,
-	0x8eff0f00,
-	0xf0501d98,
+	0x009d7eff,
+	0x8e020f00,
+	0xf0501da8,
 	0xffb201e5,
-	0x00008f7e,
-	0xa88e020f,
+	0x00009d7e,
+	0x0003227e,
+	0x85050498,
+	0xf0504000,
+/* 0x04ee: tpc_strand_init_tpc_loop */
+	0x5eb80155,
+	0x7e000570,
+	0xb2000073,
+/* 0x04fb: tpc_strand_init_idx_loop */
+	0xb874bdf6,
+	0x0005605e,
+	0x9d7e7fb2,
+	0x5eb80000,
+	0x95000588,
+	0x9d7e082f,
+	0x5eb80000,
+	0x9500058c,
+	0x9d7e082f,
+	0x5eb80000,
+	0x7e000590,
+	0xb6000073,
+	0xf0b606f5,
+	0x08f4b601,
+	0xbb002fbb,
+	0x70b6003f,
+	0x0162b601,
+	0xb7bf1bf4,
+	0xb6080050,
+	0x1bf40142,
+	0x8e3f0fa8,
+	0xf0501d60,
+	0xffb201e5,
+	0x00009d7e,
+	0xa88e0d0f,
 	0xe5f0501d,
 	0x7effb201,
-	0x7e00008f,
-	0x98000314,
-	0x00850504,
-	0x55f05040,
-/* 0x04dd: tpc_strand_init_tpc_loop */
-	0x705eb801,
-	0x657e0005,
-	0xf6b20000,
-/* 0x04ea: tpc_strand_init_idx_loop */
-	0x5eb874bd,
-	0xb2000560,
-	0x008f7e7f,
-	0x885eb800,
-	0x2f950005,
-	0x008f7e08,
-	0x8c5eb800,
-	0x2f950005,
-	0x008f7e08,
-	0x905eb800,
-	0x657e0005,
-	0xf5b60000,
-	0x01f0b606,
-	0xbb08f4b6,
-	0x3fbb002f,
-	0x0170b600,
-	0xf40162b6,
-	0x50b7bf1b,
-	0x42b60800,
-	0xa81bf401,
+	0x7e00009d,
+	0x80000322,
+	0xf6020100,
+	0x04bd0003,
+	0x29f024bd,
+	0x3000801f,
+	0x0002f602,
+/* 0x0582: main */
+	0x28f404bd,
+	0x7e240d00,
+	0xf4000037,
+	0xe4b0f701,
+	0x1d18f404,
+	0x020181fe,
+	0xfd20bd06,
+	0xe4b60412,
+	0x051efd01,
+	0x7e0018fe,
+	0xf4000656,
+/* 0x05ae: main_not_ctx_xfer */
+	0xef94d70e,
+	0x01f5f010,
+	0x0003067e,
+/* 0x05bb: ih */
+	0xf9ca0ef4,
+	0xfe80f900,
+	0x80f90188,
+	0xa0f990f9,
+	0xd0f9b0f9,
+	0xf0f9e0f9,
+	0x004a04bd,
+	0x00aacf02,
+	0xf404abc4,
+	0x240d1f0b,
+	0xcf1a004e,
+	0x004f00ee,
+	0x00ffcf19,
+	0x0000047e,
+	0x0040010e,
+	0x000ef61d,
+/* 0x05fa: ih_no_fifo */
+	0x004004bd,
+	0x000af601,
+	0xf0fc04bd,
+	0xd0fce0fc,
+	0xa0fcb0fc,
+	0x80fc90fc,
+	0xfc0088fe,
+	0xf400fc80,
+	0x01f80032,
+/* 0x061c: hub_barrier_done */
+	0x0e98010f,
+	0x04febb04,
+	0x188effb2,
+	0x9d7e4094,
+	0x00f80000,
+/* 0x0630: ctx_redswitch */
+	0x0080200f,
+	0x0ff60185,
+	0x0e04bd00,
+/* 0x063d: ctx_redswitch_delay */
+	0x01e2b608,
+	0xf1fd1bf4,
+	0xf10800f5,
+	0x800200f5,
+	0xf6018500,
+	0x04bd000f,
+/* 0x0656: ctx_xfer */
+	0x008000f8,
+	0x0ff60281,
+	0x8e04bd00,
+	0xf0501dc4,
+	0xffb201e5,
+	0x00009d7e,
+	0x7e0711f4,
+/* 0x0673: ctx_xfer_not_load */
+	0x7e000630,
+	0xbd000224,
+	0x47fc8024,
+	0x0002f602,
+	0x2cf004bd,
+	0x0320b601,
+	0x024afc80,
+	0xbd0002f6,
+	0x8e0c0f04,
+	0xf0501da8,
+	0xffb201e5,
+	0x00009d7e,
+	0x0003227e,
 	0x608e3f0f,
 	0xe5f0501d,
 	0x7effb201,
-	0x0f00008f,
-	0x1da88e0d,
-	0x01e5f050,
-	0x8f7effb2,
-	0x147e0000,
-	0x00800003,
-	0x03f60201,
-	0xbd04bd00,
-	0x1f29f024,
-	0x02300080,
-	0xbd0002f6,
-/* 0x0571: main */
-	0x0031f404,
-	0x0d0028f4,
-	0x00377e24,
-	0xf401f400,
-	0xf404e4b0,
-	0x81fe1d18,
-	0xbd060201,
-	0x0412fd20,
-	0xfd01e4b6,
-	0x18fe051e,
-	0x06487e00,
-	0xd40ef400,
-/* 0x05a0: main_not_ctx_xfer */
-	0xf010ef94,
-	0xf87e01f5,
-	0x0ef40002,
-/* 0x05ad: ih */
-	0xf900f9c7,
-	0x0188fe80,
-	0x90f980f9,
-	0xb0f9a0f9,
-	0xe0f9d0f9,
-	0x04bdf0f9,
-	0xcf02004a,
-	0xabc400aa,
-	0x1f0bf404,
-	0x004e240d,
-	0x00eecf1a,
-	0xcf19004f,
-	0x047e00ff,
-	0x010e0000,
-	0xf61d0040,
-	0x04bd000e,
-/* 0x05ec: ih_no_fifo */
-	0xf6010040,
-	0x04bd000a,
-	0xe0fcf0fc,
-	0xb0fcd0fc,
-	0x90fca0fc,
-	0x88fe80fc,
-	0xfc80fc00,
-	0x0032f400,
-/* 0x060e: hub_barrier_done */
-	0x010f01f8,
-	0xbb040e98,
-	0xffb204fe,
-	0x4094188e,
-	0x00008f7e,
-/* 0x0622: ctx_redswitch */
-	0x200f00f8,
-	0x01850080,
-	0xbd000ff6,
-/* 0x062f: ctx_redswitch_delay */
-	0xb6080e04,
-	0x1bf401e2,
-	0x00f5f1fd,
-	0x00f5f108,
-	0x85008002,
-	0x000ff601,
-	0x00f804bd,
-/* 0x0648: ctx_xfer */
-	0x02810080,
-	0xbd000ff6,
-	0x1dc48e04,
+	0x0f00009d,
+	0x1d9c8e00,
 	0x01e5f050,
-	0x8f7effb2,
-	0x11f40000,
-	0x06227e07,
-/* 0x0665: ctx_xfer_not_load */
-	0x02167e00,
-	0x8024bd00,
-	0xf60247fc,
-	0x04bd0002,
-	0xb6012cf0,
-	0xfc800320,
-	0x02f6024a,
-	0x0f04bd00,
-	0x1da88e0c,
+	0x9d7effb2,
+	0x010f0000,
+	0x0003227e,
+	0xb601fcf0,
+	0xa88e03f0,
+	0xe5f0501d,
+	0x7effb201,
+	0xf000009d,
+	0xa5f001ac,
+	0x00008b02,
+	0x040c9850,
+	0xbb0fc4b6,
+	0x0c9800bc,
+	0x010d9800,
+	0x4b7e000e,
+	0xacf00001,
+	0x40008b01,
+	0x040c9850,
+	0xbb0fc4b6,
+	0x0c9800bc,
+	0x020d9801,
+	0x4e060f98,
+	0x4b7e0800,
+	0xacf00001,
+	0x04a5f001,
+	0x5030008b,
+	0xb6040c98,
+	0xbcbb0fc4,
+	0x020c9800,
+	0x98030d98,
+	0x004e080f,
+	0x014b7e02,
+	0x02187e00,
+	0x03227e00,
+	0x0601f400,
+/* 0x074b: ctx_xfer_post */
+	0x7e1a12f4,
+	0x0f000235,
+	0x1da88e0d,
 	0x01e5f050,
-	0x8f7effb2,
-	0x147e0000,
-	0x3f0f0003,
-	0x501d608e,
-	0xb201e5f0,
-	0x008f7eff,
-	0x8e000f00,
-	0xf0501d9c,
-	0xffb201e5,
-	0x00008f7e,
-	0x147e010f,
-	0xfcf00003,
-	0x03f0b601,
-	0x501da88e,
-	0xb201e5f0,
-	0x008f7eff,
-	0x01acf000,
-	0x8b02a5f0,
-	0x98500000,
-	0xc4b6040c,
-	0x00bcbb0f,
-	0x98000c98,
-	0x000e010d,
-	0x00013d7e,
-	0x8b01acf0,
-	0x98504000,
-	0xc4b6040c,
-	0x00bcbb0f,
-	0x98010c98,
-	0x0f98020d,
-	0x08004e06,
-	0x00013d7e,
-	0xf001acf0,
-	0x008b04a5,
-	0x0c985030,
-	0x0fc4b604,
-	0x9800bcbb,
-	0x0d98020c,
-	0x080f9803,
-	0x7e02004e,
-	0x7e00013d,
-	0x7e00020a,
-	0xf4000314,
-	0x12f40601,
-/* 0x073d: ctx_xfer_post */
-	0x02277e1a,
-	0x8e0d0f00,
-	0xf0501da8,
-	0xffb201e5,
-	0x00008f7e,
-	0x0003147e,
-/* 0x0754: ctx_xfer_done */
-	0x00060e7e,
-	0x000000f8,
-	0x00000000,
-	0x00000000,
-	0x00000000,
+	0x9d7effb2,
+	0x227e0000,
+/* 0x0762: ctx_xfer_done */
+	0x1c7e0003,
+	0x00f80006,
 	0x00000000,
 	0x00000000,
 	0x00000000,
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hub.fuc b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hub.fuc
index e3a2fb3..d0d6b9a 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hub.fuc
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hub.fuc
@@ -80,6 +80,9 @@ init:
 	mov $r2 NV_PGRAPH_FECS_ACCESS_FIFO
 	nv_iowr(NV_PGRAPH_FECS_ACCESS, 0, $r2)
 
+	// Mark fifo empty
+	bclr $flags $p0
+
 	// setup i0 handler, and route all interrupts to it
 	mov $r1 #ih
 	mov $iv0 $r1
@@ -220,7 +223,6 @@ init:
 //
 main:
 	// sleep until we have something to do
-	bset $flags $p0
 	sleep $p0
 	mov $r13 #cmd_queue
 	call(queue_get)
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgf100.fuc3.h b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgf100.fuc3.h
index 397921a..89fd3b8 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgf100.fuc3.h
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgf100.fuc3.h
@@ -206,14 +206,14 @@ uint32_t gf100_grhub_data[] = {
 };
 
 uint32_t gf100_grhub_code[] = {
-	0x039b0ef5,
+	0x03aa0ef5,
 /* 0x0004: queue_put */
 	0x9800d898,
 	0x86f001d9,
 	0x0489b808,
 	0xf00c1bf4,
 	0x21f502f7,
-	0x00f8037e,
+	0x00f8038d,
 /* 0x001c: queue_put_next */
 	0xb60798c4,
 	0x8dbb0384,
@@ -224,786 +224,786 @@ uint32_t gf100_grhub_code[] = {
 	0xf801d980,
 /* 0x0039: queue_get */
 	0x0131f400,
-	0x9800d898,
-	0x89b801d9,
-	0x210bf404,
-	0xb60789c4,
-	0x9dbb0394,
-	0x0890b600,
-	0x98009e98,
-	0x80b6019f,
-	0x0f84f001,
-	0xf400d880,
-/* 0x0066: queue_get_done */
-	0x00f80132,
-/* 0x0068: nv_rd32 */
+	0x980031f4,
+	0xd99800d8,
+	0x0489b801,
+	0xc42d0bf4,
+	0x94b60789,
+	0x009dbb03,
+	0x980890b6,
+	0x9f98009e,
+	0x0180b601,
+	0x800f84f0,
+	0x32f400d8,
+	0x01d99801,
+	0xf40489b8,
+	0x32f4060b,
+/* 0x0075: queue_get_done */
+/* 0x0077: nv_rd32 */
+	0xb900f800,
+	0xc9f002ec,
+	0x0007f11f,
+	0x0103f0ca,
+	0xbd000cd0,
+/* 0x0089: nv_rd32_wait */
+	0x00c7f104,
+	0x01c3f0ca,
+	0xc800cccf,
+	0x1bf41fcc,
+	0x06a7f0f3,
+	0x011f21f5,
+	0xcb00f7f1,
+	0xcf01f3f0,
+	0x00f800ff,
+/* 0x00ac: nv_wr32 */
+	0xcc0007f1,
+	0xd00103f0,
+	0x04bd000f,
 	0xf002ecb9,
-	0x07f11fc9,
-	0x03f0ca00,
-	0x000cd001,
-/* 0x007a: nv_rd32_wait */
-	0xc7f104bd,
-	0xc3f0ca00,
-	0x00cccf01,
-	0xf41fccc8,
-	0xa7f0f31b,
-	0x1021f506,
-	0x00f7f101,
-	0x01f3f0cb,
-	0xf800ffcf,
-/* 0x009d: nv_wr32 */
-	0x0007f100,
-	0x0103f0cc,
-	0xbd000fd0,
-	0x02ecb904,
-	0xf01fc9f0,
-	0x07f11ec9,
-	0x03f0ca00,
-	0x000cd001,
-/* 0x00be: nv_wr32_wait */
-	0xc7f104bd,
-	0xc3f0ca00,
-	0x00cccf01,
-	0xf41fccc8,
-	0x00f8f31b,
-/* 0x00d0: wait_donez */
-	0x99f094bd,
-	0x0007f100,
-	0x0203f00f,
-	0xbd0009d0,
-	0x0007f104,
-	0x0203f006,
-	0xbd000ad0,
-/* 0x00ed: wait_donez_ne */
-	0x0087f104,
-	0x0183f000,
-	0xff0088cf,
-	0x1bf4888a,
-	0xf094bdf3,
-	0x07f10099,
-	0x03f01700,
-	0x0009d002,
-	0x00f804bd,
-/* 0x0110: wait_doneo */
+	0xc9f01fc9,
+	0x0007f11e,
+	0x0103f0ca,
+	0xbd000cd0,
+/* 0x00cd: nv_wr32_wait */
+	0x00c7f104,
+	0x01c3f0ca,
+	0xc800cccf,
+	0x1bf41fcc,
+/* 0x00df: wait_donez */
+	0xbd00f8f3,
+	0x0099f094,
+	0x0f0007f1,
+	0xd00203f0,
+	0x04bd0009,
+	0x060007f1,
+	0xd00203f0,
+	0x04bd000a,
+/* 0x00fc: wait_donez_ne */
+	0x000087f1,
+	0xcf0183f0,
+	0x8aff0088,
+	0xf31bf488,
 	0x99f094bd,
 	0x0007f100,
-	0x0203f00f,
+	0x0203f017,
 	0xbd0009d0,
-	0x0007f104,
-	0x0203f006,
-	0xbd000ad0,
-/* 0x012d: wait_doneo_e */
-	0x0087f104,
-	0x0183f000,
-	0xff0088cf,
-	0x0bf4888a,
-	0xf094bdf3,
-	0x07f10099,
-	0x03f01700,
-	0x0009d002,
-	0x00f804bd,
-/* 0x0150: mmctx_size */
-/* 0x0152: nv_mmctx_size_loop */
-	0xe89894bd,
-	0x1a85b600,
-	0xb60180b6,
-	0x98bb0284,
-	0x04e0b600,
-	0xf404efb8,
-	0x9fb9eb1b,
-/* 0x016f: mmctx_xfer */
-	0xbd00f802,
-	0x0199f094,
+/* 0x011f: wait_doneo */
+	0xbd00f804,
+	0x0099f094,
 	0x0f0007f1,
 	0xd00203f0,
 	0x04bd0009,
-	0xbbfd94bd,
-	0x120bf405,
-	0xc40007f1,
-	0xd00103f0,
-	0x04bd000b,
-/* 0x0197: mmctx_base_disabled */
-	0xfd0099f0,
-	0x0bf405ee,
-	0x0007f11e,
-	0x0103f0c6,
-	0xbd000ed0,
-	0x0007f104,
-	0x0103f0c7,
-	0xbd000fd0,
-	0x0199f004,
-/* 0x01b8: mmctx_multi_disabled */
-	0xb600abc8,
-	0xb9f010b4,
-	0x01aec80c,
-	0xfd11e4b6,
-	0x07f105be,
-	0x03f0c500,
-	0x000bd001,
-/* 0x01d6: mmctx_exec_loop */
-/* 0x01d6: mmctx_wait_free */
-	0xe7f104bd,
-	0xe3f0c500,
-	0x00eecf01,
-	0xf41fe4f0,
-	0xce98f30b,
-	0x05e9fd00,
-	0xc80007f1,
+	0x060007f1,
+	0xd00203f0,
+	0x04bd000a,
+/* 0x013c: wait_doneo_e */
+	0x000087f1,
+	0xcf0183f0,
+	0x8aff0088,
+	0xf30bf488,
+	0x99f094bd,
+	0x0007f100,
+	0x0203f017,
+	0xbd0009d0,
+/* 0x015f: mmctx_size */
+	0xbd00f804,
+/* 0x0161: nv_mmctx_size_loop */
+	0x00e89894,
+	0xb61a85b6,
+	0x84b60180,
+	0x0098bb02,
+	0xb804e0b6,
+	0x1bf404ef,
+	0x029fb9eb,
+/* 0x017e: mmctx_xfer */
+	0x94bd00f8,
+	0xf10199f0,
+	0xf00f0007,
+	0x09d00203,
+	0xbd04bd00,
+	0x05bbfd94,
+	0xf1120bf4,
+	0xf0c40007,
+	0x0bd00103,
+	0xf004bd00,
+/* 0x01a6: mmctx_base_disabled */
+	0xeefd0099,
+	0x1e0bf405,
+	0xc60007f1,
 	0xd00103f0,
 	0x04bd000e,
-	0xb804c0b6,
-	0x1bf404cd,
-	0x02abc8d8,
-/* 0x0207: mmctx_fini_wait */
-	0xf11f1bf4,
-	0xf0c500b7,
-	0xbbcf01b3,
-	0x1fb4f000,
-	0xf410b4b0,
-	0xa7f0f01b,
-	0xd021f405,
-/* 0x0223: mmctx_stop */
-	0xc82b0ef4,
+	0xc70007f1,
+	0xd00103f0,
+	0x04bd000f,
+/* 0x01c7: mmctx_multi_disabled */
+	0xc80199f0,
 	0xb4b600ab,
 	0x0cb9f010,
-	0xf112b9f0,
-	0xf0c50007,
-	0x0bd00103,
-/* 0x023b: mmctx_stop_wait */
-	0xf104bd00,
-	0xf0c500b7,
-	0xbbcf01b3,
-	0x12bbc800,
-/* 0x024b: mmctx_done */
-	0xbdf31bf4,
-	0x0199f094,
-	0x170007f1,
+	0xb601aec8,
+	0xbefd11e4,
+	0x0007f105,
+	0x0103f0c5,
+	0xbd000bd0,
+/* 0x01e5: mmctx_exec_loop */
+/* 0x01e5: mmctx_wait_free */
+	0x00e7f104,
+	0x01e3f0c5,
+	0xf000eecf,
+	0x0bf41fe4,
+	0x00ce98f3,
+	0xf105e9fd,
+	0xf0c80007,
+	0x0ed00103,
+	0xb604bd00,
+	0xcdb804c0,
+	0xd81bf404,
+	0xf402abc8,
+/* 0x0216: mmctx_fini_wait */
+	0xb7f11f1b,
+	0xb3f0c500,
+	0x00bbcf01,
+	0xb01fb4f0,
+	0x1bf410b4,
+	0x05a7f0f0,
+	0xf4df21f4,
+/* 0x0232: mmctx_stop */
+	0xabc82b0e,
+	0x10b4b600,
+	0xf00cb9f0,
+	0x07f112b9,
+	0x03f0c500,
+	0x000bd001,
+/* 0x024a: mmctx_stop_wait */
+	0xb7f104bd,
+	0xb3f0c500,
+	0x00bbcf01,
+	0xf412bbc8,
+/* 0x025a: mmctx_done */
+	0x94bdf31b,
+	0xf10199f0,
+	0xf0170007,
+	0x09d00203,
+	0xf804bd00,
+/* 0x026d: strand_wait */
+	0xf0a0f900,
+	0x21f402a7,
+	0xf8a0fcdf,
+/* 0x0279: strand_pre */
+	0x0c97f000,
+	0x4afc07f1,
 	0xd00203f0,
 	0x04bd0009,
-/* 0x025e: strand_wait */
-	0xa0f900f8,
-	0xf402a7f0,
-	0xa0fcd021,
-/* 0x026a: strand_pre */
+	0x026d21f5,
+/* 0x028e: strand_post */
 	0x97f000f8,
-	0xfc07f10c,
+	0xfc07f10d,
 	0x0203f04a,
 	0xbd0009d0,
-	0x5e21f504,
-/* 0x027f: strand_post */
+	0x6d21f504,
+/* 0x02a3: strand_set */
 	0xf000f802,
-	0x07f10d97,
-	0x03f04afc,
-	0x0009d002,
-	0x21f504bd,
-	0x00f8025e,
-/* 0x0294: strand_set */
-	0xf10fc7f0,
-	0xf04ffc07,
-	0x0cd00203,
-	0xf004bd00,
-	0x07f10bc7,
-	0x03f04afc,
-	0x000cd002,
-	0x07f104bd,
+	0x07f10fc7,
 	0x03f04ffc,
-	0x000ed002,
+	0x000cd002,
 	0xc7f004bd,
-	0xfc07f10a,
+	0xfc07f10b,
 	0x0203f04a,
 	0xbd000cd0,
-	0x5e21f504,
-/* 0x02d3: strand_ctx_init */
-	0xbd00f802,
-	0x0399f094,
-	0x0f0007f1,
-	0xd00203f0,
-	0x04bd0009,
-	0x026a21f5,
-	0xf503e7f0,
-	0xbd029421,
-	0xfc07f1c4,
-	0x0203f047,
-	0xbd000cd0,
-	0x01c7f004,
+	0xfc07f104,
+	0x0203f04f,
+	0xbd000ed0,
+	0x0ac7f004,
 	0x4afc07f1,
 	0xd00203f0,
 	0x04bd000c,
-	0x025e21f5,
-	0xf1010c92,
-	0xf046fc07,
+	0x026d21f5,
+/* 0x02e2: strand_ctx_init */
+	0x94bd00f8,
+	0xf10399f0,
+	0xf00f0007,
+	0x09d00203,
+	0xf504bd00,
+	0xf0027921,
+	0x21f503e7,
+	0xc4bd02a3,
+	0x47fc07f1,
+	0xd00203f0,
+	0x04bd000c,
+	0xf101c7f0,
+	0xf04afc07,
 	0x0cd00203,
-	0xf004bd00,
-	0x07f102c7,
-	0x03f04afc,
+	0xf504bd00,
+	0x92026d21,
+	0x07f1010c,
+	0x03f046fc,
 	0x000cd002,
-	0x21f504bd,
-	0x21f5025e,
-	0x87f1027f,
-	0x83f04200,
-	0x0097f102,
-	0x0293f020,
-	0x950099cf,
-/* 0x034a: ctx_init_strand_loop */
-	0x8ed008fe,
-	0x408ed000,
-	0xb6808acf,
-	0xa0b606a5,
-	0x00eabb01,
-	0xb60480b6,
-	0x1bf40192,
-	0x08e4b6e8,
-	0xbdf2efbc,
-	0x0399f094,
-	0x170007f1,
-	0xd00203f0,
-	0x04bd0009,
-/* 0x037e: error */
-	0x07f100f8,
-	0x03f00500,
-	0x000fd002,
-	0xf7f004bd,
-	0x0007f101,
-	0x0303f007,
+	0xc7f004bd,
+	0xfc07f102,
+	0x0203f04a,
+	0xbd000cd0,
+	0x6d21f504,
+	0x8e21f502,
+	0x0087f102,
+	0x0283f042,
+	0x200097f1,
+	0xcf0293f0,
+	0xfe950099,
+/* 0x0359: ctx_init_strand_loop */
+	0x008ed008,
+	0xcf408ed0,
+	0xa5b6808a,
+	0x01a0b606,
+	0xb600eabb,
+	0x92b60480,
+	0xe81bf401,
+	0xbc08e4b6,
+	0x94bdf2ef,
+	0xf10399f0,
+	0xf0170007,
+	0x09d00203,
+	0xf804bd00,
+/* 0x038d: error */
+	0x0007f100,
+	0x0203f005,
 	0xbd000fd0,
-/* 0x039b: init */
-	0xbd00f804,
-	0x0007fe04,
-	0x420017f1,
-	0xcf0013f0,
-	0x11e70011,
-	0x14b60109,
-	0x0014fe08,
-	0xf10227f0,
-	0xf0120007,
-	0x02d00003,
-	0xf104bd00,
-	0xfe06c817,
-	0x24bd0010,
+	0x01f7f004,
 	0x070007f1,
+	0xd00303f0,
+	0x04bd000f,
+/* 0x03aa: init */
+	0x04bd00f8,
+	0xf10007fe,
+	0xf0420017,
+	0x11cf0013,
+	0x0911e700,
+	0x0814b601,
+	0xf00014fe,
+	0x07f10227,
+	0x03f01200,
+	0x0002d000,
+	0x32f404bd,
+	0xd717f100,
+	0x0010fe06,
+	0x07f124bd,
+	0x03f00700,
+	0x0002d000,
+	0x27f104bd,
+	0x07f12003,
+	0x03f00100,
+	0x0002d001,
+	0x27f104bd,
+	0x07f12004,
+	0x03f00104,
+	0x0002d001,
+	0x27f104bd,
+	0x07f1200b,
+	0x03f00108,
+	0x0002d001,
+	0x27f104bd,
+	0x07f1200c,
+	0x03f0011c,
+	0x0002d001,
+	0x039204bd,
+	0x0007f101,
+	0x0303f009,
+	0xbd0003d0,
+	0x0427f104,
+	0x0023f087,
+	0x040007f1,
 	0xd00003f0,
 	0x04bd0002,
-	0x200327f1,
-	0x010007f1,
-	0xd00103f0,
-	0x04bd0002,
-	0x200427f1,
-	0x010407f1,
-	0xd00103f0,
-	0x04bd0002,
-	0x200b27f1,
-	0x010807f1,
+	0xf10427f0,
+	0xf0030007,
+	0x02d00003,
+	0xf404bd00,
+	0xe7f11031,
+	0xe3f09604,
+	0x7721f440,
+	0xc702feb9,
+	0x018090f1,
+	0x1ff4f003,
+	0xf0020f80,
+	0x1fbb0117,
+	0x0112b604,
+	0x030007f1,
 	0xd00103f0,
-	0x04bd0002,
-	0x200c27f1,
-	0x011c07f1,
+	0x04bd0001,
+	0x040007f1,
 	0xd00103f0,
-	0x04bd0002,
-	0xf1010392,
-	0xf0090007,
-	0x03d00303,
+	0x04bd0001,
+	0x010017f1,
+	0xf502f7f0,
+	0xf5082021,
+	0xf0083221,
+	0x21f510f7,
+	0x0e98087f,
+	0x010f9800,
+	0x015f21f5,
+	0xf1081495,
+	0xf0c00007,
+	0x04d00103,
 	0xf104bd00,
-	0xf0870427,
-	0x07f10023,
-	0x03f00400,
-	0x0002d000,
-	0x27f004bd,
-	0x0007f104,
-	0x0003f003,
-	0xbd0002d0,
-	0x1031f404,
-	0x9604e7f1,
-	0xf440e3f0,
-	0xfeb96821,
-	0x90f1c702,
-	0xf0030180,
-	0x0f801ff4,
-	0x0117f002,
-	0xb6041fbb,
-	0x07f10112,
-	0x03f00300,
-	0x0001d001,
-	0x07f104bd,
-	0x03f00400,
-	0x0001d001,
-	0x17f104bd,
-	0xf7f00100,
-	0x1121f502,
-	0x2321f508,
-	0x10f7f008,
-	0x087021f5,
-	0x98000e98,
-	0x21f5010f,
-	0x14950150,
+	0xf0c10007,
+	0x04d00103,
+	0xb704bd00,
+	0xbb130030,
+	0xf5b6001f,
+	0x0007f102,
+	0x0103f0d3,
+	0xbd000fd0,
+	0x0815b604,
+	0xb60110b6,
+	0x1fb90814,
+	0xe221f502,
+	0x001fbb02,
+	0xf1020398,
+	0xf0200047,
+/* 0x0506: init_gpc */
+	0x4ea05043,
+	0x1fb90804,
+	0xac21f402,
+	0x010c4ea0,
+	0x21f4f4bd,
+	0x044ea0ac,
+	0xac21f401,
+	0x01004ea0,
+	0xf402f7f0,
+	0x4ea0ac21,
+/* 0x052e: init_gpc_wait */
+	0x21f40800,
+	0x1fffc877,
+	0xa0fa0bf4,
+	0xf408044e,
+	0x1fbb7721,
+	0x0040b700,
+	0x0132b680,
+	0xf0be1bf4,
+	0x21f500f7,
+	0xf7f0087f,
+	0x2021f500,
 	0x0007f108,
-	0x0103f0c0,
-	0xbd0004d0,
-	0x0007f104,
-	0x0103f0c1,
-	0xbd0004d0,
-	0x0030b704,
-	0x001fbb13,
-	0xf102f5b6,
-	0xf0d30007,
-	0x0fd00103,
-	0xb604bd00,
-	0x10b60815,
-	0x0814b601,
-	0xf5021fb9,
-	0xbb02d321,
-	0x0398001f,
-	0x0047f102,
-	0x5043f020,
-/* 0x04f4: init_gpc */
-	0x08044ea0,
-	0xf4021fb9,
-	0x4ea09d21,
-	0xf4bd010c,
-	0xa09d21f4,
-	0xf401044e,
-	0x4ea09d21,
-	0xf7f00100,
-	0x9d21f402,
-	0x08004ea0,
-/* 0x051c: init_gpc_wait */
-	0xc86821f4,
-	0x0bf41fff,
-	0x044ea0fa,
-	0x6821f408,
-	0xb7001fbb,
-	0xb6800040,
-	0x1bf40132,
-	0x00f7f0be,
-	0x087021f5,
-	0xf500f7f0,
-	0xf1081121,
-	0xf0010007,
-	0x01d00203,
-	0xbd04bd00,
-	0x1f19f014,
-	0x080007f1,
-	0xd00203f0,
-	0x04bd0001,
-/* 0x0564: main */
-	0xf40031f4,
-	0xd7f00028,
-	0x3921f410,
-	0xb1f401f4,
-	0xf54001e4,
-	0xbd00e91b,
-	0x0499f094,
-	0x0f0007f1,
-	0xd00203f0,
-	0x04bd0009,
-	0xc00017f1,
-	0xcf0213f0,
-	0x27f10011,
-	0x23f0c100,
-	0x0022cf02,
-	0xf51f13c8,
-	0xc800890b,
-	0x0bf41f23,
-	0xb920f962,
-	0x94bd0212,
-	0xf10799f0,
+	0x0203f001,
+	0xbd0001d0,
+	0xf014bd04,
+	0x07f11f19,
+	0x03f00800,
+	0x0001d002,
+/* 0x0576: main */
+	0x28f404bd,
+	0x10d7f000,
+	0xf43921f4,
+	0xe4b1f701,
+	0x1bf54001,
+	0x94bd00e9,
+	0xf10499f0,
 	0xf00f0007,
 	0x09d00203,
-	0xf404bd00,
-	0x31f40132,
-	0x4421f502,
-	0xf094bd0a,
+	0xf104bd00,
+	0xf0c00017,
+	0x11cf0213,
+	0x0027f100,
+	0x0223f0c1,
+	0xc80022cf,
+	0x0bf51f13,
+	0x23c80089,
+	0x620bf41f,
+	0x12b920f9,
+	0xf094bd02,
 	0x07f10799,
-	0x03f01700,
+	0x03f00f00,
 	0x0009d002,
-	0x20fc04bd,
+	0x32f404bd,
+	0x0231f401,
+	0x0a5321f5,
 	0x99f094bd,
-	0x0007f106,
-	0x0203f00f,
-	0xbd0009d0,
-	0x0131f404,
-	0x0a4421f5,
-	0x99f094bd,
-	0x0007f106,
+	0x0007f107,
 	0x0203f017,
 	0xbd0009d0,
-	0x330ef404,
-/* 0x060c: chsw_prev_no_next */
-	0x12b920f9,
-	0x0132f402,
-	0xf50232f4,
-	0xfc0a4421,
-	0x0007f120,
-	0x0203f0c0,
-	0xbd0002d0,
-	0x130ef404,
-/* 0x062c: chsw_no_prev */
-	0xf41f23c8,
-	0x31f40d0b,
-	0x0232f401,
-	0x0a4421f5,
-/* 0x063c: chsw_done */
-	0xf10127f0,
-	0xf0c30007,
-	0x02d00203,
-	0xbd04bd00,
-	0x0499f094,
+	0xbd20fc04,
+	0x0699f094,
+	0x0f0007f1,
+	0xd00203f0,
+	0x04bd0009,
+	0xf50131f4,
+	0xbd0a5321,
+	0x0699f094,
 	0x170007f1,
 	0xd00203f0,
 	0x04bd0009,
-	0xff080ef5,
-/* 0x0660: main_not_ctx_switch */
-	0xf401e4b0,
-	0xf2b90d1b,
-	0xd421f502,
-	0x460ef409,
-/* 0x0670: main_not_ctx_chan */
-	0xf402e4b0,
-	0x94bd321b,
-	0xf10799f0,
-	0xf00f0007,
+/* 0x061b: chsw_prev_no_next */
+	0xf9330ef4,
+	0x0212b920,
+	0xf40132f4,
+	0x21f50232,
+	0x20fc0a53,
+	0xc00007f1,
+	0xd00203f0,
+	0x04bd0002,
+/* 0x063b: chsw_no_prev */
+	0xc8130ef4,
+	0x0bf41f23,
+	0x0131f40d,
+	0xf50232f4,
+/* 0x064b: chsw_done */
+	0xf00a5321,
+	0x07f10127,
+	0x03f0c300,
+	0x0002d002,
+	0x94bd04bd,
+	0xf10499f0,
+	0xf0170007,
 	0x09d00203,
-	0xf404bd00,
-	0x32f40132,
-	0x4421f502,
-	0xf094bd0a,
+	0xf504bd00,
+/* 0x066f: main_not_ctx_switch */
+	0xb0ff0b0e,
+	0x1bf401e4,
+	0x02f2b90d,
+	0x09e321f5,
+/* 0x067f: main_not_ctx_chan */
+	0xb0460ef4,
+	0x1bf402e4,
+	0xf094bd32,
 	0x07f10799,
-	0x03f01700,
+	0x03f00f00,
 	0x0009d002,
-	0x0ef404bd,
-/* 0x06a5: main_not_ctx_save */
-	0x10ef9411,
-	0xf501f5f0,
-	0xf5037e21,
-/* 0x06b3: main_done */
-	0xbdfeb50e,
-	0x1f29f024,
-	0x080007f1,
+	0x32f404bd,
+	0x0232f401,
+	0x0a5321f5,
+	0x99f094bd,
+	0x0007f107,
+	0x0203f017,
+	0xbd0009d0,
+	0x110ef404,
+/* 0x06b4: main_not_ctx_save */
+	0xf010ef94,
+	0x21f501f5,
+	0x0ef5038d,
+/* 0x06c2: main_done */
+	0x24bdfeb8,
+	0xf11f29f0,
+	0xf0080007,
+	0x02d00203,
+	0xf504bd00,
+/* 0x06d7: ih */
+	0xf9fea30e,
+	0xfe80f900,
+	0x80f90188,
+	0xa0f990f9,
+	0xd0f9b0f9,
+	0xf0f9e0f9,
+	0xa7f104bd,
+	0xa3f00200,
+	0x00aacf00,
+	0xf404abc4,
+	0xd7f0300b,
+	0x00e7f110,
+	0x00e3f01a,
+	0xf100eecf,
+	0xf01900f7,
+	0xffcf00f3,
+	0x0421f400,
+	0x0400b0b7,
+	0xf101e7f0,
+	0xf01d0007,
+	0x0ed00003,
+/* 0x072b: ih_no_fifo */
+	0xe404bd00,
+	0xf40100ab,
+	0xd7f00d0b,
+	0x01e7f110,
+	0x0421f440,
+/* 0x073c: ih_no_ctxsw */
+	0x0400abe4,
+	0xf16c0bf4,
+	0xf00708e7,
+	0x21f440e3,
+	0x02ffb977,
+	0x040007f1,
 	0xd00203f0,
-	0x04bd0002,
-	0xfea00ef5,
-/* 0x06c8: ih */
-	0x80f900f9,
-	0xf90188fe,
-	0xf990f980,
-	0xf9b0f9a0,
-	0xf9e0f9d0,
-	0xf104bdf0,
-	0xf00200a7,
-	0xaacf00a3,
-	0x04abc400,
-	0xf0300bf4,
-	0xe7f110d7,
-	0xe3f01a00,
-	0x00eecf00,
-	0x1900f7f1,
-	0xcf00f3f0,
-	0x21f400ff,
-	0x00b0b704,
-	0x01e7f004,
-	0x1d0007f1,
-	0xd00003f0,
-	0x04bd000e,
-/* 0x071c: ih_no_fifo */
-	0x0100abe4,
-	0xf00d0bf4,
-	0xe7f110d7,
-	0x21f44001,
-/* 0x072d: ih_no_ctxsw */
-	0x00abe404,
-	0x6c0bf404,
-	0x0708e7f1,
+	0x04bd000f,
+	0x0704e7f1,
 	0xf440e3f0,
-	0xffb96821,
+	0xffb97721,
 	0x0007f102,
-	0x0203f004,
-	0xbd000fd0,
-	0x04e7f104,
-	0x40e3f007,
-	0xb96821f4,
-	0x07f102ff,
-	0x03f00300,
-	0x000fd002,
-	0xfec704bd,
-	0x02ee9450,
-	0x0700f7f1,
-	0xbb40f3f0,
-	0x21f400ef,
-	0x0007f168,
-	0x0203f002,
+	0x0203f003,
 	0xbd000fd0,
-	0x03f7f004,
-	0x037e21f5,
-	0x0100b7f1,
-	0xf102bfb9,
-	0xf00144e7,
-	0x21f440e3,
-/* 0x079d: ih_no_fwmthd */
-	0x04b7f19d,
-	0xffb0bd05,
-	0x0bf4b4ab,
-	0x0007f10f,
-	0x0303f007,
-	0xbd000bd0,
-/* 0x07b5: ih_no_other */
-	0x0007f104,
-	0x0003f001,
-	0xbd000ad0,
-	0xfcf0fc04,
-	0xfcd0fce0,
-	0xfca0fcb0,
-	0xfe80fc90,
-	0x80fc0088,
-	0x32f400fc,
-/* 0x07db: ctx_4160s */
-	0xf001f800,
-	0xffb901f7,
-	0x60e7f102,
-	0x40e3f041,
-/* 0x07eb: ctx_4160s_wait */
-	0xf19d21f4,
-	0xf04160e7,
-	0x21f440e3,
-	0x02ffb968,
-	0xf404ffc8,
-	0x00f8f00b,
-/* 0x0800: ctx_4160c */
-	0xffb9f4bd,
-	0x60e7f102,
-	0x40e3f041,
-	0xf89d21f4,
-/* 0x0811: ctx_4170s */
-	0x10f5f000,
-	0xf102ffb9,
-	0xf04170e7,
-	0x21f440e3,
-/* 0x0823: ctx_4170w */
-	0xf100f89d,
-	0xf04170e7,
-	0x21f440e3,
-	0x02ffb968,
-	0xf410f4f0,
-	0x00f8f01b,
-/* 0x0838: ctx_redswitch */
-	0x0200e7f1,
-	0xf040e5f0,
-	0xe5f020e5,
-	0x0007f110,
-	0x0103f085,
-	0xbd000ed0,
-	0x08f7f004,
-/* 0x0854: ctx_redswitch_delay */
-	0xf401f2b6,
-	0xe5f1fd1b,
-	0xe5f10400,
-	0x07f10100,
-	0x03f08500,
-	0x000ed001,
-	0x00f804bd,
-/* 0x0870: ctx_86c */
-	0x1b0007f1,
+	0x50fec704,
+	0xf102ee94,
+	0xf00700f7,
+	0xefbb40f3,
+	0x7721f400,
+	0x020007f1,
 	0xd00203f0,
 	0x04bd000f,
+	0xf503f7f0,
+	0xf1038d21,
+	0xb90100b7,
+	0xe7f102bf,
+	0xe3f00144,
+	0xac21f440,
+/* 0x07ac: ih_no_fwmthd */
+	0x0504b7f1,
+	0xabffb0bd,
+	0x0f0bf4b4,
+	0x070007f1,
+	0xd00303f0,
+	0x04bd000b,
+/* 0x07c4: ih_no_other */
+	0x010007f1,
+	0xd00003f0,
+	0x04bd000a,
+	0xe0fcf0fc,
+	0xb0fcd0fc,
+	0x90fca0fc,
+	0x88fe80fc,
+	0xfc80fc00,
+	0x0032f400,
+/* 0x07ea: ctx_4160s */
+	0xf7f001f8,
+	0x02ffb901,
+	0x4160e7f1,
+	0xf440e3f0,
+/* 0x07fa: ctx_4160s_wait */
+	0xe7f1ac21,
+	0xe3f04160,
+	0x7721f440,
+	0xc802ffb9,
+	0x0bf404ff,
+/* 0x080f: ctx_4160c */
+	0xbd00f8f0,
+	0x02ffb9f4,
+	0x4160e7f1,
+	0xf440e3f0,
+	0x00f8ac21,
+/* 0x0820: ctx_4170s */
+	0xb910f5f0,
+	0xe7f102ff,
+	0xe3f04170,
+	0xac21f440,
+/* 0x0832: ctx_4170w */
+	0xe7f100f8,
+	0xe3f04170,
+	0x7721f440,
+	0xf002ffb9,
+	0x1bf410f4,
+/* 0x0847: ctx_redswitch */
+	0xf100f8f0,
+	0xf00200e7,
+	0xe5f040e5,
+	0x10e5f020,
+	0x850007f1,
+	0xd00103f0,
+	0x04bd000e,
+/* 0x0863: ctx_redswitch_delay */
+	0xb608f7f0,
+	0x1bf401f2,
+	0x00e5f1fd,
+	0x00e5f104,
+	0x0007f101,
+	0x0103f085,
+	0xbd000ed0,
+/* 0x087f: ctx_86c */
+	0xf100f804,
+	0xf01b0007,
+	0x0fd00203,
+	0xb904bd00,
+	0xe7f102ff,
+	0xe3f08a14,
+	0xac21f440,
 	0xf102ffb9,
-	0xf08a14e7,
-	0x21f440e3,
-	0x02ffb99d,
-	0xa86ce7f1,
-	0xf441e3f0,
-	0x00f89d21,
-/* 0x0898: ctx_mem */
-	0x840007f1,
-	0xd00203f0,
-	0x04bd000f,
-/* 0x08a4: ctx_mem_wait */
-	0x8400f7f1,
-	0xcf02f3f0,
-	0xfffd00ff,
-	0xf31bf405,
-/* 0x08b6: ctx_load */
-	0x94bd00f8,
-	0xf10599f0,
-	0xf00f0007,
-	0x09d00203,
-	0xf004bd00,
-	0x21f40ca7,
-	0xf1f4bdd0,
-	0xf0890007,
+	0xf0a86ce7,
+	0x21f441e3,
+/* 0x08a7: ctx_mem */
+	0xf100f8ac,
+	0xf0840007,
 	0x0fd00203,
+/* 0x08b3: ctx_mem_wait */
 	0xf104bd00,
-	0xf0c10007,
-	0x02d00203,
-	0xf104bd00,
-	0xf0830007,
-	0x02d00203,
-	0xf004bd00,
-	0x21f507f7,
-	0x07f10898,
-	0x03f0c000,
+	0xf08400f7,
+	0xffcf02f3,
+	0x05fffd00,
+	0xf8f31bf4,
+/* 0x08c5: ctx_load */
+	0xf094bd00,
+	0x07f10599,
+	0x03f00f00,
+	0x0009d002,
+	0xa7f004bd,
+	0xdf21f40c,
+	0x07f1f4bd,
+	0x03f08900,
+	0x000fd002,
+	0x07f104bd,
+	0x03f0c100,
 	0x0002d002,
-	0x0bfe04bd,
-	0x1f2af000,
-	0xb60424b6,
-	0x94bd0220,
-	0xf10899f0,
-	0xf00f0007,
-	0x09d00203,
-	0xf104bd00,
-	0xf0810007,
-	0x02d00203,
-	0xf104bd00,
-	0xf1000027,
-	0xf0800023,
-	0x07f10225,
-	0x03f08800,
+	0x07f104bd,
+	0x03f08300,
 	0x0002d002,
-	0x17f004bd,
-	0x0027f110,
-	0x0223f002,
-	0xf80512fa,
-	0xf094bd03,
+	0xf7f004bd,
+	0xa721f507,
+	0x0007f108,
+	0x0203f0c0,
+	0xbd0002d0,
+	0x000bfe04,
+	0xb61f2af0,
+	0x20b60424,
+	0xf094bd02,
 	0x07f10899,
-	0x03f01700,
+	0x03f00f00,
 	0x0009d002,
-	0x019804bd,
-	0x1814b681,
-	0xb6800298,
-	0x12fd0825,
-	0x16018005,
+	0x07f104bd,
+	0x03f08100,
+	0x0002d002,
+	0x27f104bd,
+	0x23f10000,
+	0x25f08000,
+	0x0007f102,
+	0x0203f088,
+	0xbd0002d0,
+	0x1017f004,
+	0x020027f1,
+	0xfa0223f0,
+	0x03f80512,
 	0x99f094bd,
-	0x0007f109,
-	0x0203f00f,
+	0x0007f108,
+	0x0203f017,
 	0xbd0009d0,
-	0x0007f104,
-	0x0203f081,
-	0xbd0001d0,
-	0x0127f004,
-	0x880007f1,
+	0x81019804,
+	0x981814b6,
+	0x25b68002,
+	0x0512fd08,
+	0xbd160180,
+	0x0999f094,
+	0x0f0007f1,
 	0xd00203f0,
-	0x04bd0002,
-	0x010017f1,
-	0xfa0613f0,
-	0x03f80501,
+	0x04bd0009,
+	0x810007f1,
+	0xd00203f0,
+	0x04bd0001,
+	0xf10127f0,
+	0xf0880007,
+	0x02d00203,
+	0xf104bd00,
+	0xf0010017,
+	0x01fa0613,
+	0xbd03f805,
+	0x0999f094,
+	0x170007f1,
+	0xd00203f0,
+	0x04bd0009,
 	0x99f094bd,
-	0x0007f109,
+	0x0007f105,
 	0x0203f017,
 	0xbd0009d0,
-	0xf094bd04,
-	0x07f10599,
-	0x03f01700,
-	0x0009d002,
-	0x00f804bd,
-/* 0x09d4: ctx_chan */
-	0x07db21f5,
-	0x08b621f5,
-	0xf40ca7f0,
-	0xf7f0d021,
-	0x9821f505,
-	0x0021f508,
-/* 0x09ef: ctx_mmio_exec */
-	0x9800f808,
-	0x07f14103,
+/* 0x09e3: ctx_chan */
+	0xf500f804,
+	0xf507ea21,
+	0xf008c521,
+	0x21f40ca7,
+	0x05f7f0df,
+	0x08a721f5,
+	0x080f21f5,
+/* 0x09fe: ctx_mmio_exec */
+	0x039800f8,
+	0x0007f141,
+	0x0203f081,
+	0xbd0003d0,
+/* 0x0a0f: ctx_mmio_loop */
+	0xc434bd04,
+	0x1bf4ff34,
+	0x0057f10f,
+	0x0653f002,
+	0xf80535fa,
+/* 0x0a21: ctx_mmio_pull */
+	0x804e9803,
+	0xf4814f98,
+	0x30b6ac21,
+	0x0112b608,
+/* 0x0a33: ctx_mmio_done */
+	0x98df1bf4,
+	0x07f11603,
 	0x03f08100,
 	0x0003d002,
-	0x34bd04bd,
-/* 0x0a00: ctx_mmio_loop */
-	0xf4ff34c4,
-	0x57f10f1b,
-	0x53f00200,
-	0x0535fa06,
-/* 0x0a12: ctx_mmio_pull */
-	0x4e9803f8,
-	0x814f9880,
-	0xb69d21f4,
-	0x12b60830,
-	0xdf1bf401,
-/* 0x0a24: ctx_mmio_done */
-	0xf1160398,
-	0xf0810007,
-	0x03d00203,
-	0x8004bd00,
-	0x17f14000,
-	0x13f00100,
-	0x0601fa06,
-	0x00f803f8,
-/* 0x0a44: ctx_xfer */
-	0xf104e7f0,
-	0xf0020007,
-	0x0ed00303,
-/* 0x0a53: ctx_xfer_idle */
-	0xf104bd00,
-	0xf00000e7,
-	0xeecf03e3,
-	0x00e4f100,
-	0xf21bf420,
-	0xf40611f4,
-/* 0x0a6a: ctx_xfer_pre */
-	0xf7f01102,
-	0x7021f510,
-	0xdb21f508,
-	0x1c11f407,
-/* 0x0a78: ctx_xfer_pre_load */
-	0xf502f7f0,
-	0xf5081121,
-	0xf5082321,
-	0xbd083821,
-	0x1121f5f4,
-	0xb621f508,
-/* 0x0a91: ctx_xfer_exec */
-	0x16019808,
-	0x07f124bd,
-	0x03f00500,
-	0x0002d001,
-	0x1fb904bd,
-	0x00e7f102,
+	0x008004bd,
+	0x0017f140,
+	0x0613f001,
+	0xf80601fa,
+/* 0x0a53: ctx_xfer */
+	0xf000f803,
+	0x07f104e7,
+	0x03f00200,
+	0x000ed003,
+/* 0x0a62: ctx_xfer_idle */
+	0xe7f104bd,
+	0xe3f00000,
+	0x00eecf03,
+	0x2000e4f1,
+	0xf4f21bf4,
+	0x02f40611,
+/* 0x0a79: ctx_xfer_pre */
+	0x10f7f011,
+	0x087f21f5,
+	0x07ea21f5,
+/* 0x0a87: ctx_xfer_pre_load */
+	0xf01c11f4,
+	0x21f502f7,
+	0x21f50820,
+	0x21f50832,
+	0xf4bd0847,
+	0x082021f5,
+	0x08c521f5,
+/* 0x0aa0: ctx_xfer_exec */
+	0xbd160198,
+	0x0007f124,
+	0x0103f005,
+	0xbd0002d0,
+	0x021fb904,
+	0xa500e7f1,
+	0xf441e3f0,
+	0xfcf0ac21,
+	0x022cf001,
+	0xfd0124b6,
+	0xffb905f2,
+	0x04e7f102,
 	0x41e3f0a5,
-	0xf09d21f4,
-	0x2cf001fc,
-	0x0124b602,
-	0xb905f2fd,
-	0xe7f102ff,
-	0xe3f0a504,
-	0x9d21f441,
-	0x026a21f5,
-	0x07f124bd,
-	0x03f047fc,
-	0x0002d002,
-	0x2cf004bd,
-	0x0320b601,
-	0x4afc07f1,
-	0xd00203f0,
-	0x04bd0002,
-	0xf001acf0,
-	0xb7f006a5,
-	0x000c9800,
-	0xf0010d98,
-	0x21f500e7,
-	0xa7f0016f,
-	0x1021f508,
-	0x5e21f501,
-	0x1301f402,
-	0xf40ca7f0,
-	0xf7f0d021,
-	0x9821f505,
-	0x3202f408,
-/* 0x0b20: ctx_xfer_post */
-	0xf502f7f0,
-	0xbd081121,
-	0x7021f5f4,
-	0x7f21f508,
-	0x2321f502,
-	0xf5f4bd08,
-	0xf4081121,
-	0x01981011,
-	0x0511fd40,
-	0xf5070bf4,
-/* 0x0b4b: ctx_xfer_no_post_mmio */
-	0xf509ef21,
-/* 0x0b4f: ctx_xfer_done */
-	0xf8080021,
-	0x00000000,
-	0x00000000,
-	0x00000000,
-	0x00000000,
+	0xf5ac21f4,
+	0xbd027921,
+	0xfc07f124,
+	0x0203f047,
+	0xbd0002d0,
+	0x012cf004,
+	0xf10320b6,
+	0xf04afc07,
+	0x02d00203,
+	0xf004bd00,
+	0xa5f001ac,
+	0x00b7f006,
+	0x98000c98,
+	0xe7f0010d,
+	0x7e21f500,
+	0x08a7f001,
+	0x011f21f5,
+	0x026d21f5,
+	0xf01301f4,
+	0x21f40ca7,
+	0x05f7f0df,
+	0x08a721f5,
+/* 0x0b2f: ctx_xfer_post */
+	0xf03202f4,
+	0x21f502f7,
+	0xf4bd0820,
+	0x087f21f5,
+	0x028e21f5,
+	0x083221f5,
+	0x21f5f4bd,
+	0x11f40820,
+	0x40019810,
+	0xf40511fd,
+	0x21f5070b,
+/* 0x0b5a: ctx_xfer_no_post_mmio */
+	0x21f509fe,
+/* 0x0b5e: ctx_xfer_done */
+	0x00f8080f,
 	0x00000000,
 	0x00000000,
 	0x00000000,
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgf117.fuc3.h b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgf117.fuc3.h
index 50c9716..a21dde5 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgf117.fuc3.h
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgf117.fuc3.h
@@ -206,14 +206,14 @@ uint32_t gf117_grhub_data[] = {
 };
 
 uint32_t gf117_grhub_code[] = {
-	0x039b0ef5,
+	0x03aa0ef5,
 /* 0x0004: queue_put */
 	0x9800d898,
 	0x86f001d9,
 	0x0489b808,
 	0xf00c1bf4,
 	0x21f502f7,
-	0x00f8037e,
+	0x00f8038d,
 /* 0x001c: queue_put_next */
 	0xb60798c4,
 	0x8dbb0384,
@@ -224,786 +224,786 @@ uint32_t gf117_grhub_code[] = {
 	0xf801d980,
 /* 0x0039: queue_get */
 	0x0131f400,
-	0x9800d898,
-	0x89b801d9,
-	0x210bf404,
-	0xb60789c4,
-	0x9dbb0394,
-	0x0890b600,
-	0x98009e98,
-	0x80b6019f,
-	0x0f84f001,
-	0xf400d880,
-/* 0x0066: queue_get_done */
-	0x00f80132,
-/* 0x0068: nv_rd32 */
+	0x980031f4,
+	0xd99800d8,
+	0x0489b801,
+	0xc42d0bf4,
+	0x94b60789,
+	0x009dbb03,
+	0x980890b6,
+	0x9f98009e,
+	0x0180b601,
+	0x800f84f0,
+	0x32f400d8,
+	0x01d99801,
+	0xf40489b8,
+	0x32f4060b,
+/* 0x0075: queue_get_done */
+/* 0x0077: nv_rd32 */
+	0xb900f800,
+	0xc9f002ec,
+	0x0007f11f,
+	0x0103f0ca,
+	0xbd000cd0,
+/* 0x0089: nv_rd32_wait */
+	0x00c7f104,
+	0x01c3f0ca,
+	0xc800cccf,
+	0x1bf41fcc,
+	0x06a7f0f3,
+	0x011f21f5,
+	0xcb00f7f1,
+	0xcf01f3f0,
+	0x00f800ff,
+/* 0x00ac: nv_wr32 */
+	0xcc0007f1,
+	0xd00103f0,
+	0x04bd000f,
 	0xf002ecb9,
-	0x07f11fc9,
-	0x03f0ca00,
-	0x000cd001,
-/* 0x007a: nv_rd32_wait */
-	0xc7f104bd,
-	0xc3f0ca00,
-	0x00cccf01,
-	0xf41fccc8,
-	0xa7f0f31b,
-	0x1021f506,
-	0x00f7f101,
-	0x01f3f0cb,
-	0xf800ffcf,
-/* 0x009d: nv_wr32 */
-	0x0007f100,
-	0x0103f0cc,
-	0xbd000fd0,
-	0x02ecb904,
-	0xf01fc9f0,
-	0x07f11ec9,
-	0x03f0ca00,
-	0x000cd001,
-/* 0x00be: nv_wr32_wait */
-	0xc7f104bd,
-	0xc3f0ca00,
-	0x00cccf01,
-	0xf41fccc8,
-	0x00f8f31b,
-/* 0x00d0: wait_donez */
-	0x99f094bd,
-	0x0007f100,
-	0x0203f00f,
-	0xbd0009d0,
-	0x0007f104,
-	0x0203f006,
-	0xbd000ad0,
-/* 0x00ed: wait_donez_ne */
-	0x0087f104,
-	0x0183f000,
-	0xff0088cf,
-	0x1bf4888a,
-	0xf094bdf3,
-	0x07f10099,
-	0x03f01700,
-	0x0009d002,
-	0x00f804bd,
-/* 0x0110: wait_doneo */
+	0xc9f01fc9,
+	0x0007f11e,
+	0x0103f0ca,
+	0xbd000cd0,
+/* 0x00cd: nv_wr32_wait */
+	0x00c7f104,
+	0x01c3f0ca,
+	0xc800cccf,
+	0x1bf41fcc,
+/* 0x00df: wait_donez */
+	0xbd00f8f3,
+	0x0099f094,
+	0x0f0007f1,
+	0xd00203f0,
+	0x04bd0009,
+	0x060007f1,
+	0xd00203f0,
+	0x04bd000a,
+/* 0x00fc: wait_donez_ne */
+	0x000087f1,
+	0xcf0183f0,
+	0x8aff0088,
+	0xf31bf488,
 	0x99f094bd,
 	0x0007f100,
-	0x0203f00f,
+	0x0203f017,
 	0xbd0009d0,
-	0x0007f104,
-	0x0203f006,
-	0xbd000ad0,
-/* 0x012d: wait_doneo_e */
-	0x0087f104,
-	0x0183f000,
-	0xff0088cf,
-	0x0bf4888a,
-	0xf094bdf3,
-	0x07f10099,
-	0x03f01700,
-	0x0009d002,
-	0x00f804bd,
-/* 0x0150: mmctx_size */
-/* 0x0152: nv_mmctx_size_loop */
-	0xe89894bd,
-	0x1a85b600,
-	0xb60180b6,
-	0x98bb0284,
-	0x04e0b600,
-	0xf404efb8,
-	0x9fb9eb1b,
-/* 0x016f: mmctx_xfer */
-	0xbd00f802,
-	0x0199f094,
+/* 0x011f: wait_doneo */
+	0xbd00f804,
+	0x0099f094,
 	0x0f0007f1,
 	0xd00203f0,
 	0x04bd0009,
-	0xbbfd94bd,
-	0x120bf405,
-	0xc40007f1,
-	0xd00103f0,
-	0x04bd000b,
-/* 0x0197: mmctx_base_disabled */
-	0xfd0099f0,
-	0x0bf405ee,
-	0x0007f11e,
-	0x0103f0c6,
-	0xbd000ed0,
-	0x0007f104,
-	0x0103f0c7,
-	0xbd000fd0,
-	0x0199f004,
-/* 0x01b8: mmctx_multi_disabled */
-	0xb600abc8,
-	0xb9f010b4,
-	0x01aec80c,
-	0xfd11e4b6,
-	0x07f105be,
-	0x03f0c500,
-	0x000bd001,
-/* 0x01d6: mmctx_exec_loop */
-/* 0x01d6: mmctx_wait_free */
-	0xe7f104bd,
-	0xe3f0c500,
-	0x00eecf01,
-	0xf41fe4f0,
-	0xce98f30b,
-	0x05e9fd00,
-	0xc80007f1,
+	0x060007f1,
+	0xd00203f0,
+	0x04bd000a,
+/* 0x013c: wait_doneo_e */
+	0x000087f1,
+	0xcf0183f0,
+	0x8aff0088,
+	0xf30bf488,
+	0x99f094bd,
+	0x0007f100,
+	0x0203f017,
+	0xbd0009d0,
+/* 0x015f: mmctx_size */
+	0xbd00f804,
+/* 0x0161: nv_mmctx_size_loop */
+	0x00e89894,
+	0xb61a85b6,
+	0x84b60180,
+	0x0098bb02,
+	0xb804e0b6,
+	0x1bf404ef,
+	0x029fb9eb,
+/* 0x017e: mmctx_xfer */
+	0x94bd00f8,
+	0xf10199f0,
+	0xf00f0007,
+	0x09d00203,
+	0xbd04bd00,
+	0x05bbfd94,
+	0xf1120bf4,
+	0xf0c40007,
+	0x0bd00103,
+	0xf004bd00,
+/* 0x01a6: mmctx_base_disabled */
+	0xeefd0099,
+	0x1e0bf405,
+	0xc60007f1,
 	0xd00103f0,
 	0x04bd000e,
-	0xb804c0b6,
-	0x1bf404cd,
-	0x02abc8d8,
-/* 0x0207: mmctx_fini_wait */
-	0xf11f1bf4,
-	0xf0c500b7,
-	0xbbcf01b3,
-	0x1fb4f000,
-	0xf410b4b0,
-	0xa7f0f01b,
-	0xd021f405,
-/* 0x0223: mmctx_stop */
-	0xc82b0ef4,
+	0xc70007f1,
+	0xd00103f0,
+	0x04bd000f,
+/* 0x01c7: mmctx_multi_disabled */
+	0xc80199f0,
 	0xb4b600ab,
 	0x0cb9f010,
-	0xf112b9f0,
-	0xf0c50007,
-	0x0bd00103,
-/* 0x023b: mmctx_stop_wait */
-	0xf104bd00,
-	0xf0c500b7,
-	0xbbcf01b3,
-	0x12bbc800,
-/* 0x024b: mmctx_done */
-	0xbdf31bf4,
-	0x0199f094,
-	0x170007f1,
+	0xb601aec8,
+	0xbefd11e4,
+	0x0007f105,
+	0x0103f0c5,
+	0xbd000bd0,
+/* 0x01e5: mmctx_exec_loop */
+/* 0x01e5: mmctx_wait_free */
+	0x00e7f104,
+	0x01e3f0c5,
+	0xf000eecf,
+	0x0bf41fe4,
+	0x00ce98f3,
+	0xf105e9fd,
+	0xf0c80007,
+	0x0ed00103,
+	0xb604bd00,
+	0xcdb804c0,
+	0xd81bf404,
+	0xf402abc8,
+/* 0x0216: mmctx_fini_wait */
+	0xb7f11f1b,
+	0xb3f0c500,
+	0x00bbcf01,
+	0xb01fb4f0,
+	0x1bf410b4,
+	0x05a7f0f0,
+	0xf4df21f4,
+/* 0x0232: mmctx_stop */
+	0xabc82b0e,
+	0x10b4b600,
+	0xf00cb9f0,
+	0x07f112b9,
+	0x03f0c500,
+	0x000bd001,
+/* 0x024a: mmctx_stop_wait */
+	0xb7f104bd,
+	0xb3f0c500,
+	0x00bbcf01,
+	0xf412bbc8,
+/* 0x025a: mmctx_done */
+	0x94bdf31b,
+	0xf10199f0,
+	0xf0170007,
+	0x09d00203,
+	0xf804bd00,
+/* 0x026d: strand_wait */
+	0xf0a0f900,
+	0x21f402a7,
+	0xf8a0fcdf,
+/* 0x0279: strand_pre */
+	0x0c97f000,
+	0x4afc07f1,
 	0xd00203f0,
 	0x04bd0009,
-/* 0x025e: strand_wait */
-	0xa0f900f8,
-	0xf402a7f0,
-	0xa0fcd021,
-/* 0x026a: strand_pre */
+	0x026d21f5,
+/* 0x028e: strand_post */
 	0x97f000f8,
-	0xfc07f10c,
+	0xfc07f10d,
 	0x0203f04a,
 	0xbd0009d0,
-	0x5e21f504,
-/* 0x027f: strand_post */
+	0x6d21f504,
+/* 0x02a3: strand_set */
 	0xf000f802,
-	0x07f10d97,
-	0x03f04afc,
-	0x0009d002,
-	0x21f504bd,
-	0x00f8025e,
-/* 0x0294: strand_set */
-	0xf10fc7f0,
-	0xf04ffc07,
-	0x0cd00203,
-	0xf004bd00,
-	0x07f10bc7,
-	0x03f04afc,
-	0x000cd002,
-	0x07f104bd,
+	0x07f10fc7,
 	0x03f04ffc,
-	0x000ed002,
+	0x000cd002,
 	0xc7f004bd,
-	0xfc07f10a,
+	0xfc07f10b,
 	0x0203f04a,
 	0xbd000cd0,
-	0x5e21f504,
-/* 0x02d3: strand_ctx_init */
-	0xbd00f802,
-	0x0399f094,
-	0x0f0007f1,
-	0xd00203f0,
-	0x04bd0009,
-	0x026a21f5,
-	0xf503e7f0,
-	0xbd029421,
-	0xfc07f1c4,
-	0x0203f047,
-	0xbd000cd0,
-	0x01c7f004,
+	0xfc07f104,
+	0x0203f04f,
+	0xbd000ed0,
+	0x0ac7f004,
 	0x4afc07f1,
 	0xd00203f0,
 	0x04bd000c,
-	0x025e21f5,
-	0xf1010c92,
-	0xf046fc07,
+	0x026d21f5,
+/* 0x02e2: strand_ctx_init */
+	0x94bd00f8,
+	0xf10399f0,
+	0xf00f0007,
+	0x09d00203,
+	0xf504bd00,
+	0xf0027921,
+	0x21f503e7,
+	0xc4bd02a3,
+	0x47fc07f1,
+	0xd00203f0,
+	0x04bd000c,
+	0xf101c7f0,
+	0xf04afc07,
 	0x0cd00203,
-	0xf004bd00,
-	0x07f102c7,
-	0x03f04afc,
+	0xf504bd00,
+	0x92026d21,
+	0x07f1010c,
+	0x03f046fc,
 	0x000cd002,
-	0x21f504bd,
-	0x21f5025e,
-	0x87f1027f,
-	0x83f04200,
-	0x0097f102,
-	0x0293f020,
-	0x950099cf,
-/* 0x034a: ctx_init_strand_loop */
-	0x8ed008fe,
-	0x408ed000,
-	0xb6808acf,
-	0xa0b606a5,
-	0x00eabb01,
-	0xb60480b6,
-	0x1bf40192,
-	0x08e4b6e8,
-	0xbdf2efbc,
-	0x0399f094,
-	0x170007f1,
-	0xd00203f0,
-	0x04bd0009,
-/* 0x037e: error */
-	0x07f100f8,
-	0x03f00500,
-	0x000fd002,
-	0xf7f004bd,
-	0x0007f101,
-	0x0303f007,
+	0xc7f004bd,
+	0xfc07f102,
+	0x0203f04a,
+	0xbd000cd0,
+	0x6d21f504,
+	0x8e21f502,
+	0x0087f102,
+	0x0283f042,
+	0x200097f1,
+	0xcf0293f0,
+	0xfe950099,
+/* 0x0359: ctx_init_strand_loop */
+	0x008ed008,
+	0xcf408ed0,
+	0xa5b6808a,
+	0x01a0b606,
+	0xb600eabb,
+	0x92b60480,
+	0xe81bf401,
+	0xbc08e4b6,
+	0x94bdf2ef,
+	0xf10399f0,
+	0xf0170007,
+	0x09d00203,
+	0xf804bd00,
+/* 0x038d: error */
+	0x0007f100,
+	0x0203f005,
 	0xbd000fd0,
-/* 0x039b: init */
-	0xbd00f804,
-	0x0007fe04,
-	0x420017f1,
-	0xcf0013f0,
-	0x11e70011,
-	0x14b60109,
-	0x0014fe08,
-	0xf10227f0,
-	0xf0120007,
-	0x02d00003,
-	0xf104bd00,
-	0xfe06c817,
-	0x24bd0010,
+	0x01f7f004,
 	0x070007f1,
+	0xd00303f0,
+	0x04bd000f,
+/* 0x03aa: init */
+	0x04bd00f8,
+	0xf10007fe,
+	0xf0420017,
+	0x11cf0013,
+	0x0911e700,
+	0x0814b601,
+	0xf00014fe,
+	0x07f10227,
+	0x03f01200,
+	0x0002d000,
+	0x32f404bd,
+	0xd717f100,
+	0x0010fe06,
+	0x07f124bd,
+	0x03f00700,
+	0x0002d000,
+	0x27f104bd,
+	0x07f12003,
+	0x03f00100,
+	0x0002d001,
+	0x27f104bd,
+	0x07f12004,
+	0x03f00104,
+	0x0002d001,
+	0x27f104bd,
+	0x07f1200b,
+	0x03f00108,
+	0x0002d001,
+	0x27f104bd,
+	0x07f1200c,
+	0x03f0011c,
+	0x0002d001,
+	0x039204bd,
+	0x0007f101,
+	0x0303f009,
+	0xbd0003d0,
+	0x0427f104,
+	0x0023f087,
+	0x040007f1,
 	0xd00003f0,
 	0x04bd0002,
-	0x200327f1,
-	0x010007f1,
-	0xd00103f0,
-	0x04bd0002,
-	0x200427f1,
-	0x010407f1,
-	0xd00103f0,
-	0x04bd0002,
-	0x200b27f1,
-	0x010807f1,
+	0xf10427f0,
+	0xf0030007,
+	0x02d00003,
+	0xf404bd00,
+	0xe7f11031,
+	0xe3f09604,
+	0x7721f440,
+	0xc702feb9,
+	0x018090f1,
+	0x1ff4f003,
+	0xf0020f80,
+	0x1fbb0117,
+	0x0112b604,
+	0x030007f1,
 	0xd00103f0,
-	0x04bd0002,
-	0x200c27f1,
-	0x011c07f1,
+	0x04bd0001,
+	0x040007f1,
 	0xd00103f0,
-	0x04bd0002,
-	0xf1010392,
-	0xf0090007,
-	0x03d00303,
+	0x04bd0001,
+	0x010017f1,
+	0xf502f7f0,
+	0xf5082021,
+	0xf0083221,
+	0x21f510f7,
+	0x0e98087f,
+	0x010f9800,
+	0x015f21f5,
+	0xf1081495,
+	0xf0c00007,
+	0x04d00103,
 	0xf104bd00,
-	0xf0870427,
-	0x07f10023,
-	0x03f00400,
-	0x0002d000,
-	0x27f004bd,
-	0x0007f104,
-	0x0003f003,
-	0xbd0002d0,
-	0x1031f404,
-	0x9604e7f1,
-	0xf440e3f0,
-	0xfeb96821,
-	0x90f1c702,
-	0xf0030180,
-	0x0f801ff4,
-	0x0117f002,
-	0xb6041fbb,
-	0x07f10112,
-	0x03f00300,
-	0x0001d001,
-	0x07f104bd,
-	0x03f00400,
-	0x0001d001,
-	0x17f104bd,
-	0xf7f00100,
-	0x1121f502,
-	0x2321f508,
-	0x10f7f008,
-	0x087021f5,
-	0x98000e98,
-	0x21f5010f,
-	0x14950150,
+	0xf0c10007,
+	0x04d00103,
+	0xb704bd00,
+	0xbb130030,
+	0xf5b6001f,
+	0x0007f102,
+	0x0103f0d3,
+	0xbd000fd0,
+	0x0815b604,
+	0xb60110b6,
+	0x1fb90814,
+	0xe221f502,
+	0x001fbb02,
+	0xf1020398,
+	0xf0200047,
+/* 0x0506: init_gpc */
+	0x4ea05043,
+	0x1fb90804,
+	0xac21f402,
+	0x010c4ea0,
+	0x21f4f4bd,
+	0x044ea0ac,
+	0xac21f401,
+	0x01004ea0,
+	0xf402f7f0,
+	0x4ea0ac21,
+/* 0x052e: init_gpc_wait */
+	0x21f40800,
+	0x1fffc877,
+	0xa0fa0bf4,
+	0xf408044e,
+	0x1fbb7721,
+	0x0040b700,
+	0x0132b680,
+	0xf0be1bf4,
+	0x21f500f7,
+	0xf7f0087f,
+	0x2021f500,
 	0x0007f108,
-	0x0103f0c0,
-	0xbd0004d0,
-	0x0007f104,
-	0x0103f0c1,
-	0xbd0004d0,
-	0x0030b704,
-	0x001fbb13,
-	0xf102f5b6,
-	0xf0d30007,
-	0x0fd00103,
-	0xb604bd00,
-	0x10b60815,
-	0x0814b601,
-	0xf5021fb9,
-	0xbb02d321,
-	0x0398001f,
-	0x0047f102,
-	0x5043f020,
-/* 0x04f4: init_gpc */
-	0x08044ea0,
-	0xf4021fb9,
-	0x4ea09d21,
-	0xf4bd010c,
-	0xa09d21f4,
-	0xf401044e,
-	0x4ea09d21,
-	0xf7f00100,
-	0x9d21f402,
-	0x08004ea0,
-/* 0x051c: init_gpc_wait */
-	0xc86821f4,
-	0x0bf41fff,
-	0x044ea0fa,
-	0x6821f408,
-	0xb7001fbb,
-	0xb6800040,
-	0x1bf40132,
-	0x00f7f0be,
-	0x087021f5,
-	0xf500f7f0,
-	0xf1081121,
-	0xf0010007,
-	0x01d00203,
-	0xbd04bd00,
-	0x1f19f014,
-	0x080007f1,
-	0xd00203f0,
-	0x04bd0001,
-/* 0x0564: main */
-	0xf40031f4,
-	0xd7f00028,
-	0x3921f410,
-	0xb1f401f4,
-	0xf54001e4,
-	0xbd00e91b,
-	0x0499f094,
-	0x0f0007f1,
-	0xd00203f0,
-	0x04bd0009,
-	0xc00017f1,
-	0xcf0213f0,
-	0x27f10011,
-	0x23f0c100,
-	0x0022cf02,
-	0xf51f13c8,
-	0xc800890b,
-	0x0bf41f23,
-	0xb920f962,
-	0x94bd0212,
-	0xf10799f0,
+	0x0203f001,
+	0xbd0001d0,
+	0xf014bd04,
+	0x07f11f19,
+	0x03f00800,
+	0x0001d002,
+/* 0x0576: main */
+	0x28f404bd,
+	0x10d7f000,
+	0xf43921f4,
+	0xe4b1f701,
+	0x1bf54001,
+	0x94bd00e9,
+	0xf10499f0,
 	0xf00f0007,
 	0x09d00203,
-	0xf404bd00,
-	0x31f40132,
-	0x4421f502,
-	0xf094bd0a,
+	0xf104bd00,
+	0xf0c00017,
+	0x11cf0213,
+	0x0027f100,
+	0x0223f0c1,
+	0xc80022cf,
+	0x0bf51f13,
+	0x23c80089,
+	0x620bf41f,
+	0x12b920f9,
+	0xf094bd02,
 	0x07f10799,
-	0x03f01700,
+	0x03f00f00,
 	0x0009d002,
-	0x20fc04bd,
+	0x32f404bd,
+	0x0231f401,
+	0x0a5321f5,
 	0x99f094bd,
-	0x0007f106,
-	0x0203f00f,
-	0xbd0009d0,
-	0x0131f404,
-	0x0a4421f5,
-	0x99f094bd,
-	0x0007f106,
+	0x0007f107,
 	0x0203f017,
 	0xbd0009d0,
-	0x330ef404,
-/* 0x060c: chsw_prev_no_next */
-	0x12b920f9,
-	0x0132f402,
-	0xf50232f4,
-	0xfc0a4421,
-	0x0007f120,
-	0x0203f0c0,
-	0xbd0002d0,
-	0x130ef404,
-/* 0x062c: chsw_no_prev */
-	0xf41f23c8,
-	0x31f40d0b,
-	0x0232f401,
-	0x0a4421f5,
-/* 0x063c: chsw_done */
-	0xf10127f0,
-	0xf0c30007,
-	0x02d00203,
-	0xbd04bd00,
-	0x0499f094,
+	0xbd20fc04,
+	0x0699f094,
+	0x0f0007f1,
+	0xd00203f0,
+	0x04bd0009,
+	0xf50131f4,
+	0xbd0a5321,
+	0x0699f094,
 	0x170007f1,
 	0xd00203f0,
 	0x04bd0009,
-	0xff080ef5,
-/* 0x0660: main_not_ctx_switch */
-	0xf401e4b0,
-	0xf2b90d1b,
-	0xd421f502,
-	0x460ef409,
-/* 0x0670: main_not_ctx_chan */
-	0xf402e4b0,
-	0x94bd321b,
-	0xf10799f0,
-	0xf00f0007,
+/* 0x061b: chsw_prev_no_next */
+	0xf9330ef4,
+	0x0212b920,
+	0xf40132f4,
+	0x21f50232,
+	0x20fc0a53,
+	0xc00007f1,
+	0xd00203f0,
+	0x04bd0002,
+/* 0x063b: chsw_no_prev */
+	0xc8130ef4,
+	0x0bf41f23,
+	0x0131f40d,
+	0xf50232f4,
+/* 0x064b: chsw_done */
+	0xf00a5321,
+	0x07f10127,
+	0x03f0c300,
+	0x0002d002,
+	0x94bd04bd,
+	0xf10499f0,
+	0xf0170007,
 	0x09d00203,
-	0xf404bd00,
-	0x32f40132,
-	0x4421f502,
-	0xf094bd0a,
+	0xf504bd00,
+/* 0x066f: main_not_ctx_switch */
+	0xb0ff0b0e,
+	0x1bf401e4,
+	0x02f2b90d,
+	0x09e321f5,
+/* 0x067f: main_not_ctx_chan */
+	0xb0460ef4,
+	0x1bf402e4,
+	0xf094bd32,
 	0x07f10799,
-	0x03f01700,
+	0x03f00f00,
 	0x0009d002,
-	0x0ef404bd,
-/* 0x06a5: main_not_ctx_save */
-	0x10ef9411,
-	0xf501f5f0,
-	0xf5037e21,
-/* 0x06b3: main_done */
-	0xbdfeb50e,
-	0x1f29f024,
-	0x080007f1,
+	0x32f404bd,
+	0x0232f401,
+	0x0a5321f5,
+	0x99f094bd,
+	0x0007f107,
+	0x0203f017,
+	0xbd0009d0,
+	0x110ef404,
+/* 0x06b4: main_not_ctx_save */
+	0xf010ef94,
+	0x21f501f5,
+	0x0ef5038d,
+/* 0x06c2: main_done */
+	0x24bdfeb8,
+	0xf11f29f0,
+	0xf0080007,
+	0x02d00203,
+	0xf504bd00,
+/* 0x06d7: ih */
+	0xf9fea30e,
+	0xfe80f900,
+	0x80f90188,
+	0xa0f990f9,
+	0xd0f9b0f9,
+	0xf0f9e0f9,
+	0xa7f104bd,
+	0xa3f00200,
+	0x00aacf00,
+	0xf404abc4,
+	0xd7f0300b,
+	0x00e7f110,
+	0x00e3f01a,
+	0xf100eecf,
+	0xf01900f7,
+	0xffcf00f3,
+	0x0421f400,
+	0x0400b0b7,
+	0xf101e7f0,
+	0xf01d0007,
+	0x0ed00003,
+/* 0x072b: ih_no_fifo */
+	0xe404bd00,
+	0xf40100ab,
+	0xd7f00d0b,
+	0x01e7f110,
+	0x0421f440,
+/* 0x073c: ih_no_ctxsw */
+	0x0400abe4,
+	0xf16c0bf4,
+	0xf00708e7,
+	0x21f440e3,
+	0x02ffb977,
+	0x040007f1,
 	0xd00203f0,
-	0x04bd0002,
-	0xfea00ef5,
-/* 0x06c8: ih */
-	0x80f900f9,
-	0xf90188fe,
-	0xf990f980,
-	0xf9b0f9a0,
-	0xf9e0f9d0,
-	0xf104bdf0,
-	0xf00200a7,
-	0xaacf00a3,
-	0x04abc400,
-	0xf0300bf4,
-	0xe7f110d7,
-	0xe3f01a00,
-	0x00eecf00,
-	0x1900f7f1,
-	0xcf00f3f0,
-	0x21f400ff,
-	0x00b0b704,
-	0x01e7f004,
-	0x1d0007f1,
-	0xd00003f0,
-	0x04bd000e,
-/* 0x071c: ih_no_fifo */
-	0x0100abe4,
-	0xf00d0bf4,
-	0xe7f110d7,
-	0x21f44001,
-/* 0x072d: ih_no_ctxsw */
-	0x00abe404,
-	0x6c0bf404,
-	0x0708e7f1,
+	0x04bd000f,
+	0x0704e7f1,
 	0xf440e3f0,
-	0xffb96821,
+	0xffb97721,
 	0x0007f102,
-	0x0203f004,
-	0xbd000fd0,
-	0x04e7f104,
-	0x40e3f007,
-	0xb96821f4,
-	0x07f102ff,
-	0x03f00300,
-	0x000fd002,
-	0xfec704bd,
-	0x02ee9450,
-	0x0700f7f1,
-	0xbb40f3f0,
-	0x21f400ef,
-	0x0007f168,
-	0x0203f002,
+	0x0203f003,
 	0xbd000fd0,
-	0x03f7f004,
-	0x037e21f5,
-	0x0100b7f1,
-	0xf102bfb9,
-	0xf00144e7,
-	0x21f440e3,
-/* 0x079d: ih_no_fwmthd */
-	0x04b7f19d,
-	0xffb0bd05,
-	0x0bf4b4ab,
-	0x0007f10f,
-	0x0303f007,
-	0xbd000bd0,
-/* 0x07b5: ih_no_other */
-	0x0007f104,
-	0x0003f001,
-	0xbd000ad0,
-	0xfcf0fc04,
-	0xfcd0fce0,
-	0xfca0fcb0,
-	0xfe80fc90,
-	0x80fc0088,
-	0x32f400fc,
-/* 0x07db: ctx_4160s */
-	0xf001f800,
-	0xffb901f7,
-	0x60e7f102,
-	0x40e3f041,
-/* 0x07eb: ctx_4160s_wait */
-	0xf19d21f4,
-	0xf04160e7,
-	0x21f440e3,
-	0x02ffb968,
-	0xf404ffc8,
-	0x00f8f00b,
-/* 0x0800: ctx_4160c */
-	0xffb9f4bd,
-	0x60e7f102,
-	0x40e3f041,
-	0xf89d21f4,
-/* 0x0811: ctx_4170s */
-	0x10f5f000,
-	0xf102ffb9,
-	0xf04170e7,
-	0x21f440e3,
-/* 0x0823: ctx_4170w */
-	0xf100f89d,
-	0xf04170e7,
-	0x21f440e3,
-	0x02ffb968,
-	0xf410f4f0,
-	0x00f8f01b,
-/* 0x0838: ctx_redswitch */
-	0x0200e7f1,
-	0xf040e5f0,
-	0xe5f020e5,
-	0x0007f110,
-	0x0103f085,
-	0xbd000ed0,
-	0x08f7f004,
-/* 0x0854: ctx_redswitch_delay */
-	0xf401f2b6,
-	0xe5f1fd1b,
-	0xe5f10400,
-	0x07f10100,
-	0x03f08500,
-	0x000ed001,
-	0x00f804bd,
-/* 0x0870: ctx_86c */
-	0x1b0007f1,
+	0x50fec704,
+	0xf102ee94,
+	0xf00700f7,
+	0xefbb40f3,
+	0x7721f400,
+	0x020007f1,
 	0xd00203f0,
 	0x04bd000f,
+	0xf503f7f0,
+	0xf1038d21,
+	0xb90100b7,
+	0xe7f102bf,
+	0xe3f00144,
+	0xac21f440,
+/* 0x07ac: ih_no_fwmthd */
+	0x0504b7f1,
+	0xabffb0bd,
+	0x0f0bf4b4,
+	0x070007f1,
+	0xd00303f0,
+	0x04bd000b,
+/* 0x07c4: ih_no_other */
+	0x010007f1,
+	0xd00003f0,
+	0x04bd000a,
+	0xe0fcf0fc,
+	0xb0fcd0fc,
+	0x90fca0fc,
+	0x88fe80fc,
+	0xfc80fc00,
+	0x0032f400,
+/* 0x07ea: ctx_4160s */
+	0xf7f001f8,
+	0x02ffb901,
+	0x4160e7f1,
+	0xf440e3f0,
+/* 0x07fa: ctx_4160s_wait */
+	0xe7f1ac21,
+	0xe3f04160,
+	0x7721f440,
+	0xc802ffb9,
+	0x0bf404ff,
+/* 0x080f: ctx_4160c */
+	0xbd00f8f0,
+	0x02ffb9f4,
+	0x4160e7f1,
+	0xf440e3f0,
+	0x00f8ac21,
+/* 0x0820: ctx_4170s */
+	0xb910f5f0,
+	0xe7f102ff,
+	0xe3f04170,
+	0xac21f440,
+/* 0x0832: ctx_4170w */
+	0xe7f100f8,
+	0xe3f04170,
+	0x7721f440,
+	0xf002ffb9,
+	0x1bf410f4,
+/* 0x0847: ctx_redswitch */
+	0xf100f8f0,
+	0xf00200e7,
+	0xe5f040e5,
+	0x10e5f020,
+	0x850007f1,
+	0xd00103f0,
+	0x04bd000e,
+/* 0x0863: ctx_redswitch_delay */
+	0xb608f7f0,
+	0x1bf401f2,
+	0x00e5f1fd,
+	0x00e5f104,
+	0x0007f101,
+	0x0103f085,
+	0xbd000ed0,
+/* 0x087f: ctx_86c */
+	0xf100f804,
+	0xf01b0007,
+	0x0fd00203,
+	0xb904bd00,
+	0xe7f102ff,
+	0xe3f08a14,
+	0xac21f440,
 	0xf102ffb9,
-	0xf08a14e7,
-	0x21f440e3,
-	0x02ffb99d,
-	0xa86ce7f1,
-	0xf441e3f0,
-	0x00f89d21,
-/* 0x0898: ctx_mem */
-	0x840007f1,
-	0xd00203f0,
-	0x04bd000f,
-/* 0x08a4: ctx_mem_wait */
-	0x8400f7f1,
-	0xcf02f3f0,
-	0xfffd00ff,
-	0xf31bf405,
-/* 0x08b6: ctx_load */
-	0x94bd00f8,
-	0xf10599f0,
-	0xf00f0007,
-	0x09d00203,
-	0xf004bd00,
-	0x21f40ca7,
-	0xf1f4bdd0,
-	0xf0890007,
+	0xf0a86ce7,
+	0x21f441e3,
+/* 0x08a7: ctx_mem */
+	0xf100f8ac,
+	0xf0840007,
 	0x0fd00203,
+/* 0x08b3: ctx_mem_wait */
 	0xf104bd00,
-	0xf0c10007,
-	0x02d00203,
-	0xf104bd00,
-	0xf0830007,
-	0x02d00203,
-	0xf004bd00,
-	0x21f507f7,
-	0x07f10898,
-	0x03f0c000,
+	0xf08400f7,
+	0xffcf02f3,
+	0x05fffd00,
+	0xf8f31bf4,
+/* 0x08c5: ctx_load */
+	0xf094bd00,
+	0x07f10599,
+	0x03f00f00,
+	0x0009d002,
+	0xa7f004bd,
+	0xdf21f40c,
+	0x07f1f4bd,
+	0x03f08900,
+	0x000fd002,
+	0x07f104bd,
+	0x03f0c100,
 	0x0002d002,
-	0x0bfe04bd,
-	0x1f2af000,
-	0xb60424b6,
-	0x94bd0220,
-	0xf10899f0,
-	0xf00f0007,
-	0x09d00203,
-	0xf104bd00,
-	0xf0810007,
-	0x02d00203,
-	0xf104bd00,
-	0xf1000027,
-	0xf0800023,
-	0x07f10225,
-	0x03f08800,
+	0x07f104bd,
+	0x03f08300,
 	0x0002d002,
-	0x17f004bd,
-	0x0027f110,
-	0x0223f002,
-	0xf80512fa,
-	0xf094bd03,
+	0xf7f004bd,
+	0xa721f507,
+	0x0007f108,
+	0x0203f0c0,
+	0xbd0002d0,
+	0x000bfe04,
+	0xb61f2af0,
+	0x20b60424,
+	0xf094bd02,
 	0x07f10899,
-	0x03f01700,
+	0x03f00f00,
 	0x0009d002,
-	0x019804bd,
-	0x1814b681,
-	0xb6800298,
-	0x12fd0825,
-	0x16018005,
+	0x07f104bd,
+	0x03f08100,
+	0x0002d002,
+	0x27f104bd,
+	0x23f10000,
+	0x25f08000,
+	0x0007f102,
+	0x0203f088,
+	0xbd0002d0,
+	0x1017f004,
+	0x020027f1,
+	0xfa0223f0,
+	0x03f80512,
 	0x99f094bd,
-	0x0007f109,
-	0x0203f00f,
+	0x0007f108,
+	0x0203f017,
 	0xbd0009d0,
-	0x0007f104,
-	0x0203f081,
-	0xbd0001d0,
-	0x0127f004,
-	0x880007f1,
+	0x81019804,
+	0x981814b6,
+	0x25b68002,
+	0x0512fd08,
+	0xbd160180,
+	0x0999f094,
+	0x0f0007f1,
 	0xd00203f0,
-	0x04bd0002,
-	0x010017f1,
-	0xfa0613f0,
-	0x03f80501,
+	0x04bd0009,
+	0x810007f1,
+	0xd00203f0,
+	0x04bd0001,
+	0xf10127f0,
+	0xf0880007,
+	0x02d00203,
+	0xf104bd00,
+	0xf0010017,
+	0x01fa0613,
+	0xbd03f805,
+	0x0999f094,
+	0x170007f1,
+	0xd00203f0,
+	0x04bd0009,
 	0x99f094bd,
-	0x0007f109,
+	0x0007f105,
 	0x0203f017,
 	0xbd0009d0,
-	0xf094bd04,
-	0x07f10599,
-	0x03f01700,
-	0x0009d002,
-	0x00f804bd,
-/* 0x09d4: ctx_chan */
-	0x07db21f5,
-	0x08b621f5,
-	0xf40ca7f0,
-	0xf7f0d021,
-	0x9821f505,
-	0x0021f508,
-/* 0x09ef: ctx_mmio_exec */
-	0x9800f808,
-	0x07f14103,
+/* 0x09e3: ctx_chan */
+	0xf500f804,
+	0xf507ea21,
+	0xf008c521,
+	0x21f40ca7,
+	0x05f7f0df,
+	0x08a721f5,
+	0x080f21f5,
+/* 0x09fe: ctx_mmio_exec */
+	0x039800f8,
+	0x0007f141,
+	0x0203f081,
+	0xbd0003d0,
+/* 0x0a0f: ctx_mmio_loop */
+	0xc434bd04,
+	0x1bf4ff34,
+	0x0057f10f,
+	0x0653f002,
+	0xf80535fa,
+/* 0x0a21: ctx_mmio_pull */
+	0x804e9803,
+	0xf4814f98,
+	0x30b6ac21,
+	0x0112b608,
+/* 0x0a33: ctx_mmio_done */
+	0x98df1bf4,
+	0x07f11603,
 	0x03f08100,
 	0x0003d002,
-	0x34bd04bd,
-/* 0x0a00: ctx_mmio_loop */
-	0xf4ff34c4,
-	0x57f10f1b,
-	0x53f00200,
-	0x0535fa06,
-/* 0x0a12: ctx_mmio_pull */
-	0x4e9803f8,
-	0x814f9880,
-	0xb69d21f4,
-	0x12b60830,
-	0xdf1bf401,
-/* 0x0a24: ctx_mmio_done */
-	0xf1160398,
-	0xf0810007,
-	0x03d00203,
-	0x8004bd00,
-	0x17f14000,
-	0x13f00100,
-	0x0601fa06,
-	0x00f803f8,
-/* 0x0a44: ctx_xfer */
-	0xf104e7f0,
-	0xf0020007,
-	0x0ed00303,
-/* 0x0a53: ctx_xfer_idle */
-	0xf104bd00,
-	0xf00000e7,
-	0xeecf03e3,
-	0x00e4f100,
-	0xf21bf420,
-	0xf40611f4,
-/* 0x0a6a: ctx_xfer_pre */
-	0xf7f01102,
-	0x7021f510,
-	0xdb21f508,
-	0x1c11f407,
-/* 0x0a78: ctx_xfer_pre_load */
-	0xf502f7f0,
-	0xf5081121,
-	0xf5082321,
-	0xbd083821,
-	0x1121f5f4,
-	0xb621f508,
-/* 0x0a91: ctx_xfer_exec */
-	0x16019808,
-	0x07f124bd,
-	0x03f00500,
-	0x0002d001,
-	0x1fb904bd,
-	0x00e7f102,
+	0x008004bd,
+	0x0017f140,
+	0x0613f001,
+	0xf80601fa,
+/* 0x0a53: ctx_xfer */
+	0xf000f803,
+	0x07f104e7,
+	0x03f00200,
+	0x000ed003,
+/* 0x0a62: ctx_xfer_idle */
+	0xe7f104bd,
+	0xe3f00000,
+	0x00eecf03,
+	0x2000e4f1,
+	0xf4f21bf4,
+	0x02f40611,
+/* 0x0a79: ctx_xfer_pre */
+	0x10f7f011,
+	0x087f21f5,
+	0x07ea21f5,
+/* 0x0a87: ctx_xfer_pre_load */
+	0xf01c11f4,
+	0x21f502f7,
+	0x21f50820,
+	0x21f50832,
+	0xf4bd0847,
+	0x082021f5,
+	0x08c521f5,
+/* 0x0aa0: ctx_xfer_exec */
+	0xbd160198,
+	0x0007f124,
+	0x0103f005,
+	0xbd0002d0,
+	0x021fb904,
+	0xa500e7f1,
+	0xf441e3f0,
+	0xfcf0ac21,
+	0x022cf001,
+	0xfd0124b6,
+	0xffb905f2,
+	0x04e7f102,
 	0x41e3f0a5,
-	0xf09d21f4,
-	0x2cf001fc,
-	0x0124b602,
-	0xb905f2fd,
-	0xe7f102ff,
-	0xe3f0a504,
-	0x9d21f441,
-	0x026a21f5,
-	0x07f124bd,
-	0x03f047fc,
-	0x0002d002,
-	0x2cf004bd,
-	0x0320b601,
-	0x4afc07f1,
-	0xd00203f0,
-	0x04bd0002,
-	0xf001acf0,
-	0xb7f006a5,
-	0x000c9800,
-	0xf0010d98,
-	0x21f500e7,
-	0xa7f0016f,
-	0x1021f508,
-	0x5e21f501,
-	0x1301f402,
-	0xf40ca7f0,
-	0xf7f0d021,
-	0x9821f505,
-	0x3202f408,
-/* 0x0b20: ctx_xfer_post */
-	0xf502f7f0,
-	0xbd081121,
-	0x7021f5f4,
-	0x7f21f508,
-	0x2321f502,
-	0xf5f4bd08,
-	0xf4081121,
-	0x01981011,
-	0x0511fd40,
-	0xf5070bf4,
-/* 0x0b4b: ctx_xfer_no_post_mmio */
-	0xf509ef21,
-/* 0x0b4f: ctx_xfer_done */
-	0xf8080021,
-	0x00000000,
-	0x00000000,
-	0x00000000,
-	0x00000000,
+	0xf5ac21f4,
+	0xbd027921,
+	0xfc07f124,
+	0x0203f047,
+	0xbd0002d0,
+	0x012cf004,
+	0xf10320b6,
+	0xf04afc07,
+	0x02d00203,
+	0xf004bd00,
+	0xa5f001ac,
+	0x00b7f006,
+	0x98000c98,
+	0xe7f0010d,
+	0x7e21f500,
+	0x08a7f001,
+	0x011f21f5,
+	0x026d21f5,
+	0xf01301f4,
+	0x21f40ca7,
+	0x05f7f0df,
+	0x08a721f5,
+/* 0x0b2f: ctx_xfer_post */
+	0xf03202f4,
+	0x21f502f7,
+	0xf4bd0820,
+	0x087f21f5,
+	0x028e21f5,
+	0x083221f5,
+	0x21f5f4bd,
+	0x11f40820,
+	0x40019810,
+	0xf40511fd,
+	0x21f5070b,
+/* 0x0b5a: ctx_xfer_no_post_mmio */
+	0x21f509fe,
+/* 0x0b5e: ctx_xfer_done */
+	0x00f8080f,
 	0x00000000,
 	0x00000000,
 	0x00000000,
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgk104.fuc3.h b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgk104.fuc3.h
index 125824b..b50b999 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgk104.fuc3.h
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgk104.fuc3.h
@@ -206,14 +206,14 @@ uint32_t gk104_grhub_data[] = {
 };
 
 uint32_t gk104_grhub_code[] = {
-	0x039b0ef5,
+	0x03aa0ef5,
 /* 0x0004: queue_put */
 	0x9800d898,
 	0x86f001d9,
 	0x0489b808,
 	0xf00c1bf4,
 	0x21f502f7,
-	0x00f8037e,
+	0x00f8038d,
 /* 0x001c: queue_put_next */
 	0xb60798c4,
 	0x8dbb0384,
@@ -224,766 +224,766 @@ uint32_t gk104_grhub_code[] = {
 	0xf801d980,
 /* 0x0039: queue_get */
 	0x0131f400,
-	0x9800d898,
-	0x89b801d9,
-	0x210bf404,
-	0xb60789c4,
-	0x9dbb0394,
-	0x0890b600,
-	0x98009e98,
-	0x80b6019f,
-	0x0f84f001,
-	0xf400d880,
-/* 0x0066: queue_get_done */
-	0x00f80132,
-/* 0x0068: nv_rd32 */
+	0x980031f4,
+	0xd99800d8,
+	0x0489b801,
+	0xc42d0bf4,
+	0x94b60789,
+	0x009dbb03,
+	0x980890b6,
+	0x9f98009e,
+	0x0180b601,
+	0x800f84f0,
+	0x32f400d8,
+	0x01d99801,
+	0xf40489b8,
+	0x32f4060b,
+/* 0x0075: queue_get_done */
+/* 0x0077: nv_rd32 */
+	0xb900f800,
+	0xc9f002ec,
+	0x0007f11f,
+	0x0103f0ca,
+	0xbd000cd0,
+/* 0x0089: nv_rd32_wait */
+	0x00c7f104,
+	0x01c3f0ca,
+	0xc800cccf,
+	0x1bf41fcc,
+	0x06a7f0f3,
+	0x011f21f5,
+	0xcb00f7f1,
+	0xcf01f3f0,
+	0x00f800ff,
+/* 0x00ac: nv_wr32 */
+	0xcc0007f1,
+	0xd00103f0,
+	0x04bd000f,
 	0xf002ecb9,
-	0x07f11fc9,
-	0x03f0ca00,
-	0x000cd001,
-/* 0x007a: nv_rd32_wait */
-	0xc7f104bd,
-	0xc3f0ca00,
-	0x00cccf01,
-	0xf41fccc8,
-	0xa7f0f31b,
-	0x1021f506,
-	0x00f7f101,
-	0x01f3f0cb,
-	0xf800ffcf,
-/* 0x009d: nv_wr32 */
-	0x0007f100,
-	0x0103f0cc,
-	0xbd000fd0,
-	0x02ecb904,
-	0xf01fc9f0,
-	0x07f11ec9,
-	0x03f0ca00,
-	0x000cd001,
-/* 0x00be: nv_wr32_wait */
-	0xc7f104bd,
-	0xc3f0ca00,
-	0x00cccf01,
-	0xf41fccc8,
-	0x00f8f31b,
-/* 0x00d0: wait_donez */
-	0x99f094bd,
-	0x0007f100,
-	0x0203f00f,
-	0xbd0009d0,
-	0x0007f104,
-	0x0203f006,
-	0xbd000ad0,
-/* 0x00ed: wait_donez_ne */
-	0x0087f104,
-	0x0183f000,
-	0xff0088cf,
-	0x1bf4888a,
-	0xf094bdf3,
-	0x07f10099,
-	0x03f01700,
-	0x0009d002,
-	0x00f804bd,
-/* 0x0110: wait_doneo */
+	0xc9f01fc9,
+	0x0007f11e,
+	0x0103f0ca,
+	0xbd000cd0,
+/* 0x00cd: nv_wr32_wait */
+	0x00c7f104,
+	0x01c3f0ca,
+	0xc800cccf,
+	0x1bf41fcc,
+/* 0x00df: wait_donez */
+	0xbd00f8f3,
+	0x0099f094,
+	0x0f0007f1,
+	0xd00203f0,
+	0x04bd0009,
+	0x060007f1,
+	0xd00203f0,
+	0x04bd000a,
+/* 0x00fc: wait_donez_ne */
+	0x000087f1,
+	0xcf0183f0,
+	0x8aff0088,
+	0xf31bf488,
 	0x99f094bd,
 	0x0007f100,
-	0x0203f00f,
+	0x0203f017,
 	0xbd0009d0,
-	0x0007f104,
-	0x0203f006,
-	0xbd000ad0,
-/* 0x012d: wait_doneo_e */
-	0x0087f104,
-	0x0183f000,
-	0xff0088cf,
-	0x0bf4888a,
-	0xf094bdf3,
-	0x07f10099,
-	0x03f01700,
-	0x0009d002,
-	0x00f804bd,
-/* 0x0150: mmctx_size */
-/* 0x0152: nv_mmctx_size_loop */
-	0xe89894bd,
-	0x1a85b600,
-	0xb60180b6,
-	0x98bb0284,
-	0x04e0b600,
-	0xf404efb8,
-	0x9fb9eb1b,
-/* 0x016f: mmctx_xfer */
-	0xbd00f802,
-	0x0199f094,
+/* 0x011f: wait_doneo */
+	0xbd00f804,
+	0x0099f094,
 	0x0f0007f1,
 	0xd00203f0,
 	0x04bd0009,
-	0xbbfd94bd,
-	0x120bf405,
-	0xc40007f1,
-	0xd00103f0,
-	0x04bd000b,
-/* 0x0197: mmctx_base_disabled */
-	0xfd0099f0,
-	0x0bf405ee,
-	0x0007f11e,
-	0x0103f0c6,
-	0xbd000ed0,
-	0x0007f104,
-	0x0103f0c7,
-	0xbd000fd0,
-	0x0199f004,
-/* 0x01b8: mmctx_multi_disabled */
-	0xb600abc8,
-	0xb9f010b4,
-	0x01aec80c,
-	0xfd11e4b6,
-	0x07f105be,
-	0x03f0c500,
-	0x000bd001,
-/* 0x01d6: mmctx_exec_loop */
-/* 0x01d6: mmctx_wait_free */
-	0xe7f104bd,
-	0xe3f0c500,
-	0x00eecf01,
-	0xf41fe4f0,
-	0xce98f30b,
-	0x05e9fd00,
-	0xc80007f1,
+	0x060007f1,
+	0xd00203f0,
+	0x04bd000a,
+/* 0x013c: wait_doneo_e */
+	0x000087f1,
+	0xcf0183f0,
+	0x8aff0088,
+	0xf30bf488,
+	0x99f094bd,
+	0x0007f100,
+	0x0203f017,
+	0xbd0009d0,
+/* 0x015f: mmctx_size */
+	0xbd00f804,
+/* 0x0161: nv_mmctx_size_loop */
+	0x00e89894,
+	0xb61a85b6,
+	0x84b60180,
+	0x0098bb02,
+	0xb804e0b6,
+	0x1bf404ef,
+	0x029fb9eb,
+/* 0x017e: mmctx_xfer */
+	0x94bd00f8,
+	0xf10199f0,
+	0xf00f0007,
+	0x09d00203,
+	0xbd04bd00,
+	0x05bbfd94,
+	0xf1120bf4,
+	0xf0c40007,
+	0x0bd00103,
+	0xf004bd00,
+/* 0x01a6: mmctx_base_disabled */
+	0xeefd0099,
+	0x1e0bf405,
+	0xc60007f1,
 	0xd00103f0,
 	0x04bd000e,
-	0xb804c0b6,
-	0x1bf404cd,
-	0x02abc8d8,
-/* 0x0207: mmctx_fini_wait */
-	0xf11f1bf4,
-	0xf0c500b7,
-	0xbbcf01b3,
-	0x1fb4f000,
-	0xf410b4b0,
-	0xa7f0f01b,
-	0xd021f405,
-/* 0x0223: mmctx_stop */
-	0xc82b0ef4,
+	0xc70007f1,
+	0xd00103f0,
+	0x04bd000f,
+/* 0x01c7: mmctx_multi_disabled */
+	0xc80199f0,
 	0xb4b600ab,
 	0x0cb9f010,
-	0xf112b9f0,
-	0xf0c50007,
-	0x0bd00103,
-/* 0x023b: mmctx_stop_wait */
-	0xf104bd00,
-	0xf0c500b7,
-	0xbbcf01b3,
-	0x12bbc800,
-/* 0x024b: mmctx_done */
-	0xbdf31bf4,
-	0x0199f094,
-	0x170007f1,
+	0xb601aec8,
+	0xbefd11e4,
+	0x0007f105,
+	0x0103f0c5,
+	0xbd000bd0,
+/* 0x01e5: mmctx_exec_loop */
+/* 0x01e5: mmctx_wait_free */
+	0x00e7f104,
+	0x01e3f0c5,
+	0xf000eecf,
+	0x0bf41fe4,
+	0x00ce98f3,
+	0xf105e9fd,
+	0xf0c80007,
+	0x0ed00103,
+	0xb604bd00,
+	0xcdb804c0,
+	0xd81bf404,
+	0xf402abc8,
+/* 0x0216: mmctx_fini_wait */
+	0xb7f11f1b,
+	0xb3f0c500,
+	0x00bbcf01,
+	0xb01fb4f0,
+	0x1bf410b4,
+	0x05a7f0f0,
+	0xf4df21f4,
+/* 0x0232: mmctx_stop */
+	0xabc82b0e,
+	0x10b4b600,
+	0xf00cb9f0,
+	0x07f112b9,
+	0x03f0c500,
+	0x000bd001,
+/* 0x024a: mmctx_stop_wait */
+	0xb7f104bd,
+	0xb3f0c500,
+	0x00bbcf01,
+	0xf412bbc8,
+/* 0x025a: mmctx_done */
+	0x94bdf31b,
+	0xf10199f0,
+	0xf0170007,
+	0x09d00203,
+	0xf804bd00,
+/* 0x026d: strand_wait */
+	0xf0a0f900,
+	0x21f402a7,
+	0xf8a0fcdf,
+/* 0x0279: strand_pre */
+	0x0c97f000,
+	0x4afc07f1,
 	0xd00203f0,
 	0x04bd0009,
-/* 0x025e: strand_wait */
-	0xa0f900f8,
-	0xf402a7f0,
-	0xa0fcd021,
-/* 0x026a: strand_pre */
+	0x026d21f5,
+/* 0x028e: strand_post */
 	0x97f000f8,
-	0xfc07f10c,
+	0xfc07f10d,
 	0x0203f04a,
 	0xbd0009d0,
-	0x5e21f504,
-/* 0x027f: strand_post */
+	0x6d21f504,
+/* 0x02a3: strand_set */
 	0xf000f802,
-	0x07f10d97,
-	0x03f04afc,
-	0x0009d002,
-	0x21f504bd,
-	0x00f8025e,
-/* 0x0294: strand_set */
-	0xf10fc7f0,
-	0xf04ffc07,
-	0x0cd00203,
-	0xf004bd00,
-	0x07f10bc7,
-	0x03f04afc,
-	0x000cd002,
-	0x07f104bd,
+	0x07f10fc7,
 	0x03f04ffc,
-	0x000ed002,
+	0x000cd002,
 	0xc7f004bd,
-	0xfc07f10a,
+	0xfc07f10b,
 	0x0203f04a,
 	0xbd000cd0,
-	0x5e21f504,
-/* 0x02d3: strand_ctx_init */
-	0xbd00f802,
-	0x0399f094,
-	0x0f0007f1,
-	0xd00203f0,
-	0x04bd0009,
-	0x026a21f5,
-	0xf503e7f0,
-	0xbd029421,
-	0xfc07f1c4,
-	0x0203f047,
-	0xbd000cd0,
-	0x01c7f004,
+	0xfc07f104,
+	0x0203f04f,
+	0xbd000ed0,
+	0x0ac7f004,
 	0x4afc07f1,
 	0xd00203f0,
 	0x04bd000c,
-	0x025e21f5,
-	0xf1010c92,
-	0xf046fc07,
+	0x026d21f5,
+/* 0x02e2: strand_ctx_init */
+	0x94bd00f8,
+	0xf10399f0,
+	0xf00f0007,
+	0x09d00203,
+	0xf504bd00,
+	0xf0027921,
+	0x21f503e7,
+	0xc4bd02a3,
+	0x47fc07f1,
+	0xd00203f0,
+	0x04bd000c,
+	0xf101c7f0,
+	0xf04afc07,
 	0x0cd00203,
-	0xf004bd00,
-	0x07f102c7,
-	0x03f04afc,
+	0xf504bd00,
+	0x92026d21,
+	0x07f1010c,
+	0x03f046fc,
 	0x000cd002,
-	0x21f504bd,
-	0x21f5025e,
-	0x87f1027f,
-	0x83f04200,
-	0x0097f102,
-	0x0293f020,
-	0x950099cf,
-/* 0x034a: ctx_init_strand_loop */
-	0x8ed008fe,
-	0x408ed000,
-	0xb6808acf,
-	0xa0b606a5,
-	0x00eabb01,
-	0xb60480b6,
-	0x1bf40192,
-	0x08e4b6e8,
-	0xbdf2efbc,
-	0x0399f094,
-	0x170007f1,
-	0xd00203f0,
-	0x04bd0009,
-/* 0x037e: error */
-	0x07f100f8,
-	0x03f00500,
-	0x000fd002,
-	0xf7f004bd,
-	0x0007f101,
-	0x0303f007,
+	0xc7f004bd,
+	0xfc07f102,
+	0x0203f04a,
+	0xbd000cd0,
+	0x6d21f504,
+	0x8e21f502,
+	0x0087f102,
+	0x0283f042,
+	0x200097f1,
+	0xcf0293f0,
+	0xfe950099,
+/* 0x0359: ctx_init_strand_loop */
+	0x008ed008,
+	0xcf408ed0,
+	0xa5b6808a,
+	0x01a0b606,
+	0xb600eabb,
+	0x92b60480,
+	0xe81bf401,
+	0xbc08e4b6,
+	0x94bdf2ef,
+	0xf10399f0,
+	0xf0170007,
+	0x09d00203,
+	0xf804bd00,
+/* 0x038d: error */
+	0x0007f100,
+	0x0203f005,
 	0xbd000fd0,
-/* 0x039b: init */
-	0xbd00f804,
-	0x0007fe04,
-	0x420017f1,
-	0xcf0013f0,
-	0x11e70011,
-	0x14b60109,
-	0x0014fe08,
-	0xf10227f0,
-	0xf0120007,
-	0x02d00003,
-	0xf104bd00,
-	0xfe06c817,
-	0x24bd0010,
+	0x01f7f004,
 	0x070007f1,
+	0xd00303f0,
+	0x04bd000f,
+/* 0x03aa: init */
+	0x04bd00f8,
+	0xf10007fe,
+	0xf0420017,
+	0x11cf0013,
+	0x0911e700,
+	0x0814b601,
+	0xf00014fe,
+	0x07f10227,
+	0x03f01200,
+	0x0002d000,
+	0x32f404bd,
+	0xd717f100,
+	0x0010fe06,
+	0x07f124bd,
+	0x03f00700,
+	0x0002d000,
+	0x27f104bd,
+	0x07f12003,
+	0x03f00100,
+	0x0002d001,
+	0x27f104bd,
+	0x07f12004,
+	0x03f00104,
+	0x0002d001,
+	0x27f104bd,
+	0x07f1200b,
+	0x03f00108,
+	0x0002d001,
+	0x27f104bd,
+	0x07f1200c,
+	0x03f0011c,
+	0x0002d001,
+	0x039204bd,
+	0x0007f101,
+	0x0303f009,
+	0xbd0003d0,
+	0x0427f104,
+	0x0023f087,
+	0x040007f1,
 	0xd00003f0,
 	0x04bd0002,
-	0x200327f1,
-	0x010007f1,
-	0xd00103f0,
-	0x04bd0002,
-	0x200427f1,
-	0x010407f1,
-	0xd00103f0,
-	0x04bd0002,
-	0x200b27f1,
-	0x010807f1,
+	0xf10427f0,
+	0xf0030007,
+	0x02d00003,
+	0xf404bd00,
+	0xe7f11031,
+	0xe3f09604,
+	0x7721f440,
+	0xc702feb9,
+	0x018090f1,
+	0x1ff4f003,
+	0xf0020f80,
+	0x1fbb0117,
+	0x0112b604,
+	0x030007f1,
 	0xd00103f0,
-	0x04bd0002,
-	0x200c27f1,
-	0x011c07f1,
+	0x04bd0001,
+	0x040007f1,
 	0xd00103f0,
-	0x04bd0002,
-	0xf1010392,
-	0xf0090007,
-	0x03d00303,
-	0xf104bd00,
-	0xf0870427,
-	0x07f10023,
-	0x03f00400,
-	0x0002d000,
-	0x27f004bd,
-	0x0007f104,
-	0x0003f003,
-	0xbd0002d0,
-	0x1031f404,
-	0x9604e7f1,
-	0xf440e3f0,
-	0xfeb96821,
-	0x90f1c702,
-	0xf0030180,
-	0x0f801ff4,
-	0x0117f002,
-	0xb6041fbb,
-	0x07f10112,
-	0x03f00300,
-	0x0001d001,
-	0x07f104bd,
-	0x03f00400,
-	0x0001d001,
-	0x17f104bd,
-	0xf7f00100,
-	0xdb21f502,
-	0xed21f507,
-	0x10f7f007,
-	0x083a21f5,
-	0x98000e98,
-	0x21f5010f,
-	0x14950150,
-	0x0007f108,
-	0x0103f0c0,
-	0xbd0004d0,
-	0x0007f104,
-	0x0103f0c1,
-	0xbd0004d0,
-	0x0030b704,
-	0x001fbb13,
-	0xf102f5b6,
-	0xf0d30007,
-	0x0fd00103,
-	0xb604bd00,
-	0x10b60815,
-	0x0814b601,
-	0xf5021fb9,
-	0xbb02d321,
-	0x0398001f,
-	0x0047f102,
-	0x5043f020,
-/* 0x04f4: init_gpc */
-	0x08044ea0,
-	0xf4021fb9,
-	0x4ea09d21,
-	0xf4bd010c,
-	0xa09d21f4,
-	0xf401044e,
-	0x4ea09d21,
-	0xf7f00100,
-	0x9d21f402,
-	0x08004ea0,
-/* 0x051c: init_gpc_wait */
-	0xc86821f4,
-	0x0bf41fff,
-	0x044ea0fa,
-	0x6821f408,
-	0xb7001fbb,
-	0xb6800040,
-	0x1bf40132,
-	0x00f7f0be,
-	0x083a21f5,
-	0xf500f7f0,
-	0xf107db21,
-	0xf0010007,
-	0x01d00203,
-	0xbd04bd00,
-	0x1f19f014,
-	0x080007f1,
-	0xd00203f0,
 	0x04bd0001,
-/* 0x0564: main */
-	0xf40031f4,
-	0xd7f00028,
-	0x3921f410,
-	0xb1f401f4,
-	0xf54001e4,
-	0xbd00e91b,
-	0x0499f094,
-	0x0f0007f1,
-	0xd00203f0,
-	0x04bd0009,
-	0xc00017f1,
-	0xcf0213f0,
-	0x27f10011,
-	0x23f0c100,
-	0x0022cf02,
-	0xf51f13c8,
-	0xc800890b,
-	0x0bf41f23,
-	0xb920f962,
-	0x94bd0212,
-	0xf10799f0,
+	0x010017f1,
+	0xf502f7f0,
+	0xf507ea21,
+	0xf007fc21,
+	0x21f510f7,
+	0x0e980849,
+	0x010f9800,
+	0x015f21f5,
+	0xf1081495,
+	0xf0c00007,
+	0x04d00103,
+	0xf104bd00,
+	0xf0c10007,
+	0x04d00103,
+	0xb704bd00,
+	0xbb130030,
+	0xf5b6001f,
+	0x0007f102,
+	0x0103f0d3,
+	0xbd000fd0,
+	0x0815b604,
+	0xb60110b6,
+	0x1fb90814,
+	0xe221f502,
+	0x001fbb02,
+	0xf1020398,
+	0xf0200047,
+/* 0x0506: init_gpc */
+	0x4ea05043,
+	0x1fb90804,
+	0xac21f402,
+	0x010c4ea0,
+	0x21f4f4bd,
+	0x044ea0ac,
+	0xac21f401,
+	0x01004ea0,
+	0xf402f7f0,
+	0x4ea0ac21,
+/* 0x052e: init_gpc_wait */
+	0x21f40800,
+	0x1fffc877,
+	0xa0fa0bf4,
+	0xf408044e,
+	0x1fbb7721,
+	0x0040b700,
+	0x0132b680,
+	0xf0be1bf4,
+	0x21f500f7,
+	0xf7f00849,
+	0xea21f500,
+	0x0007f107,
+	0x0203f001,
+	0xbd0001d0,
+	0xf014bd04,
+	0x07f11f19,
+	0x03f00800,
+	0x0001d002,
+/* 0x0576: main */
+	0x28f404bd,
+	0x10d7f000,
+	0xf43921f4,
+	0xe4b1f701,
+	0x1bf54001,
+	0x94bd00e9,
+	0xf10499f0,
 	0xf00f0007,
 	0x09d00203,
-	0xf404bd00,
-	0x31f40132,
-	0x0621f502,
-	0xf094bd0a,
+	0xf104bd00,
+	0xf0c00017,
+	0x11cf0213,
+	0x0027f100,
+	0x0223f0c1,
+	0xc80022cf,
+	0x0bf51f13,
+	0x23c80089,
+	0x620bf41f,
+	0x12b920f9,
+	0xf094bd02,
 	0x07f10799,
-	0x03f01700,
+	0x03f00f00,
 	0x0009d002,
-	0x20fc04bd,
+	0x32f404bd,
+	0x0231f401,
+	0x0a1521f5,
 	0x99f094bd,
-	0x0007f106,
-	0x0203f00f,
-	0xbd0009d0,
-	0x0131f404,
-	0x0a0621f5,
-	0x99f094bd,
-	0x0007f106,
+	0x0007f107,
 	0x0203f017,
 	0xbd0009d0,
-	0x330ef404,
-/* 0x060c: chsw_prev_no_next */
-	0x12b920f9,
-	0x0132f402,
-	0xf50232f4,
-	0xfc0a0621,
-	0x0007f120,
-	0x0203f0c0,
-	0xbd0002d0,
-	0x130ef404,
-/* 0x062c: chsw_no_prev */
-	0xf41f23c8,
-	0x31f40d0b,
-	0x0232f401,
-	0x0a0621f5,
-/* 0x063c: chsw_done */
-	0xf10127f0,
-	0xf0c30007,
-	0x02d00203,
-	0xbd04bd00,
-	0x0499f094,
+	0xbd20fc04,
+	0x0699f094,
+	0x0f0007f1,
+	0xd00203f0,
+	0x04bd0009,
+	0xf50131f4,
+	0xbd0a1521,
+	0x0699f094,
 	0x170007f1,
 	0xd00203f0,
 	0x04bd0009,
-	0xff080ef5,
-/* 0x0660: main_not_ctx_switch */
-	0xf401e4b0,
-	0xf2b90d1b,
-	0x9e21f502,
-	0x460ef409,
-/* 0x0670: main_not_ctx_chan */
-	0xf402e4b0,
-	0x94bd321b,
-	0xf10799f0,
-	0xf00f0007,
+/* 0x061b: chsw_prev_no_next */
+	0xf9330ef4,
+	0x0212b920,
+	0xf40132f4,
+	0x21f50232,
+	0x20fc0a15,
+	0xc00007f1,
+	0xd00203f0,
+	0x04bd0002,
+/* 0x063b: chsw_no_prev */
+	0xc8130ef4,
+	0x0bf41f23,
+	0x0131f40d,
+	0xf50232f4,
+/* 0x064b: chsw_done */
+	0xf00a1521,
+	0x07f10127,
+	0x03f0c300,
+	0x0002d002,
+	0x94bd04bd,
+	0xf10499f0,
+	0xf0170007,
 	0x09d00203,
-	0xf404bd00,
-	0x32f40132,
-	0x0621f502,
-	0xf094bd0a,
+	0xf504bd00,
+/* 0x066f: main_not_ctx_switch */
+	0xb0ff0b0e,
+	0x1bf401e4,
+	0x02f2b90d,
+	0x09ad21f5,
+/* 0x067f: main_not_ctx_chan */
+	0xb0460ef4,
+	0x1bf402e4,
+	0xf094bd32,
 	0x07f10799,
-	0x03f01700,
+	0x03f00f00,
 	0x0009d002,
-	0x0ef404bd,
-/* 0x06a5: main_not_ctx_save */
-	0x10ef9411,
-	0xf501f5f0,
-	0xf5037e21,
-/* 0x06b3: main_done */
-	0xbdfeb50e,
-	0x1f29f024,
-	0x080007f1,
+	0x32f404bd,
+	0x0232f401,
+	0x0a1521f5,
+	0x99f094bd,
+	0x0007f107,
+	0x0203f017,
+	0xbd0009d0,
+	0x110ef404,
+/* 0x06b4: main_not_ctx_save */
+	0xf010ef94,
+	0x21f501f5,
+	0x0ef5038d,
+/* 0x06c2: main_done */
+	0x24bdfeb8,
+	0xf11f29f0,
+	0xf0080007,
+	0x02d00203,
+	0xf504bd00,
+/* 0x06d7: ih */
+	0xf9fea30e,
+	0xfe80f900,
+	0x80f90188,
+	0xa0f990f9,
+	0xd0f9b0f9,
+	0xf0f9e0f9,
+	0xa7f104bd,
+	0xa3f00200,
+	0x00aacf00,
+	0xf404abc4,
+	0xd7f0300b,
+	0x00e7f110,
+	0x00e3f01a,
+	0xf100eecf,
+	0xf01900f7,
+	0xffcf00f3,
+	0x0421f400,
+	0x0400b0b7,
+	0xf101e7f0,
+	0xf01d0007,
+	0x0ed00003,
+/* 0x072b: ih_no_fifo */
+	0xe404bd00,
+	0xf40100ab,
+	0xd7f00d0b,
+	0x01e7f110,
+	0x0421f440,
+/* 0x073c: ih_no_ctxsw */
+	0x0400abe4,
+	0xf16c0bf4,
+	0xf00708e7,
+	0x21f440e3,
+	0x02ffb977,
+	0x040007f1,
 	0xd00203f0,
-	0x04bd0002,
-	0xfea00ef5,
-/* 0x06c8: ih */
-	0x80f900f9,
-	0xf90188fe,
-	0xf990f980,
-	0xf9b0f9a0,
-	0xf9e0f9d0,
-	0xf104bdf0,
-	0xf00200a7,
-	0xaacf00a3,
-	0x04abc400,
-	0xf0300bf4,
-	0xe7f110d7,
-	0xe3f01a00,
-	0x00eecf00,
-	0x1900f7f1,
-	0xcf00f3f0,
-	0x21f400ff,
-	0x00b0b704,
-	0x01e7f004,
-	0x1d0007f1,
-	0xd00003f0,
-	0x04bd000e,
-/* 0x071c: ih_no_fifo */
-	0x0100abe4,
-	0xf00d0bf4,
-	0xe7f110d7,
-	0x21f44001,
-/* 0x072d: ih_no_ctxsw */
-	0x00abe404,
-	0x6c0bf404,
-	0x0708e7f1,
+	0x04bd000f,
+	0x0704e7f1,
 	0xf440e3f0,
-	0xffb96821,
+	0xffb97721,
 	0x0007f102,
-	0x0203f004,
-	0xbd000fd0,
-	0x04e7f104,
-	0x40e3f007,
-	0xb96821f4,
-	0x07f102ff,
-	0x03f00300,
-	0x000fd002,
-	0xfec704bd,
-	0x02ee9450,
-	0x0700f7f1,
-	0xbb40f3f0,
-	0x21f400ef,
-	0x0007f168,
-	0x0203f002,
+	0x0203f003,
 	0xbd000fd0,
-	0x03f7f004,
-	0x037e21f5,
-	0x0100b7f1,
-	0xf102bfb9,
-	0xf00144e7,
-	0x21f440e3,
-/* 0x079d: ih_no_fwmthd */
-	0x04b7f19d,
-	0xffb0bd05,
-	0x0bf4b4ab,
-	0x0007f10f,
-	0x0303f007,
-	0xbd000bd0,
-/* 0x07b5: ih_no_other */
-	0x0007f104,
-	0x0003f001,
-	0xbd000ad0,
-	0xfcf0fc04,
-	0xfcd0fce0,
-	0xfca0fcb0,
-	0xfe80fc90,
-	0x80fc0088,
-	0x32f400fc,
-/* 0x07db: ctx_4170s */
-	0xf001f800,
-	0xffb910f5,
-	0x70e7f102,
-	0x40e3f041,
-	0xf89d21f4,
-/* 0x07ed: ctx_4170w */
-	0x70e7f100,
-	0x40e3f041,
-	0xb96821f4,
-	0xf4f002ff,
-	0xf01bf410,
-/* 0x0802: ctx_redswitch */
-	0xe7f100f8,
-	0xe5f00200,
-	0x20e5f040,
-	0xf110e5f0,
+	0x50fec704,
+	0xf102ee94,
+	0xf00700f7,
+	0xefbb40f3,
+	0x7721f400,
+	0x020007f1,
+	0xd00203f0,
+	0x04bd000f,
+	0xf503f7f0,
+	0xf1038d21,
+	0xb90100b7,
+	0xe7f102bf,
+	0xe3f00144,
+	0xac21f440,
+/* 0x07ac: ih_no_fwmthd */
+	0x0504b7f1,
+	0xabffb0bd,
+	0x0f0bf4b4,
+	0x070007f1,
+	0xd00303f0,
+	0x04bd000b,
+/* 0x07c4: ih_no_other */
+	0x010007f1,
+	0xd00003f0,
+	0x04bd000a,
+	0xe0fcf0fc,
+	0xb0fcd0fc,
+	0x90fca0fc,
+	0x88fe80fc,
+	0xfc80fc00,
+	0x0032f400,
+/* 0x07ea: ctx_4170s */
+	0xf5f001f8,
+	0x02ffb910,
+	0x4170e7f1,
+	0xf440e3f0,
+	0x00f8ac21,
+/* 0x07fc: ctx_4170w */
+	0x4170e7f1,
+	0xf440e3f0,
+	0xffb97721,
+	0x10f4f002,
+	0xf8f01bf4,
+/* 0x0811: ctx_redswitch */
+	0x00e7f100,
+	0x40e5f002,
+	0xf020e5f0,
+	0x07f110e5,
+	0x03f08500,
+	0x000ed001,
+	0xf7f004bd,
+/* 0x082d: ctx_redswitch_delay */
+	0x01f2b608,
+	0xf1fd1bf4,
+	0xf10400e5,
+	0xf10100e5,
 	0xf0850007,
 	0x0ed00103,
-	0xf004bd00,
-/* 0x081e: ctx_redswitch_delay */
-	0xf2b608f7,
-	0xfd1bf401,
-	0x0400e5f1,
-	0x0100e5f1,
-	0x850007f1,
-	0xd00103f0,
-	0x04bd000e,
-/* 0x083a: ctx_86c */
-	0x07f100f8,
-	0x03f01b00,
-	0x000fd002,
-	0xffb904bd,
-	0x14e7f102,
-	0x40e3f08a,
-	0xb99d21f4,
-	0xe7f102ff,
-	0xe3f0a86c,
-	0x9d21f441,
-/* 0x0862: ctx_mem */
-	0x07f100f8,
-	0x03f08400,
-	0x000fd002,
-/* 0x086e: ctx_mem_wait */
-	0xf7f104bd,
-	0xf3f08400,
-	0x00ffcf02,
-	0xf405fffd,
-	0x00f8f31b,
-/* 0x0880: ctx_load */
-	0x99f094bd,
-	0x0007f105,
-	0x0203f00f,
-	0xbd0009d0,
-	0x0ca7f004,
-	0xbdd021f4,
-	0x0007f1f4,
-	0x0203f089,
+	0xf804bd00,
+/* 0x0849: ctx_86c */
+	0x0007f100,
+	0x0203f01b,
 	0xbd000fd0,
-	0x0007f104,
-	0x0203f0c1,
-	0xbd0002d0,
-	0x0007f104,
-	0x0203f083,
-	0xbd0002d0,
-	0x07f7f004,
-	0x086221f5,
-	0xc00007f1,
+	0x02ffb904,
+	0x8a14e7f1,
+	0xf440e3f0,
+	0xffb9ac21,
+	0x6ce7f102,
+	0x41e3f0a8,
+	0xf8ac21f4,
+/* 0x0871: ctx_mem */
+	0x0007f100,
+	0x0203f084,
+	0xbd000fd0,
+/* 0x087d: ctx_mem_wait */
+	0x00f7f104,
+	0x02f3f084,
+	0xfd00ffcf,
+	0x1bf405ff,
+/* 0x088f: ctx_load */
+	0xbd00f8f3,
+	0x0599f094,
+	0x0f0007f1,
+	0xd00203f0,
+	0x04bd0009,
+	0xf40ca7f0,
+	0xf4bddf21,
+	0x890007f1,
+	0xd00203f0,
+	0x04bd000f,
+	0xc10007f1,
 	0xd00203f0,
 	0x04bd0002,
-	0xf0000bfe,
-	0x24b61f2a,
-	0x0220b604,
-	0x99f094bd,
-	0x0007f108,
-	0x0203f00f,
-	0xbd0009d0,
-	0x0007f104,
-	0x0203f081,
-	0xbd0002d0,
-	0x0027f104,
-	0x0023f100,
-	0x0225f080,
-	0x880007f1,
+	0x830007f1,
 	0xd00203f0,
 	0x04bd0002,
-	0xf11017f0,
-	0xf0020027,
-	0x12fa0223,
-	0xbd03f805,
+	0xf507f7f0,
+	0xf1087121,
+	0xf0c00007,
+	0x02d00203,
+	0xfe04bd00,
+	0x2af0000b,
+	0x0424b61f,
+	0xbd0220b6,
 	0x0899f094,
-	0x170007f1,
+	0x0f0007f1,
 	0xd00203f0,
 	0x04bd0009,
-	0xb6810198,
-	0x02981814,
-	0x0825b680,
-	0x800512fd,
-	0x94bd1601,
-	0xf10999f0,
-	0xf00f0007,
-	0x09d00203,
-	0xf104bd00,
-	0xf0810007,
-	0x01d00203,
+	0x810007f1,
+	0xd00203f0,
+	0x04bd0002,
+	0x000027f1,
+	0x800023f1,
+	0xf10225f0,
+	0xf0880007,
+	0x02d00203,
 	0xf004bd00,
-	0x07f10127,
-	0x03f08800,
-	0x0002d002,
-	0x17f104bd,
-	0x13f00100,
-	0x0501fa06,
+	0x27f11017,
+	0x23f00200,
+	0x0512fa02,
 	0x94bd03f8,
-	0xf10999f0,
+	0xf10899f0,
 	0xf0170007,
 	0x09d00203,
+	0x9804bd00,
+	0x14b68101,
+	0x80029818,
+	0xfd0825b6,
+	0x01800512,
+	0xf094bd16,
+	0x07f10999,
+	0x03f00f00,
+	0x0009d002,
+	0x07f104bd,
+	0x03f08100,
+	0x0001d002,
+	0x27f004bd,
+	0x0007f101,
+	0x0203f088,
+	0xbd0002d0,
+	0x0017f104,
+	0x0613f001,
+	0xf80501fa,
+	0xf094bd03,
+	0x07f10999,
+	0x03f01700,
+	0x0009d002,
+	0x94bd04bd,
+	0xf10599f0,
+	0xf0170007,
+	0x09d00203,
+	0xf804bd00,
+/* 0x09ad: ctx_chan */
+	0x8f21f500,
+	0x0ca7f008,
+	0xf0df21f4,
+	0x21f505f7,
+	0x00f80871,
+/* 0x09c0: ctx_mmio_exec */
+	0xf1410398,
+	0xf0810007,
+	0x03d00203,
 	0xbd04bd00,
-	0x0599f094,
-	0x170007f1,
-	0xd00203f0,
-	0x04bd0009,
-/* 0x099e: ctx_chan */
-	0x21f500f8,
-	0xa7f00880,
-	0xd021f40c,
-	0xf505f7f0,
-	0xf8086221,
-/* 0x09b1: ctx_mmio_exec */
-	0x41039800,
+/* 0x09d1: ctx_mmio_loop */
+	0xff34c434,
+	0xf10f1bf4,
+	0xf0020057,
+	0x35fa0653,
+/* 0x09e3: ctx_mmio_pull */
+	0x9803f805,
+	0x4f98804e,
+	0xac21f481,
+	0xb60830b6,
+	0x1bf40112,
+/* 0x09f5: ctx_mmio_done */
+	0x160398df,
 	0x810007f1,
 	0xd00203f0,
 	0x04bd0003,
-/* 0x09c2: ctx_mmio_loop */
-	0x34c434bd,
-	0x0f1bf4ff,
-	0x020057f1,
-	0xfa0653f0,
-	0x03f80535,
-/* 0x09d4: ctx_mmio_pull */
-	0x98804e98,
-	0x21f4814f,
-	0x0830b69d,
-	0xf40112b6,
-/* 0x09e6: ctx_mmio_done */
-	0x0398df1b,
-	0x0007f116,
-	0x0203f081,
-	0xbd0003d0,
-	0x40008004,
-	0x010017f1,
-	0xfa0613f0,
-	0x03f80601,
-/* 0x0a06: ctx_xfer */
-	0xe7f000f8,
-	0x0007f104,
-	0x0303f002,
-	0xbd000ed0,
-/* 0x0a15: ctx_xfer_idle */
-	0x00e7f104,
-	0x03e3f000,
-	0xf100eecf,
-	0xf42000e4,
-	0x11f4f21b,
-	0x0d02f406,
-/* 0x0a2c: ctx_xfer_pre */
-	0xf510f7f0,
-	0xf4083a21,
-/* 0x0a36: ctx_xfer_pre_load */
-	0xf7f01c11,
-	0xdb21f502,
-	0xed21f507,
-	0x0221f507,
-	0xf5f4bd08,
-	0xf507db21,
-/* 0x0a4f: ctx_xfer_exec */
-	0x98088021,
-	0x24bd1601,
-	0x050007f1,
-	0xd00103f0,
-	0x04bd0002,
-	0xf1021fb9,
-	0xf0a500e7,
+	0xf1400080,
+	0xf0010017,
+	0x01fa0613,
+	0xf803f806,
+/* 0x0a15: ctx_xfer */
+	0x04e7f000,
+	0x020007f1,
+	0xd00303f0,
+	0x04bd000e,
+/* 0x0a24: ctx_xfer_idle */
+	0x0000e7f1,
+	0xcf03e3f0,
+	0xe4f100ee,
+	0x1bf42000,
+	0x0611f4f2,
+/* 0x0a3b: ctx_xfer_pre */
+	0xf00d02f4,
+	0x21f510f7,
+	0x11f40849,
+/* 0x0a45: ctx_xfer_pre_load */
+	0x02f7f01c,
+	0x07ea21f5,
+	0x07fc21f5,
+	0x081121f5,
+	0x21f5f4bd,
+	0x21f507ea,
+/* 0x0a5e: ctx_xfer_exec */
+	0x0198088f,
+	0xf124bd16,
+	0xf0050007,
+	0x02d00103,
+	0xb904bd00,
+	0xe7f1021f,
+	0xe3f0a500,
+	0xac21f441,
+	0xf001fcf0,
+	0x24b6022c,
+	0x05f2fd01,
+	0xf102ffb9,
+	0xf0a504e7,
 	0x21f441e3,
-	0x01fcf09d,
-	0xb6022cf0,
-	0xf2fd0124,
-	0x02ffb905,
-	0xa504e7f1,
-	0xf441e3f0,
-	0x21f59d21,
-	0x24bd026a,
-	0x47fc07f1,
-	0xd00203f0,
-	0x04bd0002,
-	0xb6012cf0,
-	0x07f10320,
-	0x03f04afc,
-	0x0002d002,
-	0xacf004bd,
-	0x06a5f001,
-	0x9800b7f0,
-	0x0d98000c,
-	0x00e7f001,
-	0x016f21f5,
-	0xf508a7f0,
-	0xf5011021,
-	0xf4025e21,
-	0xa7f01301,
-	0xd021f40c,
-	0xf505f7f0,
-	0xf4086221,
-/* 0x0ade: ctx_xfer_post */
-	0xf7f02e02,
-	0xdb21f502,
-	0xf5f4bd07,
-	0xf5083a21,
-	0xf5027f21,
-	0xbd07ed21,
-	0xdb21f5f4,
-	0x1011f407,
-	0xfd400198,
-	0x0bf40511,
-	0xb121f507,
-/* 0x0b09: ctx_xfer_no_post_mmio */
-/* 0x0b09: ctx_xfer_done */
-	0x0000f809,
-	0x00000000,
-	0x00000000,
-	0x00000000,
-	0x00000000,
+	0x7921f5ac,
+	0xf124bd02,
+	0xf047fc07,
+	0x02d00203,
+	0xf004bd00,
+	0x20b6012c,
+	0xfc07f103,
+	0x0203f04a,
+	0xbd0002d0,
+	0x01acf004,
+	0xf006a5f0,
+	0x0c9800b7,
+	0x010d9800,
+	0xf500e7f0,
+	0xf0017e21,
+	0x21f508a7,
+	0x21f5011f,
+	0x01f4026d,
+	0x0ca7f013,
+	0xf0df21f4,
+	0x21f505f7,
+	0x02f40871,
+/* 0x0aed: ctx_xfer_post */
+	0x02f7f02e,
+	0x07ea21f5,
+	0x21f5f4bd,
+	0x21f50849,
+	0x21f5028e,
+	0xf4bd07fc,
+	0x07ea21f5,
+	0x981011f4,
+	0x11fd4001,
+	0x070bf405,
+	0x09c021f5,
+/* 0x0b18: ctx_xfer_no_post_mmio */
+/* 0x0b18: ctx_xfer_done */
+	0x000000f8,
 	0x00000000,
 	0x00000000,
 	0x00000000,
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgk110.fuc3.h b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgk110.fuc3.h
index 0a1b8c0..88a0752 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgk110.fuc3.h
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgk110.fuc3.h
@@ -206,14 +206,14 @@ uint32_t gk110_grhub_data[] = {
 };
 
 uint32_t gk110_grhub_code[] = {
-	0x039b0ef5,
+	0x03aa0ef5,
 /* 0x0004: queue_put */
 	0x9800d898,
 	0x86f001d9,
 	0x0489b808,
 	0xf00c1bf4,
 	0x21f502f7,
-	0x00f8037e,
+	0x00f8038d,
 /* 0x001c: queue_put_next */
 	0xb60798c4,
 	0x8dbb0384,
@@ -224,766 +224,766 @@ uint32_t gk110_grhub_code[] = {
 	0xf801d980,
 /* 0x0039: queue_get */
 	0x0131f400,
-	0x9800d898,
-	0x89b801d9,
-	0x210bf404,
-	0xb60789c4,
-	0x9dbb0394,
-	0x0890b600,
-	0x98009e98,
-	0x80b6019f,
-	0x0f84f001,
-	0xf400d880,
-/* 0x0066: queue_get_done */
-	0x00f80132,
-/* 0x0068: nv_rd32 */
+	0x980031f4,
+	0xd99800d8,
+	0x0489b801,
+	0xc42d0bf4,
+	0x94b60789,
+	0x009dbb03,
+	0x980890b6,
+	0x9f98009e,
+	0x0180b601,
+	0x800f84f0,
+	0x32f400d8,
+	0x01d99801,
+	0xf40489b8,
+	0x32f4060b,
+/* 0x0075: queue_get_done */
+/* 0x0077: nv_rd32 */
+	0xb900f800,
+	0xc9f002ec,
+	0x0007f11f,
+	0x0103f0ca,
+	0xbd000cd0,
+/* 0x0089: nv_rd32_wait */
+	0x00c7f104,
+	0x01c3f0ca,
+	0xc800cccf,
+	0x1bf41fcc,
+	0x06a7f0f3,
+	0x011f21f5,
+	0xcb00f7f1,
+	0xcf01f3f0,
+	0x00f800ff,
+/* 0x00ac: nv_wr32 */
+	0xcc0007f1,
+	0xd00103f0,
+	0x04bd000f,
 	0xf002ecb9,
-	0x07f11fc9,
-	0x03f0ca00,
-	0x000cd001,
-/* 0x007a: nv_rd32_wait */
-	0xc7f104bd,
-	0xc3f0ca00,
-	0x00cccf01,
-	0xf41fccc8,
-	0xa7f0f31b,
-	0x1021f506,
-	0x00f7f101,
-	0x01f3f0cb,
-	0xf800ffcf,
-/* 0x009d: nv_wr32 */
-	0x0007f100,
-	0x0103f0cc,
-	0xbd000fd0,
-	0x02ecb904,
-	0xf01fc9f0,
-	0x07f11ec9,
-	0x03f0ca00,
-	0x000cd001,
-/* 0x00be: nv_wr32_wait */
-	0xc7f104bd,
-	0xc3f0ca00,
-	0x00cccf01,
-	0xf41fccc8,
-	0x00f8f31b,
-/* 0x00d0: wait_donez */
-	0x99f094bd,
-	0x0007f100,
-	0x0203f037,
-	0xbd0009d0,
-	0x0007f104,
-	0x0203f006,
-	0xbd000ad0,
-/* 0x00ed: wait_donez_ne */
-	0x0087f104,
-	0x0183f000,
-	0xff0088cf,
-	0x1bf4888a,
-	0xf094bdf3,
-	0x07f10099,
-	0x03f01700,
-	0x0009d002,
-	0x00f804bd,
-/* 0x0110: wait_doneo */
+	0xc9f01fc9,
+	0x0007f11e,
+	0x0103f0ca,
+	0xbd000cd0,
+/* 0x00cd: nv_wr32_wait */
+	0x00c7f104,
+	0x01c3f0ca,
+	0xc800cccf,
+	0x1bf41fcc,
+/* 0x00df: wait_donez */
+	0xbd00f8f3,
+	0x0099f094,
+	0x370007f1,
+	0xd00203f0,
+	0x04bd0009,
+	0x060007f1,
+	0xd00203f0,
+	0x04bd000a,
+/* 0x00fc: wait_donez_ne */
+	0x000087f1,
+	0xcf0183f0,
+	0x8aff0088,
+	0xf31bf488,
 	0x99f094bd,
 	0x0007f100,
-	0x0203f037,
+	0x0203f017,
 	0xbd0009d0,
-	0x0007f104,
-	0x0203f006,
-	0xbd000ad0,
-/* 0x012d: wait_doneo_e */
-	0x0087f104,
-	0x0183f000,
-	0xff0088cf,
-	0x0bf4888a,
-	0xf094bdf3,
-	0x07f10099,
-	0x03f01700,
-	0x0009d002,
-	0x00f804bd,
-/* 0x0150: mmctx_size */
-/* 0x0152: nv_mmctx_size_loop */
-	0xe89894bd,
-	0x1a85b600,
-	0xb60180b6,
-	0x98bb0284,
-	0x04e0b600,
-	0xf404efb8,
-	0x9fb9eb1b,
-/* 0x016f: mmctx_xfer */
-	0xbd00f802,
-	0x0199f094,
+/* 0x011f: wait_doneo */
+	0xbd00f804,
+	0x0099f094,
 	0x370007f1,
 	0xd00203f0,
 	0x04bd0009,
-	0xbbfd94bd,
-	0x120bf405,
-	0xc40007f1,
-	0xd00103f0,
-	0x04bd000b,
-/* 0x0197: mmctx_base_disabled */
-	0xfd0099f0,
-	0x0bf405ee,
-	0x0007f11e,
-	0x0103f0c6,
-	0xbd000ed0,
-	0x0007f104,
-	0x0103f0c7,
-	0xbd000fd0,
-	0x0199f004,
-/* 0x01b8: mmctx_multi_disabled */
-	0xb600abc8,
-	0xb9f010b4,
-	0x01aec80c,
-	0xfd11e4b6,
-	0x07f105be,
-	0x03f0c500,
-	0x000bd001,
-/* 0x01d6: mmctx_exec_loop */
-/* 0x01d6: mmctx_wait_free */
-	0xe7f104bd,
-	0xe3f0c500,
-	0x00eecf01,
-	0xf41fe4f0,
-	0xce98f30b,
-	0x05e9fd00,
-	0xc80007f1,
+	0x060007f1,
+	0xd00203f0,
+	0x04bd000a,
+/* 0x013c: wait_doneo_e */
+	0x000087f1,
+	0xcf0183f0,
+	0x8aff0088,
+	0xf30bf488,
+	0x99f094bd,
+	0x0007f100,
+	0x0203f017,
+	0xbd0009d0,
+/* 0x015f: mmctx_size */
+	0xbd00f804,
+/* 0x0161: nv_mmctx_size_loop */
+	0x00e89894,
+	0xb61a85b6,
+	0x84b60180,
+	0x0098bb02,
+	0xb804e0b6,
+	0x1bf404ef,
+	0x029fb9eb,
+/* 0x017e: mmctx_xfer */
+	0x94bd00f8,
+	0xf10199f0,
+	0xf0370007,
+	0x09d00203,
+	0xbd04bd00,
+	0x05bbfd94,
+	0xf1120bf4,
+	0xf0c40007,
+	0x0bd00103,
+	0xf004bd00,
+/* 0x01a6: mmctx_base_disabled */
+	0xeefd0099,
+	0x1e0bf405,
+	0xc60007f1,
 	0xd00103f0,
 	0x04bd000e,
-	0xb804c0b6,
-	0x1bf404cd,
-	0x02abc8d8,
-/* 0x0207: mmctx_fini_wait */
-	0xf11f1bf4,
-	0xf0c500b7,
-	0xbbcf01b3,
-	0x1fb4f000,
-	0xf410b4b0,
-	0xa7f0f01b,
-	0xd021f405,
-/* 0x0223: mmctx_stop */
-	0xc82b0ef4,
+	0xc70007f1,
+	0xd00103f0,
+	0x04bd000f,
+/* 0x01c7: mmctx_multi_disabled */
+	0xc80199f0,
 	0xb4b600ab,
 	0x0cb9f010,
-	0xf112b9f0,
-	0xf0c50007,
-	0x0bd00103,
-/* 0x023b: mmctx_stop_wait */
-	0xf104bd00,
-	0xf0c500b7,
-	0xbbcf01b3,
-	0x12bbc800,
-/* 0x024b: mmctx_done */
-	0xbdf31bf4,
-	0x0199f094,
-	0x170007f1,
+	0xb601aec8,
+	0xbefd11e4,
+	0x0007f105,
+	0x0103f0c5,
+	0xbd000bd0,
+/* 0x01e5: mmctx_exec_loop */
+/* 0x01e5: mmctx_wait_free */
+	0x00e7f104,
+	0x01e3f0c5,
+	0xf000eecf,
+	0x0bf41fe4,
+	0x00ce98f3,
+	0xf105e9fd,
+	0xf0c80007,
+	0x0ed00103,
+	0xb604bd00,
+	0xcdb804c0,
+	0xd81bf404,
+	0xf402abc8,
+/* 0x0216: mmctx_fini_wait */
+	0xb7f11f1b,
+	0xb3f0c500,
+	0x00bbcf01,
+	0xb01fb4f0,
+	0x1bf410b4,
+	0x05a7f0f0,
+	0xf4df21f4,
+/* 0x0232: mmctx_stop */
+	0xabc82b0e,
+	0x10b4b600,
+	0xf00cb9f0,
+	0x07f112b9,
+	0x03f0c500,
+	0x000bd001,
+/* 0x024a: mmctx_stop_wait */
+	0xb7f104bd,
+	0xb3f0c500,
+	0x00bbcf01,
+	0xf412bbc8,
+/* 0x025a: mmctx_done */
+	0x94bdf31b,
+	0xf10199f0,
+	0xf0170007,
+	0x09d00203,
+	0xf804bd00,
+/* 0x026d: strand_wait */
+	0xf0a0f900,
+	0x21f402a7,
+	0xf8a0fcdf,
+/* 0x0279: strand_pre */
+	0x0c97f000,
+	0x4afc07f1,
 	0xd00203f0,
 	0x04bd0009,
-/* 0x025e: strand_wait */
-	0xa0f900f8,
-	0xf402a7f0,
-	0xa0fcd021,
-/* 0x026a: strand_pre */
+	0x026d21f5,
+/* 0x028e: strand_post */
 	0x97f000f8,
-	0xfc07f10c,
+	0xfc07f10d,
 	0x0203f04a,
 	0xbd0009d0,
-	0x5e21f504,
-/* 0x027f: strand_post */
+	0x6d21f504,
+/* 0x02a3: strand_set */
 	0xf000f802,
-	0x07f10d97,
-	0x03f04afc,
-	0x0009d002,
-	0x21f504bd,
-	0x00f8025e,
-/* 0x0294: strand_set */
-	0xf10fc7f0,
-	0xf04ffc07,
-	0x0cd00203,
-	0xf004bd00,
-	0x07f10bc7,
-	0x03f04afc,
-	0x000cd002,
-	0x07f104bd,
+	0x07f10fc7,
 	0x03f04ffc,
-	0x000ed002,
+	0x000cd002,
 	0xc7f004bd,
-	0xfc07f10a,
+	0xfc07f10b,
 	0x0203f04a,
 	0xbd000cd0,
-	0x5e21f504,
-/* 0x02d3: strand_ctx_init */
-	0xbd00f802,
-	0x0399f094,
-	0x370007f1,
-	0xd00203f0,
-	0x04bd0009,
-	0x026a21f5,
-	0xf503e7f0,
-	0xbd029421,
-	0xfc07f1c4,
-	0x0203f047,
-	0xbd000cd0,
-	0x01c7f004,
+	0xfc07f104,
+	0x0203f04f,
+	0xbd000ed0,
+	0x0ac7f004,
 	0x4afc07f1,
 	0xd00203f0,
 	0x04bd000c,
-	0x025e21f5,
-	0xf1010c92,
-	0xf046fc07,
+	0x026d21f5,
+/* 0x02e2: strand_ctx_init */
+	0x94bd00f8,
+	0xf10399f0,
+	0xf0370007,
+	0x09d00203,
+	0xf504bd00,
+	0xf0027921,
+	0x21f503e7,
+	0xc4bd02a3,
+	0x47fc07f1,
+	0xd00203f0,
+	0x04bd000c,
+	0xf101c7f0,
+	0xf04afc07,
 	0x0cd00203,
-	0xf004bd00,
-	0x07f102c7,
-	0x03f04afc,
+	0xf504bd00,
+	0x92026d21,
+	0x07f1010c,
+	0x03f046fc,
 	0x000cd002,
-	0x21f504bd,
-	0x21f5025e,
-	0x87f1027f,
-	0x83f04200,
-	0x0097f102,
-	0x0293f020,
-	0x950099cf,
-/* 0x034a: ctx_init_strand_loop */
-	0x8ed008fe,
-	0x408ed000,
-	0xb6808acf,
-	0xa0b606a5,
-	0x00eabb01,
-	0xb60480b6,
-	0x1bf40192,
-	0x08e4b6e8,
-	0xbdf2efbc,
-	0x0399f094,
-	0x170007f1,
-	0xd00203f0,
-	0x04bd0009,
-/* 0x037e: error */
-	0x07f100f8,
-	0x03f00500,
-	0x000fd002,
-	0xf7f004bd,
-	0x0007f101,
-	0x0303f007,
+	0xc7f004bd,
+	0xfc07f102,
+	0x0203f04a,
+	0xbd000cd0,
+	0x6d21f504,
+	0x8e21f502,
+	0x0087f102,
+	0x0283f042,
+	0x200097f1,
+	0xcf0293f0,
+	0xfe950099,
+/* 0x0359: ctx_init_strand_loop */
+	0x008ed008,
+	0xcf408ed0,
+	0xa5b6808a,
+	0x01a0b606,
+	0xb600eabb,
+	0x92b60480,
+	0xe81bf401,
+	0xbc08e4b6,
+	0x94bdf2ef,
+	0xf10399f0,
+	0xf0170007,
+	0x09d00203,
+	0xf804bd00,
+/* 0x038d: error */
+	0x0007f100,
+	0x0203f005,
 	0xbd000fd0,
-/* 0x039b: init */
-	0xbd00f804,
-	0x0007fe04,
-	0x420017f1,
-	0xcf0013f0,
-	0x11e70011,
-	0x14b60109,
-	0x0014fe08,
-	0xf10227f0,
-	0xf0120007,
-	0x02d00003,
-	0xf104bd00,
-	0xfe06c817,
-	0x24bd0010,
+	0x01f7f004,
 	0x070007f1,
+	0xd00303f0,
+	0x04bd000f,
+/* 0x03aa: init */
+	0x04bd00f8,
+	0xf10007fe,
+	0xf0420017,
+	0x11cf0013,
+	0x0911e700,
+	0x0814b601,
+	0xf00014fe,
+	0x07f10227,
+	0x03f01200,
+	0x0002d000,
+	0x32f404bd,
+	0xd717f100,
+	0x0010fe06,
+	0x07f124bd,
+	0x03f00700,
+	0x0002d000,
+	0x27f104bd,
+	0x07f12003,
+	0x03f00100,
+	0x0002d001,
+	0x27f104bd,
+	0x07f12004,
+	0x03f00104,
+	0x0002d001,
+	0x27f104bd,
+	0x07f1200b,
+	0x03f00108,
+	0x0002d001,
+	0x27f104bd,
+	0x07f1200c,
+	0x03f0011c,
+	0x0002d001,
+	0x039204bd,
+	0x0007f101,
+	0x0303f009,
+	0xbd0003d0,
+	0x0427f104,
+	0x0023f087,
+	0x040007f1,
 	0xd00003f0,
 	0x04bd0002,
-	0x200327f1,
-	0x010007f1,
-	0xd00103f0,
-	0x04bd0002,
-	0x200427f1,
-	0x010407f1,
-	0xd00103f0,
-	0x04bd0002,
-	0x200b27f1,
-	0x010807f1,
+	0xf10427f0,
+	0xf0030007,
+	0x02d00003,
+	0xf404bd00,
+	0xe7f11031,
+	0xe3f09604,
+	0x7721f440,
+	0xc702feb9,
+	0x018090f1,
+	0x1ff4f003,
+	0xf0020f80,
+	0x1fbb0117,
+	0x0112b604,
+	0x030007f1,
 	0xd00103f0,
-	0x04bd0002,
-	0x200c27f1,
-	0x011c07f1,
+	0x04bd0001,
+	0x040007f1,
 	0xd00103f0,
-	0x04bd0002,
-	0xf1010392,
-	0xf0090007,
-	0x03d00303,
-	0xf104bd00,
-	0xf0870427,
-	0x07f10023,
-	0x03f00400,
-	0x0002d000,
-	0x27f004bd,
-	0x0007f104,
-	0x0003f003,
-	0xbd0002d0,
-	0x1031f404,
-	0x9604e7f1,
-	0xf440e3f0,
-	0xfeb96821,
-	0x90f1c702,
-	0xf0030180,
-	0x0f801ff4,
-	0x0117f002,
-	0xb6041fbb,
-	0x07f10112,
-	0x03f00300,
-	0x0001d001,
-	0x07f104bd,
-	0x03f00400,
-	0x0001d001,
-	0x17f104bd,
-	0xf7f00100,
-	0xdb21f502,
-	0xed21f507,
-	0x10f7f007,
-	0x083a21f5,
-	0x98000e98,
-	0x21f5010f,
-	0x14950150,
-	0x0007f108,
-	0x0103f0c0,
-	0xbd0004d0,
-	0x0007f104,
-	0x0103f0c1,
-	0xbd0004d0,
-	0x0030b704,
-	0x001fbb13,
-	0xf102f5b6,
-	0xf0d30007,
-	0x0fd00103,
-	0xb604bd00,
-	0x10b60815,
-	0x0814b601,
-	0xf5021fb9,
-	0xbb02d321,
-	0x0398001f,
-	0x0047f102,
-	0x5043f020,
-/* 0x04f4: init_gpc */
-	0x08044ea0,
-	0xf4021fb9,
-	0x4ea09d21,
-	0xf4bd010c,
-	0xa09d21f4,
-	0xf401044e,
-	0x4ea09d21,
-	0xf7f00100,
-	0x9d21f402,
-	0x08004ea0,
-/* 0x051c: init_gpc_wait */
-	0xc86821f4,
-	0x0bf41fff,
-	0x044ea0fa,
-	0x6821f408,
-	0xb7001fbb,
-	0xb6800040,
-	0x1bf40132,
-	0x00f7f0be,
-	0x083a21f5,
-	0xf500f7f0,
-	0xf107db21,
-	0xf0010007,
-	0x01d00203,
-	0xbd04bd00,
-	0x1f19f014,
-	0x300007f1,
-	0xd00203f0,
 	0x04bd0001,
-/* 0x0564: main */
-	0xf40031f4,
-	0xd7f00028,
-	0x3921f410,
-	0xb1f401f4,
-	0xf54001e4,
-	0xbd00e91b,
-	0x0499f094,
-	0x370007f1,
-	0xd00203f0,
-	0x04bd0009,
-	0xc00017f1,
-	0xcf0213f0,
-	0x27f10011,
-	0x23f0c100,
-	0x0022cf02,
-	0xf51f13c8,
-	0xc800890b,
-	0x0bf41f23,
-	0xb920f962,
-	0x94bd0212,
-	0xf10799f0,
+	0x010017f1,
+	0xf502f7f0,
+	0xf507ea21,
+	0xf007fc21,
+	0x21f510f7,
+	0x0e980849,
+	0x010f9800,
+	0x015f21f5,
+	0xf1081495,
+	0xf0c00007,
+	0x04d00103,
+	0xf104bd00,
+	0xf0c10007,
+	0x04d00103,
+	0xb704bd00,
+	0xbb130030,
+	0xf5b6001f,
+	0x0007f102,
+	0x0103f0d3,
+	0xbd000fd0,
+	0x0815b604,
+	0xb60110b6,
+	0x1fb90814,
+	0xe221f502,
+	0x001fbb02,
+	0xf1020398,
+	0xf0200047,
+/* 0x0506: init_gpc */
+	0x4ea05043,
+	0x1fb90804,
+	0xac21f402,
+	0x010c4ea0,
+	0x21f4f4bd,
+	0x044ea0ac,
+	0xac21f401,
+	0x01004ea0,
+	0xf402f7f0,
+	0x4ea0ac21,
+/* 0x052e: init_gpc_wait */
+	0x21f40800,
+	0x1fffc877,
+	0xa0fa0bf4,
+	0xf408044e,
+	0x1fbb7721,
+	0x0040b700,
+	0x0132b680,
+	0xf0be1bf4,
+	0x21f500f7,
+	0xf7f00849,
+	0xea21f500,
+	0x0007f107,
+	0x0203f001,
+	0xbd0001d0,
+	0xf014bd04,
+	0x07f11f19,
+	0x03f03000,
+	0x0001d002,
+/* 0x0576: main */
+	0x28f404bd,
+	0x10d7f000,
+	0xf43921f4,
+	0xe4b1f701,
+	0x1bf54001,
+	0x94bd00e9,
+	0xf10499f0,
 	0xf0370007,
 	0x09d00203,
-	0xf404bd00,
-	0x31f40132,
-	0x0621f502,
-	0xf094bd0a,
+	0xf104bd00,
+	0xf0c00017,
+	0x11cf0213,
+	0x0027f100,
+	0x0223f0c1,
+	0xc80022cf,
+	0x0bf51f13,
+	0x23c80089,
+	0x620bf41f,
+	0x12b920f9,
+	0xf094bd02,
 	0x07f10799,
-	0x03f01700,
+	0x03f03700,
 	0x0009d002,
-	0x20fc04bd,
+	0x32f404bd,
+	0x0231f401,
+	0x0a1521f5,
 	0x99f094bd,
-	0x0007f106,
-	0x0203f037,
-	0xbd0009d0,
-	0x0131f404,
-	0x0a0621f5,
-	0x99f094bd,
-	0x0007f106,
+	0x0007f107,
 	0x0203f017,
 	0xbd0009d0,
-	0x330ef404,
-/* 0x060c: chsw_prev_no_next */
-	0x12b920f9,
-	0x0132f402,
-	0xf50232f4,
-	0xfc0a0621,
-	0x0007f120,
-	0x0203f0c0,
-	0xbd0002d0,
-	0x130ef404,
-/* 0x062c: chsw_no_prev */
-	0xf41f23c8,
-	0x31f40d0b,
-	0x0232f401,
-	0x0a0621f5,
-/* 0x063c: chsw_done */
-	0xf10127f0,
-	0xf0c30007,
-	0x02d00203,
-	0xbd04bd00,
-	0x0499f094,
+	0xbd20fc04,
+	0x0699f094,
+	0x370007f1,
+	0xd00203f0,
+	0x04bd0009,
+	0xf50131f4,
+	0xbd0a1521,
+	0x0699f094,
 	0x170007f1,
 	0xd00203f0,
 	0x04bd0009,
-	0xff080ef5,
-/* 0x0660: main_not_ctx_switch */
-	0xf401e4b0,
-	0xf2b90d1b,
-	0x9e21f502,
-	0x460ef409,
-/* 0x0670: main_not_ctx_chan */
-	0xf402e4b0,
-	0x94bd321b,
-	0xf10799f0,
-	0xf0370007,
+/* 0x061b: chsw_prev_no_next */
+	0xf9330ef4,
+	0x0212b920,
+	0xf40132f4,
+	0x21f50232,
+	0x20fc0a15,
+	0xc00007f1,
+	0xd00203f0,
+	0x04bd0002,
+/* 0x063b: chsw_no_prev */
+	0xc8130ef4,
+	0x0bf41f23,
+	0x0131f40d,
+	0xf50232f4,
+/* 0x064b: chsw_done */
+	0xf00a1521,
+	0x07f10127,
+	0x03f0c300,
+	0x0002d002,
+	0x94bd04bd,
+	0xf10499f0,
+	0xf0170007,
 	0x09d00203,
-	0xf404bd00,
-	0x32f40132,
-	0x0621f502,
-	0xf094bd0a,
+	0xf504bd00,
+/* 0x066f: main_not_ctx_switch */
+	0xb0ff0b0e,
+	0x1bf401e4,
+	0x02f2b90d,
+	0x09ad21f5,
+/* 0x067f: main_not_ctx_chan */
+	0xb0460ef4,
+	0x1bf402e4,
+	0xf094bd32,
 	0x07f10799,
-	0x03f01700,
+	0x03f03700,
 	0x0009d002,
-	0x0ef404bd,
-/* 0x06a5: main_not_ctx_save */
-	0x10ef9411,
-	0xf501f5f0,
-	0xf5037e21,
-/* 0x06b3: main_done */
-	0xbdfeb50e,
-	0x1f29f024,
-	0x300007f1,
+	0x32f404bd,
+	0x0232f401,
+	0x0a1521f5,
+	0x99f094bd,
+	0x0007f107,
+	0x0203f017,
+	0xbd0009d0,
+	0x110ef404,
+/* 0x06b4: main_not_ctx_save */
+	0xf010ef94,
+	0x21f501f5,
+	0x0ef5038d,
+/* 0x06c2: main_done */
+	0x24bdfeb8,
+	0xf11f29f0,
+	0xf0300007,
+	0x02d00203,
+	0xf504bd00,
+/* 0x06d7: ih */
+	0xf9fea30e,
+	0xfe80f900,
+	0x80f90188,
+	0xa0f990f9,
+	0xd0f9b0f9,
+	0xf0f9e0f9,
+	0xa7f104bd,
+	0xa3f00200,
+	0x00aacf00,
+	0xf404abc4,
+	0xd7f0300b,
+	0x00e7f110,
+	0x00e3f01a,
+	0xf100eecf,
+	0xf01900f7,
+	0xffcf00f3,
+	0x0421f400,
+	0x0400b0b7,
+	0xf101e7f0,
+	0xf01d0007,
+	0x0ed00003,
+/* 0x072b: ih_no_fifo */
+	0xe404bd00,
+	0xf40100ab,
+	0xd7f00d0b,
+	0x01e7f110,
+	0x0421f440,
+/* 0x073c: ih_no_ctxsw */
+	0x0400abe4,
+	0xf16c0bf4,
+	0xf00708e7,
+	0x21f440e3,
+	0x02ffb977,
+	0x040007f1,
 	0xd00203f0,
-	0x04bd0002,
-	0xfea00ef5,
-/* 0x06c8: ih */
-	0x80f900f9,
-	0xf90188fe,
-	0xf990f980,
-	0xf9b0f9a0,
-	0xf9e0f9d0,
-	0xf104bdf0,
-	0xf00200a7,
-	0xaacf00a3,
-	0x04abc400,
-	0xf0300bf4,
-	0xe7f110d7,
-	0xe3f01a00,
-	0x00eecf00,
-	0x1900f7f1,
-	0xcf00f3f0,
-	0x21f400ff,
-	0x00b0b704,
-	0x01e7f004,
-	0x1d0007f1,
-	0xd00003f0,
-	0x04bd000e,
-/* 0x071c: ih_no_fifo */
-	0x0100abe4,
-	0xf00d0bf4,
-	0xe7f110d7,
-	0x21f44001,
-/* 0x072d: ih_no_ctxsw */
-	0x00abe404,
-	0x6c0bf404,
-	0x0708e7f1,
+	0x04bd000f,
+	0x0704e7f1,
 	0xf440e3f0,
-	0xffb96821,
+	0xffb97721,
 	0x0007f102,
-	0x0203f004,
-	0xbd000fd0,
-	0x04e7f104,
-	0x40e3f007,
-	0xb96821f4,
-	0x07f102ff,
-	0x03f00300,
-	0x000fd002,
-	0xfec704bd,
-	0x02ee9450,
-	0x0700f7f1,
-	0xbb40f3f0,
-	0x21f400ef,
-	0x0007f168,
-	0x0203f002,
+	0x0203f003,
 	0xbd000fd0,
-	0x03f7f004,
-	0x037e21f5,
-	0x0100b7f1,
-	0xf102bfb9,
-	0xf00144e7,
-	0x21f440e3,
-/* 0x079d: ih_no_fwmthd */
-	0x04b7f19d,
-	0xffb0bd05,
-	0x0bf4b4ab,
-	0x0007f10f,
-	0x0303f007,
-	0xbd000bd0,
-/* 0x07b5: ih_no_other */
-	0x0007f104,
-	0x0003f001,
-	0xbd000ad0,
-	0xfcf0fc04,
-	0xfcd0fce0,
-	0xfca0fcb0,
-	0xfe80fc90,
-	0x80fc0088,
-	0x32f400fc,
-/* 0x07db: ctx_4170s */
-	0xf001f800,
-	0xffb910f5,
-	0x70e7f102,
-	0x40e3f041,
-	0xf89d21f4,
-/* 0x07ed: ctx_4170w */
-	0x70e7f100,
-	0x40e3f041,
-	0xb96821f4,
-	0xf4f002ff,
-	0xf01bf410,
-/* 0x0802: ctx_redswitch */
-	0xe7f100f8,
-	0xe5f00200,
-	0x20e5f040,
-	0xf110e5f0,
+	0x50fec704,
+	0xf102ee94,
+	0xf00700f7,
+	0xefbb40f3,
+	0x7721f400,
+	0x020007f1,
+	0xd00203f0,
+	0x04bd000f,
+	0xf503f7f0,
+	0xf1038d21,
+	0xb90100b7,
+	0xe7f102bf,
+	0xe3f00144,
+	0xac21f440,
+/* 0x07ac: ih_no_fwmthd */
+	0x0504b7f1,
+	0xabffb0bd,
+	0x0f0bf4b4,
+	0x070007f1,
+	0xd00303f0,
+	0x04bd000b,
+/* 0x07c4: ih_no_other */
+	0x010007f1,
+	0xd00003f0,
+	0x04bd000a,
+	0xe0fcf0fc,
+	0xb0fcd0fc,
+	0x90fca0fc,
+	0x88fe80fc,
+	0xfc80fc00,
+	0x0032f400,
+/* 0x07ea: ctx_4170s */
+	0xf5f001f8,
+	0x02ffb910,
+	0x4170e7f1,
+	0xf440e3f0,
+	0x00f8ac21,
+/* 0x07fc: ctx_4170w */
+	0x4170e7f1,
+	0xf440e3f0,
+	0xffb97721,
+	0x10f4f002,
+	0xf8f01bf4,
+/* 0x0811: ctx_redswitch */
+	0x00e7f100,
+	0x40e5f002,
+	0xf020e5f0,
+	0x07f110e5,
+	0x03f08500,
+	0x000ed001,
+	0xf7f004bd,
+/* 0x082d: ctx_redswitch_delay */
+	0x01f2b608,
+	0xf1fd1bf4,
+	0xf10400e5,
+	0xf10100e5,
 	0xf0850007,
 	0x0ed00103,
-	0xf004bd00,
-/* 0x081e: ctx_redswitch_delay */
-	0xf2b608f7,
-	0xfd1bf401,
-	0x0400e5f1,
-	0x0100e5f1,
-	0x850007f1,
-	0xd00103f0,
-	0x04bd000e,
-/* 0x083a: ctx_86c */
-	0x07f100f8,
-	0x03f02300,
-	0x000fd002,
-	0xffb904bd,
-	0x14e7f102,
-	0x40e3f08a,
-	0xb99d21f4,
-	0xe7f102ff,
-	0xe3f0a88c,
-	0x9d21f441,
-/* 0x0862: ctx_mem */
-	0x07f100f8,
-	0x03f08400,
-	0x000fd002,
-/* 0x086e: ctx_mem_wait */
-	0xf7f104bd,
-	0xf3f08400,
-	0x00ffcf02,
-	0xf405fffd,
-	0x00f8f31b,
-/* 0x0880: ctx_load */
-	0x99f094bd,
-	0x0007f105,
-	0x0203f037,
-	0xbd0009d0,
-	0x0ca7f004,
-	0xbdd021f4,
-	0x0007f1f4,
-	0x0203f089,
+	0xf804bd00,
+/* 0x0849: ctx_86c */
+	0x0007f100,
+	0x0203f023,
 	0xbd000fd0,
-	0x0007f104,
-	0x0203f0c1,
-	0xbd0002d0,
-	0x0007f104,
-	0x0203f083,
-	0xbd0002d0,
-	0x07f7f004,
-	0x086221f5,
-	0xc00007f1,
+	0x02ffb904,
+	0x8a14e7f1,
+	0xf440e3f0,
+	0xffb9ac21,
+	0x8ce7f102,
+	0x41e3f0a8,
+	0xf8ac21f4,
+/* 0x0871: ctx_mem */
+	0x0007f100,
+	0x0203f084,
+	0xbd000fd0,
+/* 0x087d: ctx_mem_wait */
+	0x00f7f104,
+	0x02f3f084,
+	0xfd00ffcf,
+	0x1bf405ff,
+/* 0x088f: ctx_load */
+	0xbd00f8f3,
+	0x0599f094,
+	0x370007f1,
+	0xd00203f0,
+	0x04bd0009,
+	0xf40ca7f0,
+	0xf4bddf21,
+	0x890007f1,
+	0xd00203f0,
+	0x04bd000f,
+	0xc10007f1,
 	0xd00203f0,
 	0x04bd0002,
-	0xf0000bfe,
-	0x24b61f2a,
-	0x0220b604,
-	0x99f094bd,
-	0x0007f108,
-	0x0203f037,
-	0xbd0009d0,
-	0x0007f104,
-	0x0203f081,
-	0xbd0002d0,
-	0x0027f104,
-	0x0023f100,
-	0x0225f080,
-	0x880007f1,
+	0x830007f1,
 	0xd00203f0,
 	0x04bd0002,
-	0xf11017f0,
-	0xf0020027,
-	0x12fa0223,
-	0xbd03f805,
+	0xf507f7f0,
+	0xf1087121,
+	0xf0c00007,
+	0x02d00203,
+	0xfe04bd00,
+	0x2af0000b,
+	0x0424b61f,
+	0xbd0220b6,
 	0x0899f094,
-	0x170007f1,
+	0x370007f1,
 	0xd00203f0,
 	0x04bd0009,
-	0xb6810198,
-	0x02981814,
-	0x0825b680,
-	0x800512fd,
-	0x94bd1601,
-	0xf10999f0,
-	0xf0370007,
-	0x09d00203,
-	0xf104bd00,
-	0xf0810007,
-	0x01d00203,
+	0x810007f1,
+	0xd00203f0,
+	0x04bd0002,
+	0x000027f1,
+	0x800023f1,
+	0xf10225f0,
+	0xf0880007,
+	0x02d00203,
 	0xf004bd00,
-	0x07f10127,
-	0x03f08800,
-	0x0002d002,
-	0x17f104bd,
-	0x13f00100,
-	0x0501fa06,
+	0x27f11017,
+	0x23f00200,
+	0x0512fa02,
 	0x94bd03f8,
-	0xf10999f0,
+	0xf10899f0,
 	0xf0170007,
 	0x09d00203,
+	0x9804bd00,
+	0x14b68101,
+	0x80029818,
+	0xfd0825b6,
+	0x01800512,
+	0xf094bd16,
+	0x07f10999,
+	0x03f03700,
+	0x0009d002,
+	0x07f104bd,
+	0x03f08100,
+	0x0001d002,
+	0x27f004bd,
+	0x0007f101,
+	0x0203f088,
+	0xbd0002d0,
+	0x0017f104,
+	0x0613f001,
+	0xf80501fa,
+	0xf094bd03,
+	0x07f10999,
+	0x03f01700,
+	0x0009d002,
+	0x94bd04bd,
+	0xf10599f0,
+	0xf0170007,
+	0x09d00203,
+	0xf804bd00,
+/* 0x09ad: ctx_chan */
+	0x8f21f500,
+	0x0ca7f008,
+	0xf0df21f4,
+	0x21f505f7,
+	0x00f80871,
+/* 0x09c0: ctx_mmio_exec */
+	0xf1410398,
+	0xf0810007,
+	0x03d00203,
 	0xbd04bd00,
-	0x0599f094,
-	0x170007f1,
-	0xd00203f0,
-	0x04bd0009,
-/* 0x099e: ctx_chan */
-	0x21f500f8,
-	0xa7f00880,
-	0xd021f40c,
-	0xf505f7f0,
-	0xf8086221,
-/* 0x09b1: ctx_mmio_exec */
-	0x41039800,
+/* 0x09d1: ctx_mmio_loop */
+	0xff34c434,
+	0xf10f1bf4,
+	0xf0020057,
+	0x35fa0653,
+/* 0x09e3: ctx_mmio_pull */
+	0x9803f805,
+	0x4f98804e,
+	0xac21f481,
+	0xb60830b6,
+	0x1bf40112,
+/* 0x09f5: ctx_mmio_done */
+	0x160398df,
 	0x810007f1,
 	0xd00203f0,
 	0x04bd0003,
-/* 0x09c2: ctx_mmio_loop */
-	0x34c434bd,
-	0x0f1bf4ff,
-	0x020057f1,
-	0xfa0653f0,
-	0x03f80535,
-/* 0x09d4: ctx_mmio_pull */
-	0x98804e98,
-	0x21f4814f,
-	0x0830b69d,
-	0xf40112b6,
-/* 0x09e6: ctx_mmio_done */
-	0x0398df1b,
-	0x0007f116,
-	0x0203f081,
-	0xbd0003d0,
-	0x40008004,
-	0x010017f1,
-	0xfa0613f0,
-	0x03f80601,
-/* 0x0a06: ctx_xfer */
-	0xe7f000f8,
-	0x0007f104,
-	0x0303f002,
-	0xbd000ed0,
-/* 0x0a15: ctx_xfer_idle */
-	0x00e7f104,
-	0x03e3f000,
-	0xf100eecf,
-	0xf42000e4,
-	0x11f4f21b,
-	0x0d02f406,
-/* 0x0a2c: ctx_xfer_pre */
-	0xf510f7f0,
-	0xf4083a21,
-/* 0x0a36: ctx_xfer_pre_load */
-	0xf7f01c11,
-	0xdb21f502,
-	0xed21f507,
-	0x0221f507,
-	0xf5f4bd08,
-	0xf507db21,
-/* 0x0a4f: ctx_xfer_exec */
-	0x98088021,
-	0x24bd1601,
-	0x050007f1,
-	0xd00103f0,
-	0x04bd0002,
-	0xf1021fb9,
-	0xf0a500e7,
+	0xf1400080,
+	0xf0010017,
+	0x01fa0613,
+	0xf803f806,
+/* 0x0a15: ctx_xfer */
+	0x04e7f000,
+	0x020007f1,
+	0xd00303f0,
+	0x04bd000e,
+/* 0x0a24: ctx_xfer_idle */
+	0x0000e7f1,
+	0xcf03e3f0,
+	0xe4f100ee,
+	0x1bf42000,
+	0x0611f4f2,
+/* 0x0a3b: ctx_xfer_pre */
+	0xf00d02f4,
+	0x21f510f7,
+	0x11f40849,
+/* 0x0a45: ctx_xfer_pre_load */
+	0x02f7f01c,
+	0x07ea21f5,
+	0x07fc21f5,
+	0x081121f5,
+	0x21f5f4bd,
+	0x21f507ea,
+/* 0x0a5e: ctx_xfer_exec */
+	0x0198088f,
+	0xf124bd16,
+	0xf0050007,
+	0x02d00103,
+	0xb904bd00,
+	0xe7f1021f,
+	0xe3f0a500,
+	0xac21f441,
+	0xf001fcf0,
+	0x24b6022c,
+	0x05f2fd01,
+	0xf102ffb9,
+	0xf0a504e7,
 	0x21f441e3,
-	0x01fcf09d,
-	0xb6022cf0,
-	0xf2fd0124,
-	0x02ffb905,
-	0xa504e7f1,
-	0xf441e3f0,
-	0x21f59d21,
-	0x24bd026a,
-	0x47fc07f1,
-	0xd00203f0,
-	0x04bd0002,
-	0xb6012cf0,
-	0x07f10320,
-	0x03f04afc,
-	0x0002d002,
-	0xacf004bd,
-	0x06a5f001,
-	0x9800b7f0,
-	0x0d98000c,
-	0x00e7f001,
-	0x016f21f5,
-	0xf508a7f0,
-	0xf5011021,
-	0xf4025e21,
-	0xa7f01301,
-	0xd021f40c,
-	0xf505f7f0,
-	0xf4086221,
-/* 0x0ade: ctx_xfer_post */
-	0xf7f02e02,
-	0xdb21f502,
-	0xf5f4bd07,
-	0xf5083a21,
-	0xf5027f21,
-	0xbd07ed21,
-	0xdb21f5f4,
-	0x1011f407,
-	0xfd400198,
-	0x0bf40511,
-	0xb121f507,
-/* 0x0b09: ctx_xfer_no_post_mmio */
-/* 0x0b09: ctx_xfer_done */
-	0x0000f809,
-	0x00000000,
-	0x00000000,
-	0x00000000,
-	0x00000000,
+	0x7921f5ac,
+	0xf124bd02,
+	0xf047fc07,
+	0x02d00203,
+	0xf004bd00,
+	0x20b6012c,
+	0xfc07f103,
+	0x0203f04a,
+	0xbd0002d0,
+	0x01acf004,
+	0xf006a5f0,
+	0x0c9800b7,
+	0x010d9800,
+	0xf500e7f0,
+	0xf0017e21,
+	0x21f508a7,
+	0x21f5011f,
+	0x01f4026d,
+	0x0ca7f013,
+	0xf0df21f4,
+	0x21f505f7,
+	0x02f40871,
+/* 0x0aed: ctx_xfer_post */
+	0x02f7f02e,
+	0x07ea21f5,
+	0x21f5f4bd,
+	0x21f50849,
+	0x21f5028e,
+	0xf4bd07fc,
+	0x07ea21f5,
+	0x981011f4,
+	0x11fd4001,
+	0x070bf405,
+	0x09c021f5,
+/* 0x0b18: ctx_xfer_no_post_mmio */
+/* 0x0b18: ctx_xfer_done */
+	0x000000f8,
 	0x00000000,
 	0x00000000,
 	0x00000000,
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgk208.fuc5.h b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgk208.fuc5.h
index 16869d0..18fca85 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgk208.fuc5.h
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgk208.fuc5.h
@@ -206,13 +206,13 @@ uint32_t gk208_grhub_data[] = {
 };
 
 uint32_t gk208_grhub_code[] = {
-	0x030e0ef5,
+	0x031c0ef5,
 /* 0x0004: queue_put */
 	0x9800d898,
 	0x86f001d9,
 	0xf489a408,
 	0x020f0b1b,
-	0x0002f87e,
+	0x0003067e,
 /* 0x001a: queue_put_next */
 	0x98c400f8,
 	0x0384b607,
@@ -223,662 +223,662 @@ uint32_t gk208_grhub_code[] = {
 	0xd9b50f94,
 /* 0x0037: queue_get */
 	0xf400f801,
-	0xd8980131,
-	0x01d99800,
-	0x0bf489a4,
-	0x0789c421,
-	0xbb0394b6,
-	0x90b6009d,
-	0x009e9808,
-	0xb6019f98,
-	0x84f00180,
-	0x00d8b50f,
-/* 0x0063: queue_get_done */
-	0xf80132f4,
-/* 0x0065: nv_rd32 */
-	0xf0ecb200,
-	0x00801fc9,
-	0x0cf601ca,
-/* 0x0073: nv_rd32_wait */
-	0x8c04bd00,
-	0xcf01ca00,
-	0xccc800cc,
-	0xf61bf41f,
-	0xec7e060a,
-	0x008f0000,
-	0xffcf01cb,
-/* 0x008f: nv_wr32 */
-	0x8000f800,
-	0xf601cc00,
-	0x04bd000f,
-	0xc9f0ecb2,
-	0x1ec9f01f,
+	0x31f40131,
+	0x00d89800,
+	0xa401d998,
+	0x2c0bf489,
+	0xb60789c4,
+	0x9dbb0394,
+	0x0890b600,
+	0x98009e98,
+	0x80b6019f,
+	0x0f84f001,
+	0xf400d8b5,
+	0xd9980132,
+	0xf489a401,
+	0x32f4060b,
+/* 0x0071: queue_get_done */
+/* 0x0073: nv_rd32 */
+	0xb200f800,
+	0x1fc9f0ec,
 	0x01ca0080,
 	0xbd000cf6,
-/* 0x00a9: nv_wr32_wait */
+/* 0x0081: nv_rd32_wait */
 	0xca008c04,
 	0x00cccf01,
 	0xf41fccc8,
-	0x00f8f61b,
-/* 0x00b8: wait_donez */
-	0x99f094bd,
-	0x37008000,
-	0x0009f602,
-	0x008004bd,
-	0x0af60206,
-/* 0x00cf: wait_donez_ne */
-	0x8804bd00,
-	0xcf010000,
-	0x8aff0088,
-	0xf61bf488,
-	0x99f094bd,
-	0x17008000,
-	0x0009f602,
-	0x00f804bd,
-/* 0x00ec: wait_doneo */
-	0x99f094bd,
-	0x37008000,
-	0x0009f602,
-	0x008004bd,
-	0x0af60206,
-/* 0x0103: wait_doneo_e */
-	0x8804bd00,
-	0xcf010000,
-	0x8aff0088,
-	0xf60bf488,
-	0x99f094bd,
-	0x17008000,
-	0x0009f602,
-	0x00f804bd,
-/* 0x0120: mmctx_size */
-/* 0x0122: nv_mmctx_size_loop */
-	0xe89894bd,
-	0x1a85b600,
-	0xb60180b6,
-	0x98bb0284,
-	0x04e0b600,
-	0x1bf4efa4,
-	0xf89fb2ec,
-/* 0x013d: mmctx_xfer */
-	0xf094bd00,
-	0x00800199,
-	0x09f60237,
-	0xbd04bd00,
-	0x05bbfd94,
-	0x800f0bf4,
-	0xf601c400,
-	0x04bd000b,
-/* 0x015f: mmctx_base_disabled */
-	0xfd0099f0,
-	0x0bf405ee,
-	0xc6008018,
-	0x000ef601,
-	0x008004bd,
-	0x0ff601c7,
-	0xf004bd00,
-/* 0x017a: mmctx_multi_disabled */
-	0xabc80199,
-	0x10b4b600,
-	0xc80cb9f0,
-	0xe4b601ae,
-	0x05befd11,
-	0x01c50080,
-	0xbd000bf6,
-/* 0x0195: mmctx_exec_loop */
-/* 0x0195: mmctx_wait_free */
-	0xc5008e04,
-	0x00eecf01,
-	0xf41fe4f0,
-	0xce98f60b,
-	0x05e9fd00,
-	0x01c80080,
-	0xbd000ef6,
-	0x04c0b604,
-	0x1bf4cda4,
-	0x02abc8df,
-/* 0x01bf: mmctx_fini_wait */
-	0x8b1c1bf4,
-	0xcf01c500,
-	0xb4f000bb,
-	0x10b4b01f,
-	0x0af31bf4,
-	0x00b87e05,
-	0x250ef400,
-/* 0x01d8: mmctx_stop */
-	0xb600abc8,
-	0xb9f010b4,
-	0x12b9f00c,
-	0x01c50080,
-	0xbd000bf6,
-/* 0x01ed: mmctx_stop_wait */
-	0xc5008b04,
-	0x00bbcf01,
-	0xf412bbc8,
-/* 0x01fa: mmctx_done */
+	0x060af61b,
+	0x0000fa7e,
+	0x01cb008f,
+	0xf800ffcf,
+/* 0x009d: nv_wr32 */
+	0xcc008000,
+	0x000ff601,
+	0xecb204bd,
+	0xf01fc9f0,
+	0x00801ec9,
+	0x0cf601ca,
+/* 0x00b7: nv_wr32_wait */
+	0x8c04bd00,
+	0xcf01ca00,
+	0xccc800cc,
+	0xf61bf41f,
+/* 0x00c6: wait_donez */
+	0x94bd00f8,
+	0x800099f0,
+	0xf6023700,
+	0x04bd0009,
+	0x02060080,
+	0xbd000af6,
+/* 0x00dd: wait_donez_ne */
+	0x00008804,
+	0x0088cf01,
+	0xf4888aff,
 	0x94bdf61b,
-	0x800199f0,
+	0x800099f0,
+	0xf6021700,
+	0x04bd0009,
+/* 0x00fa: wait_doneo */
+	0x94bd00f8,
+	0x800099f0,
+	0xf6023700,
+	0x04bd0009,
+	0x02060080,
+	0xbd000af6,
+/* 0x0111: wait_doneo_e */
+	0x00008804,
+	0x0088cf01,
+	0xf4888aff,
+	0x94bdf60b,
+	0x800099f0,
 	0xf6021700,
 	0x04bd0009,
-/* 0x020a: strand_wait */
-	0xa0f900f8,
-	0xb87e020a,
-	0xa0fc0000,
-/* 0x0216: strand_pre */
-	0x0c0900f8,
-	0x024afc80,
+/* 0x012e: mmctx_size */
+	0x94bd00f8,
+/* 0x0130: nv_mmctx_size_loop */
+	0xb600e898,
+	0x80b61a85,
+	0x0284b601,
+	0xb60098bb,
+	0xefa404e0,
+	0xb2ec1bf4,
+/* 0x014b: mmctx_xfer */
+	0xbd00f89f,
+	0x0199f094,
+	0x02370080,
 	0xbd0009f6,
-	0x020a7e04,
-/* 0x0227: strand_post */
-	0x0900f800,
-	0x4afc800d,
-	0x0009f602,
-	0x0a7e04bd,
-	0x00f80002,
-/* 0x0238: strand_set */
-	0xfc800f0c,
-	0x0cf6024f,
-	0x0c04bd00,
-	0x4afc800b,
-	0x000cf602,
-	0xfc8004bd,
-	0x0ef6024f,
-	0x0c04bd00,
-	0x4afc800a,
-	0x000cf602,
-	0x0a7e04bd,
-	0x00f80002,
-/* 0x0268: strand_ctx_init */
+	0xfd94bd04,
+	0x0bf405bb,
+	0xc400800f,
+	0x000bf601,
+	0x99f004bd,
+/* 0x016d: mmctx_base_disabled */
+	0x05eefd00,
+	0x80180bf4,
+	0xf601c600,
+	0x04bd000e,
+	0x01c70080,
+	0xbd000ff6,
+	0x0199f004,
+/* 0x0188: mmctx_multi_disabled */
+	0xb600abc8,
+	0xb9f010b4,
+	0x01aec80c,
+	0xfd11e4b6,
+	0x008005be,
+	0x0bf601c5,
+/* 0x01a3: mmctx_exec_loop */
+/* 0x01a3: mmctx_wait_free */
+	0x8e04bd00,
+	0xcf01c500,
+	0xe4f000ee,
+	0xf60bf41f,
+	0xfd00ce98,
+	0x008005e9,
+	0x0ef601c8,
+	0xb604bd00,
+	0xcda404c0,
+	0xc8df1bf4,
+	0x1bf402ab,
+/* 0x01cd: mmctx_fini_wait */
+	0xc5008b1c,
+	0x00bbcf01,
+	0xb01fb4f0,
+	0x1bf410b4,
+	0x7e050af3,
+	0xf40000c6,
+/* 0x01e6: mmctx_stop */
+	0xabc8250e,
+	0x10b4b600,
+	0xf00cb9f0,
+	0x008012b9,
+	0x0bf601c5,
+/* 0x01fb: mmctx_stop_wait */
+	0x8b04bd00,
+	0xcf01c500,
+	0xbbc800bb,
+	0xf61bf412,
+/* 0x0208: mmctx_done */
 	0x99f094bd,
-	0x37008003,
+	0x17008001,
 	0x0009f602,
-	0x167e04bd,
-	0x030e0002,
-	0x0002387e,
-	0xfc80c4bd,
-	0x0cf60247,
-	0x0c04bd00,
-	0x4afc8001,
-	0x000cf602,
-	0x0a7e04bd,
-	0x0c920002,
-	0x46fc8001,
-	0x000cf602,
-	0x020c04bd,
-	0x024afc80,
+	0x00f804bd,
+/* 0x0218: strand_wait */
+	0x020aa0f9,
+	0x0000c67e,
+	0x00f8a0fc,
+/* 0x0224: strand_pre */
+	0xfc800c09,
+	0x09f6024a,
+	0x7e04bd00,
+	0xf8000218,
+/* 0x0235: strand_post */
+	0x800d0900,
+	0xf6024afc,
+	0x04bd0009,
+	0x0002187e,
+/* 0x0246: strand_set */
+	0x0f0c00f8,
+	0x024ffc80,
 	0xbd000cf6,
-	0x020a7e04,
-	0x02277e00,
-	0x42008800,
-	0x20008902,
-	0x0099cf02,
-/* 0x02c7: ctx_init_strand_loop */
-	0xf608fe95,
-	0x8ef6008e,
-	0x808acf40,
-	0xb606a5b6,
-	0xeabb01a0,
-	0x0480b600,
-	0xf40192b6,
-	0xe4b6e81b,
-	0xf2efbc08,
-	0x99f094bd,
-	0x17008003,
-	0x0009f602,
+	0x800b0c04,
+	0xf6024afc,
+	0x04bd000c,
+	0x024ffc80,
+	0xbd000ef6,
+	0x800a0c04,
+	0xf6024afc,
+	0x04bd000c,
+	0x0002187e,
+/* 0x0276: strand_ctx_init */
+	0x94bd00f8,
+	0x800399f0,
+	0xf6023700,
+	0x04bd0009,
+	0x0002247e,
+	0x467e030e,
+	0xc4bd0002,
+	0x0247fc80,
+	0xbd000cf6,
+	0x80010c04,
+	0xf6024afc,
+	0x04bd000c,
+	0x0002187e,
+	0x80010c92,
+	0xf60246fc,
+	0x04bd000c,
+	0xfc80020c,
+	0x0cf6024a,
+	0x7e04bd00,
+	0x7e000218,
+	0x88000235,
+	0x89024200,
+	0xcf022000,
+	0xfe950099,
+/* 0x02d5: ctx_init_strand_loop */
+	0x008ef608,
+	0xcf408ef6,
+	0xa5b6808a,
+	0x01a0b606,
+	0xb600eabb,
+	0x92b60480,
+	0xe81bf401,
+	0xbc08e4b6,
+	0x94bdf2ef,
+	0x800399f0,
+	0xf6021700,
+	0x04bd0009,
+/* 0x0306: error */
+	0x008000f8,
+	0x0ff60205,
+	0x0f04bd00,
+	0x07008001,
+	0x000ff603,
 	0x00f804bd,
-/* 0x02f8: error */
-	0x02050080,
-	0xbd000ff6,
-	0x80010f04,
-	0xf6030700,
-	0x04bd000f,
-/* 0x030e: init */
-	0x04bd00f8,
-	0x410007fe,
-	0x11cf4200,
-	0x0911e700,
-	0x0814b601,
-	0x020014fe,
-	0x12004002,
-	0xbd0002f6,
-	0x05c94104,
-	0xbd0010fe,
-	0x07004024,
-	0xbd0002f6,
-	0x20034204,
-	0x01010080,
-	0xbd0002f6,
-	0x20044204,
-	0x01010480,
-	0xbd0002f6,
-	0x200b4204,
-	0x01010880,
-	0xbd0002f6,
-	0x200c4204,
-	0x01011c80,
+/* 0x031c: init */
+	0x07fe04bd,
+	0x42004100,
+	0xe70011cf,
+	0xb6010911,
+	0x14fe0814,
+	0x40020200,
+	0x02f61200,
+	0xf404bd00,
+	0xd7410032,
+	0x0010fe05,
+	0x004024bd,
+	0x0002f607,
+	0x034204bd,
+	0x01008020,
+	0x0002f601,
+	0x044204bd,
+	0x01048020,
+	0x0002f601,
+	0x0b4204bd,
+	0x01088020,
+	0x0002f601,
+	0x0c4204bd,
+	0x011c8020,
+	0x0002f601,
+	0x039204bd,
+	0x09008001,
+	0x0003f603,
+	0x044204bd,
+	0x04004087,
 	0xbd0002f6,
-	0x01039204,
-	0x03090080,
-	0xbd0003f6,
-	0x87044204,
-	0xf6040040,
-	0x04bd0002,
-	0x00400402,
-	0x0002f603,
-	0x31f404bd,
-	0x96048e10,
-	0x00657e40,
-	0xc7feb200,
-	0x01b590f1,
-	0x1ff4f003,
-	0x01020fb5,
-	0x041fbb01,
-	0x800112b6,
-	0xf6010300,
-	0x04bd0001,
-	0x01040080,
+	0x40040204,
+	0x02f60300,
+	0xf404bd00,
+	0x048e1031,
+	0x737e4096,
+	0xfeb20000,
+	0xb590f1c7,
+	0xf4f00301,
+	0x020fb51f,
+	0x1fbb0101,
+	0x0112b604,
+	0x01030080,
 	0xbd0001f6,
-	0x01004104,
-	0xac7e020f,
-	0xbb7e0006,
-	0x100f0006,
-	0x0006fd7e,
-	0x98000e98,
-	0x207e010f,
-	0x14950001,
-	0xc0008008,
-	0x0004f601,
-	0x008004bd,
-	0x04f601c1,
-	0xb704bd00,
-	0xbb130030,
-	0xf5b6001f,
-	0xd3008002,
-	0x000ff601,
-	0x15b604bd,
-	0x0110b608,
-	0xb20814b6,
-	0x02687e1f,
-	0x001fbb00,
-	0x84020398,
-/* 0x041f: init_gpc */
-	0xb8502000,
-	0x0008044e,
-	0x8f7e1fb2,
+	0x04008004,
+	0x0001f601,
+	0x004104bd,
+	0x7e020f01,
+	0x7e0006ba,
+	0x0f0006c9,
+	0x070b7e10,
+	0x000e9800,
+	0x7e010f98,
+	0x9500012e,
+	0x00800814,
+	0x04f601c0,
+	0x8004bd00,
+	0xf601c100,
+	0x04bd0004,
+	0x130030b7,
+	0xb6001fbb,
+	0x008002f5,
+	0x0ff601d3,
+	0xb604bd00,
+	0x10b60815,
+	0x0814b601,
+	0x767e1fb2,
+	0x1fbb0002,
+	0x02039800,
+	0x50200084,
+/* 0x0430: init_gpc */
+	0x08044eb8,
+	0x7e1fb200,
+	0xb800009d,
+	0x00010c4e,
+	0x9d7ef4bd,
 	0x4eb80000,
-	0xbd00010c,
-	0x008f7ef4,
-	0x044eb800,
-	0x8f7e0001,
+	0x7e000104,
+	0xb800009d,
+	0x0001004e,
+	0x9d7e020f,
 	0x4eb80000,
-	0x0f000100,
-	0x008f7e02,
-	0x004eb800,
-/* 0x044e: init_gpc_wait */
-	0x657e0008,
-	0xffc80000,
-	0xf90bf41f,
-	0x08044eb8,
-	0x00657e00,
-	0x001fbb00,
-	0x800040b7,
-	0xf40132b6,
-	0x000fb41b,
-	0x0006fd7e,
-	0xac7e000f,
-	0x00800006,
-	0x01f60201,
-	0xbd04bd00,
-	0x1f19f014,
-	0x02300080,
-	0xbd0001f6,
-/* 0x0491: main */
-	0x0031f404,
-	0x0d0028f4,
-	0x00377e10,
-	0xf401f400,
-	0x4001e4b1,
-	0x00c71bf5,
-	0x99f094bd,
-	0x37008004,
-	0x0009f602,
-	0x008104bd,
-	0x11cf02c0,
-	0xc1008200,
-	0x0022cf02,
-	0xf41f13c8,
-	0x23c8770b,
-	0x550bf41f,
+/* 0x045f: init_gpc_wait */
+	0x7e000800,
+	0xc8000073,
+	0x0bf41fff,
+	0x044eb8f9,
+	0x737e0008,
+	0x1fbb0000,
+	0x0040b700,
+	0x0132b680,
+	0x0fb41bf4,
+	0x070b7e00,
+	0x7e000f00,
+	0x800006ba,
+	0xf6020100,
+	0x04bd0001,
+	0x19f014bd,
+	0x3000801f,
+	0x0001f602,
+/* 0x04a2: main */
+	0x28f404bd,
+	0x7e100d00,
+	0xf4000037,
+	0xe4b1f701,
+	0x1bf54001,
+	0x94bd00c7,
+	0x800499f0,
+	0xf6023700,
+	0x04bd0009,
+	0x02c00081,
+	0x820011cf,
+	0xcf02c100,
+	0x13c80022,
+	0x770bf41f,
+	0xf41f23c8,
+	0x20f9550b,
+	0x94bd12b2,
+	0x800799f0,
+	0xf6023700,
+	0x04bd0009,
+	0xf40132f4,
+	0x8e7e0231,
+	0x94bd0008,
+	0x800799f0,
+	0xf6021700,
+	0x04bd0009,
+	0x94bd20fc,
+	0x800699f0,
+	0xf6023700,
+	0x04bd0009,
+	0x7e0131f4,
+	0xbd00088e,
+	0x0699f094,
+	0x02170080,
+	0xbd0009f6,
+	0x2f0ef404,
+/* 0x0530: chsw_prev_no_next */
 	0x12b220f9,
-	0x99f094bd,
-	0x37008007,
-	0x0009f602,
-	0x32f404bd,
-	0x0231f401,
-	0x0008807e,
-	0x99f094bd,
-	0x17008007,
-	0x0009f602,
-	0x20fc04bd,
-	0x99f094bd,
-	0x37008006,
-	0x0009f602,
-	0x31f404bd,
-	0x08807e01,
-	0xf094bd00,
-	0x00800699,
-	0x09f60217,
-	0xf404bd00,
-/* 0x0522: chsw_prev_no_next */
-	0x20f92f0e,
-	0x32f412b2,
-	0x0232f401,
-	0x0008807e,
-	0x008020fc,
-	0x02f602c0,
-	0xf404bd00,
-/* 0x053e: chsw_no_prev */
-	0x23c8130e,
-	0x0d0bf41f,
-	0xf40131f4,
-	0x807e0232,
-/* 0x054e: chsw_done */
-	0x01020008,
-	0x02c30080,
+	0xf40132f4,
+	0x8e7e0232,
+	0x20fc0008,
+	0x02c00080,
 	0xbd0002f6,
-	0xf094bd04,
-	0x00800499,
-	0x09f60217,
-	0xf504bd00,
-/* 0x056b: main_not_ctx_switch */
-	0xb0ff2a0e,
-	0x1bf401e4,
-	0x7ef2b20c,
-	0xf4000820,
-/* 0x057a: main_not_ctx_chan */
-	0xe4b0400e,
-	0x2c1bf402,
-	0x99f094bd,
-	0x37008007,
-	0x0009f602,
-	0x32f404bd,
+	0x130ef404,
+/* 0x054c: chsw_no_prev */
+	0xf41f23c8,
+	0x31f40d0b,
 	0x0232f401,
-	0x0008807e,
-	0x99f094bd,
-	0x17008007,
-	0x0009f602,
-	0x0ef404bd,
-/* 0x05a9: main_not_ctx_save */
-	0x10ef9411,
-	0x7e01f5f0,
-	0xf50002f8,
-/* 0x05b7: main_done */
-	0xbdfede0e,
-	0x1f29f024,
-	0x02300080,
-	0xbd0002f6,
-	0xcc0ef504,
-/* 0x05c9: ih */
-	0xf900f9fe,
-	0x0188fe80,
-	0x90f980f9,
-	0xb0f9a0f9,
-	0xe0f9d0f9,
-	0x04bdf0f9,
-	0xcf02004a,
-	0xabc400aa,
-	0x230bf404,
-	0x004e100d,
-	0x00eecf1a,
-	0xcf19004f,
-	0x047e00ff,
-	0xb0b70000,
-	0x010e0400,
-	0xf61d0040,
-	0x04bd000e,
-/* 0x060c: ih_no_fifo */
-	0x0100abe4,
-	0x0d0c0bf4,
-	0x40014e10,
+	0x00088e7e,
+/* 0x055c: chsw_done */
+	0x00800102,
+	0x02f602c3,
+	0xbd04bd00,
+	0x0499f094,
+	0x02170080,
+	0xbd0009f6,
+	0x2d0ef504,
+/* 0x0579: main_not_ctx_switch */
+	0x01e4b0ff,
+	0xb20c1bf4,
+	0x082e7ef2,
+	0x400ef400,
+/* 0x0588: main_not_ctx_chan */
+	0xf402e4b0,
+	0x94bd2c1b,
+	0x800799f0,
+	0xf6023700,
+	0x04bd0009,
+	0xf40132f4,
+	0x8e7e0232,
+	0x94bd0008,
+	0x800799f0,
+	0xf6021700,
+	0x04bd0009,
+/* 0x05b7: main_not_ctx_save */
+	0x94110ef4,
+	0xf5f010ef,
+	0x03067e01,
+	0xe10ef500,
+/* 0x05c5: main_done */
+	0xf024bdfe,
+	0x00801f29,
+	0x02f60230,
+	0xf504bd00,
+/* 0x05d7: ih */
+	0xf9fecf0e,
+	0xfe80f900,
+	0x80f90188,
+	0xa0f990f9,
+	0xd0f9b0f9,
+	0xf0f9e0f9,
+	0x004a04bd,
+	0x00aacf02,
+	0xf404abc4,
+	0x100d230b,
+	0xcf1a004e,
+	0x004f00ee,
+	0x00ffcf19,
 	0x0000047e,
-/* 0x061c: ih_no_ctxsw */
-	0x0400abe4,
-	0x8e560bf4,
-	0x7e400708,
-	0xb2000065,
-	0x040080ff,
-	0x000ff602,
-	0x048e04bd,
-	0x657e4007,
-	0xffb20000,
-	0x02030080,
+	0x0400b0b7,
+	0x0040010e,
+	0x000ef61d,
+/* 0x061a: ih_no_fifo */
+	0xabe404bd,
+	0x0bf40100,
+	0x4e100d0c,
+	0x047e4001,
+/* 0x062a: ih_no_ctxsw */
+	0xabe40000,
+	0x0bf40400,
+	0x07088e56,
+	0x00737e40,
+	0x80ffb200,
+	0xf6020400,
+	0x04bd000f,
+	0x4007048e,
+	0x0000737e,
+	0x0080ffb2,
+	0x0ff60203,
+	0xc704bd00,
+	0xee9450fe,
+	0x07008f02,
+	0x00efbb40,
+	0x0000737e,
+	0x02020080,
 	0xbd000ff6,
-	0x50fec704,
-	0x8f02ee94,
-	0xbb400700,
-	0x657e00ef,
-	0x00800000,
-	0x0ff60202,
-	0x0f04bd00,
-	0x02f87e03,
-	0x01004b00,
-	0x448ebfb2,
-	0x8f7e4001,
-/* 0x0676: ih_no_fwmthd */
-	0x044b0000,
-	0xffb0bd05,
-	0x0bf4b4ab,
-	0x0700800c,
-	0x000bf603,
-/* 0x068a: ih_no_other */
-	0x004004bd,
-	0x000af601,
-	0xf0fc04bd,
-	0xd0fce0fc,
-	0xa0fcb0fc,
-	0x80fc90fc,
-	0xfc0088fe,
-	0xf400fc80,
-	0x01f80032,
-/* 0x06ac: ctx_4170s */
-	0xb210f5f0,
-	0x41708eff,
-	0x008f7e40,
-/* 0x06bb: ctx_4170w */
-	0x8e00f800,
+	0x7e030f04,
+	0x4b000306,
+	0xbfb20100,
+	0x4001448e,
+	0x00009d7e,
+/* 0x0684: ih_no_fwmthd */
+	0xbd05044b,
+	0xb4abffb0,
+	0x800c0bf4,
+	0xf6030700,
+	0x04bd000b,
+/* 0x0698: ih_no_other */
+	0xf6010040,
+	0x04bd000a,
+	0xe0fcf0fc,
+	0xb0fcd0fc,
+	0x90fca0fc,
+	0x88fe80fc,
+	0xfc80fc00,
+	0x0032f400,
+/* 0x06ba: ctx_4170s */
+	0xf5f001f8,
+	0x8effb210,
 	0x7e404170,
-	0xb2000065,
-	0x10f4f0ff,
-	0xf8f31bf4,
-/* 0x06cd: ctx_redswitch */
-	0x02004e00,
-	0xf040e5f0,
-	0xe5f020e5,
-	0x85008010,
-	0x000ef601,
-	0x080f04bd,
-/* 0x06e4: ctx_redswitch_delay */
-	0xf401f2b6,
-	0xe5f1fd1b,
-	0xe5f10400,
-	0x00800100,
-	0x0ef60185,
-	0xf804bd00,
-/* 0x06fd: ctx_86c */
-	0x23008000,
-	0x000ff602,
-	0xffb204bd,
-	0x408a148e,
-	0x00008f7e,
-	0x8c8effb2,
-	0x8f7e41a8,
-	0x00f80000,
-/* 0x071c: ctx_mem */
-	0x02840080,
+	0xf800009d,
+/* 0x06c9: ctx_4170w */
+	0x41708e00,
+	0x00737e40,
+	0xf0ffb200,
+	0x1bf410f4,
+/* 0x06db: ctx_redswitch */
+	0x4e00f8f3,
+	0xe5f00200,
+	0x20e5f040,
+	0x8010e5f0,
+	0xf6018500,
+	0x04bd000e,
+/* 0x06f2: ctx_redswitch_delay */
+	0xf2b6080f,
+	0xfd1bf401,
+	0x0400e5f1,
+	0x0100e5f1,
+	0x01850080,
+	0xbd000ef6,
+/* 0x070b: ctx_86c */
+	0x8000f804,
+	0xf6022300,
+	0x04bd000f,
+	0x148effb2,
+	0x9d7e408a,
+	0xffb20000,
+	0x41a88c8e,
+	0x00009d7e,
+/* 0x072a: ctx_mem */
+	0x008000f8,
+	0x0ff60284,
+/* 0x0733: ctx_mem_wait */
+	0x8f04bd00,
+	0xcf028400,
+	0xfffd00ff,
+	0xf61bf405,
+/* 0x0742: ctx_load */
+	0x94bd00f8,
+	0x800599f0,
+	0xf6023700,
+	0x04bd0009,
+	0xc67e0c0a,
+	0xf4bd0000,
+	0x02890080,
 	0xbd000ff6,
-/* 0x0725: ctx_mem_wait */
-	0x84008f04,
-	0x00ffcf02,
-	0xf405fffd,
-	0x00f8f61b,
-/* 0x0734: ctx_load */
-	0x99f094bd,
-	0x37008005,
-	0x0009f602,
-	0x0c0a04bd,
-	0x0000b87e,
-	0x0080f4bd,
-	0x0ff60289,
-	0x8004bd00,
-	0xf602c100,
-	0x04bd0002,
-	0x02830080,
+	0xc1008004,
+	0x0002f602,
+	0x008004bd,
+	0x02f60283,
+	0x0f04bd00,
+	0x072a7e07,
+	0xc0008000,
+	0x0002f602,
+	0x0bfe04bd,
+	0x1f2af000,
+	0xb60424b6,
+	0x94bd0220,
+	0x800899f0,
+	0xf6023700,
+	0x04bd0009,
+	0x02810080,
 	0xbd0002f6,
-	0x7e070f04,
-	0x8000071c,
-	0xf602c000,
-	0x04bd0002,
-	0xf0000bfe,
-	0x24b61f2a,
-	0x0220b604,
+	0x0000d204,
+	0x25f08000,
+	0x88008002,
+	0x0002f602,
+	0x100104bd,
+	0xf0020042,
+	0x12fa0223,
+	0xbd03f805,
+	0x0899f094,
+	0x02170080,
+	0xbd0009f6,
+	0x81019804,
+	0x981814b6,
+	0x25b68002,
+	0x0512fd08,
+	0xbd1601b5,
+	0x0999f094,
+	0x02370080,
+	0xbd0009f6,
+	0x81008004,
+	0x0001f602,
+	0x010204bd,
+	0x02880080,
+	0xbd0002f6,
+	0x01004104,
+	0xfa0613f0,
+	0x03f80501,
 	0x99f094bd,
-	0x37008008,
+	0x17008009,
 	0x0009f602,
-	0x008004bd,
-	0x02f60281,
-	0xd204bd00,
-	0x80000000,
-	0x800225f0,
-	0xf6028800,
-	0x04bd0002,
-	0x00421001,
-	0x0223f002,
-	0xf80512fa,
-	0xf094bd03,
-	0x00800899,
-	0x09f60217,
-	0x9804bd00,
-	0x14b68101,
-	0x80029818,
-	0xfd0825b6,
-	0x01b50512,
-	0xf094bd16,
-	0x00800999,
-	0x09f60237,
-	0x8004bd00,
-	0xf6028100,
-	0x04bd0001,
-	0x00800102,
-	0x02f60288,
-	0x4104bd00,
-	0x13f00100,
-	0x0501fa06,
-	0x94bd03f8,
-	0x800999f0,
+	0x94bd04bd,
+	0x800599f0,
 	0xf6021700,
 	0x04bd0009,
-	0x99f094bd,
-	0x17008005,
-	0x0009f602,
-	0x00f804bd,
-/* 0x0820: ctx_chan */
-	0x0007347e,
-	0xb87e0c0a,
-	0x050f0000,
-	0x00071c7e,
-/* 0x0832: ctx_mmio_exec */
-	0x039800f8,
-	0x81008041,
-	0x0003f602,
-	0x34bd04bd,
-/* 0x0840: ctx_mmio_loop */
-	0xf4ff34c4,
-	0x00450e1b,
-	0x0653f002,
-	0xf80535fa,
-/* 0x0851: ctx_mmio_pull */
-	0x804e9803,
-	0x7e814f98,
-	0xb600008f,
-	0x12b60830,
-	0xdf1bf401,
-/* 0x0864: ctx_mmio_done */
-	0x80160398,
+/* 0x082e: ctx_chan */
+	0x427e00f8,
+	0x0c0a0007,
+	0x0000c67e,
+	0x2a7e050f,
+	0x00f80007,
+/* 0x0840: ctx_mmio_exec */
+	0x80410398,
 	0xf6028100,
 	0x04bd0003,
-	0x414000b5,
-	0x13f00100,
-	0x0601fa06,
-	0x00f803f8,
-/* 0x0880: ctx_xfer */
-	0x0080040e,
-	0x0ef60302,
-/* 0x088b: ctx_xfer_idle */
-	0x8e04bd00,
-	0xcf030000,
-	0xe4f100ee,
-	0x1bf42000,
-	0x0611f4f5,
-/* 0x089f: ctx_xfer_pre */
-	0x0f0c02f4,
-	0x06fd7e10,
-	0x1b11f400,
-/* 0x08a8: ctx_xfer_pre_load */
-	0xac7e020f,
-	0xbb7e0006,
-	0xcd7e0006,
-	0xf4bd0006,
-	0x0006ac7e,
-	0x0007347e,
-/* 0x08c0: ctx_xfer_exec */
-	0xbd160198,
-	0x05008024,
-	0x0002f601,
-	0x1fb204bd,
-	0x41a5008e,
-	0x00008f7e,
-	0xf001fcf0,
-	0x24b6022c,
-	0x05f2fd01,
-	0x048effb2,
-	0x8f7e41a5,
-	0x167e0000,
-	0x24bd0002,
-	0x0247fc80,
-	0xbd0002f6,
-	0x012cf004,
-	0x800320b6,
-	0xf6024afc,
+/* 0x084e: ctx_mmio_loop */
+	0x34c434bd,
+	0x0e1bf4ff,
+	0xf0020045,
+	0x35fa0653,
+/* 0x085f: ctx_mmio_pull */
+	0x9803f805,
+	0x4f98804e,
+	0x009d7e81,
+	0x0830b600,
+	0xf40112b6,
+/* 0x0872: ctx_mmio_done */
+	0x0398df1b,
+	0x81008016,
+	0x0003f602,
+	0x00b504bd,
+	0x01004140,
+	0xfa0613f0,
+	0x03f80601,
+/* 0x088e: ctx_xfer */
+	0x040e00f8,
+	0x03020080,
+	0xbd000ef6,
+/* 0x0899: ctx_xfer_idle */
+	0x00008e04,
+	0x00eecf03,
+	0x2000e4f1,
+	0xf4f51bf4,
+	0x02f40611,
+/* 0x08ad: ctx_xfer_pre */
+	0x7e100f0c,
+	0xf400070b,
+/* 0x08b6: ctx_xfer_pre_load */
+	0x020f1b11,
+	0x0006ba7e,
+	0x0006c97e,
+	0x0006db7e,
+	0xba7ef4bd,
+	0x427e0006,
+/* 0x08ce: ctx_xfer_exec */
+	0x01980007,
+	0x8024bd16,
+	0xf6010500,
 	0x04bd0002,
-	0xf001acf0,
-	0x000b06a5,
-	0x98000c98,
-	0x000e010d,
-	0x00013d7e,
-	0xec7e080a,
-	0x0a7e0000,
-	0x01f40002,
-	0x7e0c0a12,
-	0x0f0000b8,
-	0x071c7e05,
-	0x2d02f400,
-/* 0x093c: ctx_xfer_post */
-	0xac7e020f,
+	0x008e1fb2,
+	0x9d7e41a5,
+	0xfcf00000,
+	0x022cf001,
+	0xfd0124b6,
+	0xffb205f2,
+	0x41a5048e,
+	0x00009d7e,
+	0x0002247e,
+	0xfc8024bd,
+	0x02f60247,
+	0xf004bd00,
+	0x20b6012c,
+	0x4afc8003,
+	0x0002f602,
+	0xacf004bd,
+	0x06a5f001,
+	0x0c98000b,
+	0x010d9800,
+	0x4b7e000e,
+	0x080a0001,
+	0x0000fa7e,
+	0x0002187e,
+	0x0a1201f4,
+	0x00c67e0c,
+	0x7e050f00,
+	0xf400072a,
+/* 0x094a: ctx_xfer_post */
+	0x020f2d02,
+	0x0006ba7e,
+	0x0b7ef4bd,
+	0x357e0007,
+	0xc97e0002,
 	0xf4bd0006,
-	0x0006fd7e,
-	0x0002277e,
-	0x0006bb7e,
-	0xac7ef4bd,
-	0x11f40006,
-	0x40019810,
-	0xf40511fd,
-	0x327e070b,
-/* 0x0966: ctx_xfer_no_post_mmio */
-/* 0x0966: ctx_xfer_done */
-	0x00f80008,
-	0x00000000,
-	0x00000000,
-	0x00000000,
-	0x00000000,
+	0x0006ba7e,
+	0x981011f4,
+	0x11fd4001,
+	0x070bf405,
+	0x0008407e,
+/* 0x0974: ctx_xfer_no_post_mmio */
+/* 0x0974: ctx_xfer_done */
+	0x000000f8,
 	0x00000000,
 	0x00000000,
 	0x00000000,
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgm107.fuc5.h b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgm107.fuc5.h
index d6343d2..6d2f713 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgm107.fuc5.h
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/hubgm107.fuc5.h
@@ -206,13 +206,13 @@ uint32_t gm107_grhub_data[] = {
 };
 
 uint32_t gm107_grhub_code[] = {
-	0x030e0ef5,
+	0x031c0ef5,
 /* 0x0004: queue_put */
 	0x9800d898,
 	0x86f001d9,
 	0xf489a408,
 	0x020f0b1b,
-	0x0002f87e,
+	0x0003067e,
 /* 0x001a: queue_put_next */
 	0x98c400f8,
 	0x0384b607,
@@ -223,662 +223,662 @@ uint32_t gm107_grhub_code[] = {
 	0xd9b50f94,
 /* 0x0037: queue_get */
 	0xf400f801,
-	0xd8980131,
-	0x01d99800,
-	0x0bf489a4,
-	0x0789c421,
-	0xbb0394b6,
-	0x90b6009d,
-	0x009e9808,
-	0xb6019f98,
-	0x84f00180,
-	0x00d8b50f,
-/* 0x0063: queue_get_done */
-	0xf80132f4,
-/* 0x0065: nv_rd32 */
-	0xf0ecb200,
-	0x00801fc9,
-	0x0cf601ca,
-/* 0x0073: nv_rd32_wait */
-	0x8c04bd00,
-	0xcf01ca00,
-	0xccc800cc,
-	0xf61bf41f,
-	0xec7e060a,
-	0x008f0000,
-	0xffcf01cb,
-/* 0x008f: nv_wr32 */
-	0x8000f800,
-	0xf601cc00,
-	0x04bd000f,
-	0xc9f0ecb2,
-	0x1ec9f01f,
+	0x31f40131,
+	0x00d89800,
+	0xa401d998,
+	0x2c0bf489,
+	0xb60789c4,
+	0x9dbb0394,
+	0x0890b600,
+	0x98009e98,
+	0x80b6019f,
+	0x0f84f001,
+	0xf400d8b5,
+	0xd9980132,
+	0xf489a401,
+	0x32f4060b,
+/* 0x0071: queue_get_done */
+/* 0x0073: nv_rd32 */
+	0xb200f800,
+	0x1fc9f0ec,
 	0x01ca0080,
 	0xbd000cf6,
-/* 0x00a9: nv_wr32_wait */
+/* 0x0081: nv_rd32_wait */
 	0xca008c04,
 	0x00cccf01,
 	0xf41fccc8,
-	0x00f8f61b,
-/* 0x00b8: wait_donez */
-	0x99f094bd,
-	0x37008000,
-	0x0009f602,
-	0x008004bd,
-	0x0af60206,
-/* 0x00cf: wait_donez_ne */
-	0x8804bd00,
-	0xcf010000,
-	0x8aff0088,
-	0xf61bf488,
-	0x99f094bd,
-	0x17008000,
-	0x0009f602,
-	0x00f804bd,
-/* 0x00ec: wait_doneo */
-	0x99f094bd,
-	0x37008000,
-	0x0009f602,
-	0x008004bd,
-	0x0af60206,
-/* 0x0103: wait_doneo_e */
-	0x8804bd00,
-	0xcf010000,
-	0x8aff0088,
-	0xf60bf488,
-	0x99f094bd,
-	0x17008000,
-	0x0009f602,
-	0x00f804bd,
-/* 0x0120: mmctx_size */
-/* 0x0122: nv_mmctx_size_loop */
-	0xe89894bd,
-	0x1a85b600,
-	0xb60180b6,
-	0x98bb0284,
-	0x04e0b600,
-	0x1bf4efa4,
-	0xf89fb2ec,
-/* 0x013d: mmctx_xfer */
-	0xf094bd00,
-	0x00800199,
-	0x09f60237,
-	0xbd04bd00,
-	0x05bbfd94,
-	0x800f0bf4,
-	0xf601c400,
-	0x04bd000b,
-/* 0x015f: mmctx_base_disabled */
-	0xfd0099f0,
-	0x0bf405ee,
-	0xc6008018,
-	0x000ef601,
-	0x008004bd,
-	0x0ff601c7,
-	0xf004bd00,
-/* 0x017a: mmctx_multi_disabled */
-	0xabc80199,
-	0x10b4b600,
-	0xc80cb9f0,
-	0xe4b601ae,
-	0x05befd11,
-	0x01c50080,
-	0xbd000bf6,
-/* 0x0195: mmctx_exec_loop */
-/* 0x0195: mmctx_wait_free */
-	0xc5008e04,
-	0x00eecf01,
-	0xf41fe4f0,
-	0xce98f60b,
-	0x05e9fd00,
-	0x01c80080,
-	0xbd000ef6,
-	0x04c0b604,
-	0x1bf4cda4,
-	0x02abc8df,
-/* 0x01bf: mmctx_fini_wait */
-	0x8b1c1bf4,
-	0xcf01c500,
-	0xb4f000bb,
-	0x10b4b01f,
-	0x0af31bf4,
-	0x00b87e05,
-	0x250ef400,
-/* 0x01d8: mmctx_stop */
-	0xb600abc8,
-	0xb9f010b4,
-	0x12b9f00c,
-	0x01c50080,
-	0xbd000bf6,
-/* 0x01ed: mmctx_stop_wait */
-	0xc5008b04,
-	0x00bbcf01,
-	0xf412bbc8,
-/* 0x01fa: mmctx_done */
+	0x060af61b,
+	0x0000fa7e,
+	0x01cb008f,
+	0xf800ffcf,
+/* 0x009d: nv_wr32 */
+	0xcc008000,
+	0x000ff601,
+	0xecb204bd,
+	0xf01fc9f0,
+	0x00801ec9,
+	0x0cf601ca,
+/* 0x00b7: nv_wr32_wait */
+	0x8c04bd00,
+	0xcf01ca00,
+	0xccc800cc,
+	0xf61bf41f,
+/* 0x00c6: wait_donez */
+	0x94bd00f8,
+	0x800099f0,
+	0xf6023700,
+	0x04bd0009,
+	0x02060080,
+	0xbd000af6,
+/* 0x00dd: wait_donez_ne */
+	0x00008804,
+	0x0088cf01,
+	0xf4888aff,
 	0x94bdf61b,
-	0x800199f0,
+	0x800099f0,
+	0xf6021700,
+	0x04bd0009,
+/* 0x00fa: wait_doneo */
+	0x94bd00f8,
+	0x800099f0,
+	0xf6023700,
+	0x04bd0009,
+	0x02060080,
+	0xbd000af6,
+/* 0x0111: wait_doneo_e */
+	0x00008804,
+	0x0088cf01,
+	0xf4888aff,
+	0x94bdf60b,
+	0x800099f0,
 	0xf6021700,
 	0x04bd0009,
-/* 0x020a: strand_wait */
-	0xa0f900f8,
-	0xb87e020a,
-	0xa0fc0000,
-/* 0x0216: strand_pre */
-	0x0c0900f8,
-	0x024afc80,
+/* 0x012e: mmctx_size */
+	0x94bd00f8,
+/* 0x0130: nv_mmctx_size_loop */
+	0xb600e898,
+	0x80b61a85,
+	0x0284b601,
+	0xb60098bb,
+	0xefa404e0,
+	0xb2ec1bf4,
+/* 0x014b: mmctx_xfer */
+	0xbd00f89f,
+	0x0199f094,
+	0x02370080,
 	0xbd0009f6,
-	0x020a7e04,
-/* 0x0227: strand_post */
-	0x0900f800,
-	0x4afc800d,
-	0x0009f602,
-	0x0a7e04bd,
-	0x00f80002,
-/* 0x0238: strand_set */
-	0xfc800f0c,
-	0x0cf6024f,
-	0x0c04bd00,
-	0x4afc800b,
-	0x000cf602,
-	0xfc8004bd,
-	0x0ef6024f,
-	0x0c04bd00,
-	0x4afc800a,
-	0x000cf602,
-	0x0a7e04bd,
-	0x00f80002,
-/* 0x0268: strand_ctx_init */
+	0xfd94bd04,
+	0x0bf405bb,
+	0xc400800f,
+	0x000bf601,
+	0x99f004bd,
+/* 0x016d: mmctx_base_disabled */
+	0x05eefd00,
+	0x80180bf4,
+	0xf601c600,
+	0x04bd000e,
+	0x01c70080,
+	0xbd000ff6,
+	0x0199f004,
+/* 0x0188: mmctx_multi_disabled */
+	0xb600abc8,
+	0xb9f010b4,
+	0x01aec80c,
+	0xfd11e4b6,
+	0x008005be,
+	0x0bf601c5,
+/* 0x01a3: mmctx_exec_loop */
+/* 0x01a3: mmctx_wait_free */
+	0x8e04bd00,
+	0xcf01c500,
+	0xe4f000ee,
+	0xf60bf41f,
+	0xfd00ce98,
+	0x008005e9,
+	0x0ef601c8,
+	0xb604bd00,
+	0xcda404c0,
+	0xc8df1bf4,
+	0x1bf402ab,
+/* 0x01cd: mmctx_fini_wait */
+	0xc5008b1c,
+	0x00bbcf01,
+	0xb01fb4f0,
+	0x1bf410b4,
+	0x7e050af3,
+	0xf40000c6,
+/* 0x01e6: mmctx_stop */
+	0xabc8250e,
+	0x10b4b600,
+	0xf00cb9f0,
+	0x008012b9,
+	0x0bf601c5,
+/* 0x01fb: mmctx_stop_wait */
+	0x8b04bd00,
+	0xcf01c500,
+	0xbbc800bb,
+	0xf61bf412,
+/* 0x0208: mmctx_done */
 	0x99f094bd,
-	0x37008003,
+	0x17008001,
 	0x0009f602,
-	0x167e04bd,
-	0x030e0002,
-	0x0002387e,
-	0xfc80c4bd,
-	0x0cf60247,
-	0x0c04bd00,
-	0x4afc8001,
-	0x000cf602,
-	0x0a7e04bd,
-	0x0c920002,
-	0x46fc8001,
-	0x000cf602,
-	0x020c04bd,
-	0x024afc80,
+	0x00f804bd,
+/* 0x0218: strand_wait */
+	0x020aa0f9,
+	0x0000c67e,
+	0x00f8a0fc,
+/* 0x0224: strand_pre */
+	0xfc800c09,
+	0x09f6024a,
+	0x7e04bd00,
+	0xf8000218,
+/* 0x0235: strand_post */
+	0x800d0900,
+	0xf6024afc,
+	0x04bd0009,
+	0x0002187e,
+/* 0x0246: strand_set */
+	0x0f0c00f8,
+	0x024ffc80,
 	0xbd000cf6,
-	0x020a7e04,
-	0x02277e00,
-	0x42008800,
-	0x20008902,
-	0x0099cf02,
-/* 0x02c7: ctx_init_strand_loop */
-	0xf608fe95,
-	0x8ef6008e,
-	0x808acf40,
-	0xb606a5b6,
-	0xeabb01a0,
-	0x0480b600,
-	0xf40192b6,
-	0xe4b6e81b,
-	0xf2efbc08,
-	0x99f094bd,
-	0x17008003,
-	0x0009f602,
+	0x800b0c04,
+	0xf6024afc,
+	0x04bd000c,
+	0x024ffc80,
+	0xbd000ef6,
+	0x800a0c04,
+	0xf6024afc,
+	0x04bd000c,
+	0x0002187e,
+/* 0x0276: strand_ctx_init */
+	0x94bd00f8,
+	0x800399f0,
+	0xf6023700,
+	0x04bd0009,
+	0x0002247e,
+	0x467e030e,
+	0xc4bd0002,
+	0x0247fc80,
+	0xbd000cf6,
+	0x80010c04,
+	0xf6024afc,
+	0x04bd000c,
+	0x0002187e,
+	0x80010c92,
+	0xf60246fc,
+	0x04bd000c,
+	0xfc80020c,
+	0x0cf6024a,
+	0x7e04bd00,
+	0x7e000218,
+	0x88000235,
+	0x89024200,
+	0xcf022000,
+	0xfe950099,
+/* 0x02d5: ctx_init_strand_loop */
+	0x008ef608,
+	0xcf408ef6,
+	0xa5b6808a,
+	0x01a0b606,
+	0xb600eabb,
+	0x92b60480,
+	0xe81bf401,
+	0xbc08e4b6,
+	0x94bdf2ef,
+	0x800399f0,
+	0xf6021700,
+	0x04bd0009,
+/* 0x0306: error */
+	0x008000f8,
+	0x0ff60205,
+	0x0f04bd00,
+	0x07008001,
+	0x000ff603,
 	0x00f804bd,
-/* 0x02f8: error */
-	0x02050080,
-	0xbd000ff6,
-	0x80010f04,
-	0xf6030700,
-	0x04bd000f,
-/* 0x030e: init */
-	0x04bd00f8,
-	0x410007fe,
-	0x11cf4200,
-	0x0911e700,
-	0x0814b601,
-	0x020014fe,
-	0x12004002,
-	0xbd0002f6,
-	0x05c94104,
-	0xbd0010fe,
-	0x07004024,
-	0xbd0002f6,
-	0x20034204,
-	0x01010080,
-	0xbd0002f6,
-	0x20044204,
-	0x01010480,
-	0xbd0002f6,
-	0x200b4204,
-	0x01010880,
-	0xbd0002f6,
-	0x200c4204,
-	0x01011c80,
+/* 0x031c: init */
+	0x07fe04bd,
+	0x42004100,
+	0xe70011cf,
+	0xb6010911,
+	0x14fe0814,
+	0x40020200,
+	0x02f61200,
+	0xf404bd00,
+	0xd7410032,
+	0x0010fe05,
+	0x004024bd,
+	0x0002f607,
+	0x034204bd,
+	0x01008020,
+	0x0002f601,
+	0x044204bd,
+	0x01048020,
+	0x0002f601,
+	0x0b4204bd,
+	0x01088020,
+	0x0002f601,
+	0x0c4204bd,
+	0x011c8020,
+	0x0002f601,
+	0x039204bd,
+	0x09008001,
+	0x0003f603,
+	0x044204bd,
+	0x04004087,
 	0xbd0002f6,
-	0x01039204,
-	0x03090080,
-	0xbd0003f6,
-	0x87044204,
-	0xf6040040,
-	0x04bd0002,
-	0x00400402,
-	0x0002f603,
-	0x31f404bd,
-	0x96048e10,
-	0x00657e40,
-	0xc7feb200,
-	0x01b590f1,
-	0x1ff4f003,
-	0x01020fb5,
-	0x041fbb01,
-	0x800112b6,
-	0xf6010300,
-	0x04bd0001,
-	0x01040080,
+	0x40040204,
+	0x02f60300,
+	0xf404bd00,
+	0x048e1031,
+	0x737e4096,
+	0xfeb20000,
+	0xb590f1c7,
+	0xf4f00301,
+	0x020fb51f,
+	0x1fbb0101,
+	0x0112b604,
+	0x01030080,
 	0xbd0001f6,
-	0x01004104,
-	0xac7e020f,
-	0xbb7e0006,
-	0x100f0006,
-	0x0006fd7e,
-	0x98000e98,
-	0x207e010f,
-	0x14950001,
-	0xc0008008,
-	0x0004f601,
-	0x008004bd,
-	0x04f601c1,
-	0xb704bd00,
-	0xbb130030,
-	0xf5b6001f,
-	0xd3008002,
-	0x000ff601,
-	0x15b604bd,
-	0x0110b608,
-	0xb20814b6,
-	0x02687e1f,
-	0x001fbb00,
-	0x84020398,
-/* 0x041f: init_gpc */
-	0xb8502000,
-	0x0008044e,
-	0x8f7e1fb2,
+	0x04008004,
+	0x0001f601,
+	0x004104bd,
+	0x7e020f01,
+	0x7e0006ba,
+	0x0f0006c9,
+	0x070b7e10,
+	0x000e9800,
+	0x7e010f98,
+	0x9500012e,
+	0x00800814,
+	0x04f601c0,
+	0x8004bd00,
+	0xf601c100,
+	0x04bd0004,
+	0x130030b7,
+	0xb6001fbb,
+	0x008002f5,
+	0x0ff601d3,
+	0xb604bd00,
+	0x10b60815,
+	0x0814b601,
+	0x767e1fb2,
+	0x1fbb0002,
+	0x02039800,
+	0x50200084,
+/* 0x0430: init_gpc */
+	0x08044eb8,
+	0x7e1fb200,
+	0xb800009d,
+	0x00010c4e,
+	0x9d7ef4bd,
 	0x4eb80000,
-	0xbd00010c,
-	0x008f7ef4,
-	0x044eb800,
-	0x8f7e0001,
+	0x7e000104,
+	0xb800009d,
+	0x0001004e,
+	0x9d7e020f,
 	0x4eb80000,
-	0x0f000100,
-	0x008f7e02,
-	0x004eb800,
-/* 0x044e: init_gpc_wait */
-	0x657e0008,
-	0xffc80000,
-	0xf90bf41f,
-	0x08044eb8,
-	0x00657e00,
-	0x001fbb00,
-	0x800040b7,
-	0xf40132b6,
-	0x000fb41b,
-	0x0006fd7e,
-	0xac7e000f,
-	0x00800006,
-	0x01f60201,
-	0xbd04bd00,
-	0x1f19f014,
-	0x02300080,
-	0xbd0001f6,
-/* 0x0491: main */
-	0x0031f404,
-	0x0d0028f4,
-	0x00377e10,
-	0xf401f400,
-	0x4001e4b1,
-	0x00c71bf5,
-	0x99f094bd,
-	0x37008004,
-	0x0009f602,
-	0x008104bd,
-	0x11cf02c0,
-	0xc1008200,
-	0x0022cf02,
-	0xf41f13c8,
-	0x23c8770b,
-	0x550bf41f,
+/* 0x045f: init_gpc_wait */
+	0x7e000800,
+	0xc8000073,
+	0x0bf41fff,
+	0x044eb8f9,
+	0x737e0008,
+	0x1fbb0000,
+	0x0040b700,
+	0x0132b680,
+	0x0fb41bf4,
+	0x070b7e00,
+	0x7e000f00,
+	0x800006ba,
+	0xf6020100,
+	0x04bd0001,
+	0x19f014bd,
+	0x3000801f,
+	0x0001f602,
+/* 0x04a2: main */
+	0x28f404bd,
+	0x7e100d00,
+	0xf4000037,
+	0xe4b1f701,
+	0x1bf54001,
+	0x94bd00c7,
+	0x800499f0,
+	0xf6023700,
+	0x04bd0009,
+	0x02c00081,
+	0x820011cf,
+	0xcf02c100,
+	0x13c80022,
+	0x770bf41f,
+	0xf41f23c8,
+	0x20f9550b,
+	0x94bd12b2,
+	0x800799f0,
+	0xf6023700,
+	0x04bd0009,
+	0xf40132f4,
+	0x8e7e0231,
+	0x94bd0008,
+	0x800799f0,
+	0xf6021700,
+	0x04bd0009,
+	0x94bd20fc,
+	0x800699f0,
+	0xf6023700,
+	0x04bd0009,
+	0x7e0131f4,
+	0xbd00088e,
+	0x0699f094,
+	0x02170080,
+	0xbd0009f6,
+	0x2f0ef404,
+/* 0x0530: chsw_prev_no_next */
 	0x12b220f9,
-	0x99f094bd,
-	0x37008007,
-	0x0009f602,
-	0x32f404bd,
-	0x0231f401,
-	0x0008807e,
-	0x99f094bd,
-	0x17008007,
-	0x0009f602,
-	0x20fc04bd,
-	0x99f094bd,
-	0x37008006,
-	0x0009f602,
-	0x31f404bd,
-	0x08807e01,
-	0xf094bd00,
-	0x00800699,
-	0x09f60217,
-	0xf404bd00,
-/* 0x0522: chsw_prev_no_next */
-	0x20f92f0e,
-	0x32f412b2,
-	0x0232f401,
-	0x0008807e,
-	0x008020fc,
-	0x02f602c0,
-	0xf404bd00,
-/* 0x053e: chsw_no_prev */
-	0x23c8130e,
-	0x0d0bf41f,
-	0xf40131f4,
-	0x807e0232,
-/* 0x054e: chsw_done */
-	0x01020008,
-	0x02c30080,
+	0xf40132f4,
+	0x8e7e0232,
+	0x20fc0008,
+	0x02c00080,
 	0xbd0002f6,
-	0xf094bd04,
-	0x00800499,
-	0x09f60217,
-	0xf504bd00,
-/* 0x056b: main_not_ctx_switch */
-	0xb0ff2a0e,
-	0x1bf401e4,
-	0x7ef2b20c,
-	0xf4000820,
-/* 0x057a: main_not_ctx_chan */
-	0xe4b0400e,
-	0x2c1bf402,
-	0x99f094bd,
-	0x37008007,
-	0x0009f602,
-	0x32f404bd,
+	0x130ef404,
+/* 0x054c: chsw_no_prev */
+	0xf41f23c8,
+	0x31f40d0b,
 	0x0232f401,
-	0x0008807e,
-	0x99f094bd,
-	0x17008007,
-	0x0009f602,
-	0x0ef404bd,
-/* 0x05a9: main_not_ctx_save */
-	0x10ef9411,
-	0x7e01f5f0,
-	0xf50002f8,
-/* 0x05b7: main_done */
-	0xbdfede0e,
-	0x1f29f024,
-	0x02300080,
-	0xbd0002f6,
-	0xcc0ef504,
-/* 0x05c9: ih */
-	0xf900f9fe,
-	0x0188fe80,
-	0x90f980f9,
-	0xb0f9a0f9,
-	0xe0f9d0f9,
-	0x04bdf0f9,
-	0xcf02004a,
-	0xabc400aa,
-	0x230bf404,
-	0x004e100d,
-	0x00eecf1a,
-	0xcf19004f,
-	0x047e00ff,
-	0xb0b70000,
-	0x010e0400,
-	0xf61d0040,
-	0x04bd000e,
-/* 0x060c: ih_no_fifo */
-	0x0100abe4,
-	0x0d0c0bf4,
-	0x40014e10,
+	0x00088e7e,
+/* 0x055c: chsw_done */
+	0x00800102,
+	0x02f602c3,
+	0xbd04bd00,
+	0x0499f094,
+	0x02170080,
+	0xbd0009f6,
+	0x2d0ef504,
+/* 0x0579: main_not_ctx_switch */
+	0x01e4b0ff,
+	0xb20c1bf4,
+	0x082e7ef2,
+	0x400ef400,
+/* 0x0588: main_not_ctx_chan */
+	0xf402e4b0,
+	0x94bd2c1b,
+	0x800799f0,
+	0xf6023700,
+	0x04bd0009,
+	0xf40132f4,
+	0x8e7e0232,
+	0x94bd0008,
+	0x800799f0,
+	0xf6021700,
+	0x04bd0009,
+/* 0x05b7: main_not_ctx_save */
+	0x94110ef4,
+	0xf5f010ef,
+	0x03067e01,
+	0xe10ef500,
+/* 0x05c5: main_done */
+	0xf024bdfe,
+	0x00801f29,
+	0x02f60230,
+	0xf504bd00,
+/* 0x05d7: ih */
+	0xf9fecf0e,
+	0xfe80f900,
+	0x80f90188,
+	0xa0f990f9,
+	0xd0f9b0f9,
+	0xf0f9e0f9,
+	0x004a04bd,
+	0x00aacf02,
+	0xf404abc4,
+	0x100d230b,
+	0xcf1a004e,
+	0x004f00ee,
+	0x00ffcf19,
 	0x0000047e,
-/* 0x061c: ih_no_ctxsw */
-	0x0400abe4,
-	0x8e560bf4,
-	0x7e400708,
-	0xb2000065,
-	0x040080ff,
-	0x000ff602,
-	0x048e04bd,
-	0x657e4007,
-	0xffb20000,
-	0x02030080,
+	0x0400b0b7,
+	0x0040010e,
+	0x000ef61d,
+/* 0x061a: ih_no_fifo */
+	0xabe404bd,
+	0x0bf40100,
+	0x4e100d0c,
+	0x047e4001,
+/* 0x062a: ih_no_ctxsw */
+	0xabe40000,
+	0x0bf40400,
+	0x07088e56,
+	0x00737e40,
+	0x80ffb200,
+	0xf6020400,
+	0x04bd000f,
+	0x4007048e,
+	0x0000737e,
+	0x0080ffb2,
+	0x0ff60203,
+	0xc704bd00,
+	0xee9450fe,
+	0x07008f02,
+	0x00efbb40,
+	0x0000737e,
+	0x02020080,
 	0xbd000ff6,
-	0x50fec704,
-	0x8f02ee94,
-	0xbb400700,
-	0x657e00ef,
-	0x00800000,
-	0x0ff60202,
-	0x0f04bd00,
-	0x02f87e03,
-	0x01004b00,
-	0x448ebfb2,
-	0x8f7e4001,
-/* 0x0676: ih_no_fwmthd */
-	0x044b0000,
-	0xffb0bd05,
-	0x0bf4b4ab,
-	0x0700800c,
-	0x000bf603,
-/* 0x068a: ih_no_other */
-	0x004004bd,
-	0x000af601,
-	0xf0fc04bd,
-	0xd0fce0fc,
-	0xa0fcb0fc,
-	0x80fc90fc,
-	0xfc0088fe,
-	0xf400fc80,
-	0x01f80032,
-/* 0x06ac: ctx_4170s */
-	0xb210f5f0,
-	0x41708eff,
-	0x008f7e40,
-/* 0x06bb: ctx_4170w */
-	0x8e00f800,
+	0x7e030f04,
+	0x4b000306,
+	0xbfb20100,
+	0x4001448e,
+	0x00009d7e,
+/* 0x0684: ih_no_fwmthd */
+	0xbd05044b,
+	0xb4abffb0,
+	0x800c0bf4,
+	0xf6030700,
+	0x04bd000b,
+/* 0x0698: ih_no_other */
+	0xf6010040,
+	0x04bd000a,
+	0xe0fcf0fc,
+	0xb0fcd0fc,
+	0x90fca0fc,
+	0x88fe80fc,
+	0xfc80fc00,
+	0x0032f400,
+/* 0x06ba: ctx_4170s */
+	0xf5f001f8,
+	0x8effb210,
 	0x7e404170,
-	0xb2000065,
-	0x10f4f0ff,
-	0xf8f31bf4,
-/* 0x06cd: ctx_redswitch */
-	0x02004e00,
-	0xf040e5f0,
-	0xe5f020e5,
-	0x85008010,
-	0x000ef601,
-	0x080f04bd,
-/* 0x06e4: ctx_redswitch_delay */
-	0xf401f2b6,
-	0xe5f1fd1b,
-	0xe5f10400,
-	0x00800100,
-	0x0ef60185,
-	0xf804bd00,
-/* 0x06fd: ctx_86c */
-	0x23008000,
-	0x000ff602,
-	0xffb204bd,
-	0x408a148e,
-	0x00008f7e,
-	0x8c8effb2,
-	0x8f7e41a8,
-	0x00f80000,
-/* 0x071c: ctx_mem */
-	0x02840080,
+	0xf800009d,
+/* 0x06c9: ctx_4170w */
+	0x41708e00,
+	0x00737e40,
+	0xf0ffb200,
+	0x1bf410f4,
+/* 0x06db: ctx_redswitch */
+	0x4e00f8f3,
+	0xe5f00200,
+	0x20e5f040,
+	0x8010e5f0,
+	0xf6018500,
+	0x04bd000e,
+/* 0x06f2: ctx_redswitch_delay */
+	0xf2b6080f,
+	0xfd1bf401,
+	0x0400e5f1,
+	0x0100e5f1,
+	0x01850080,
+	0xbd000ef6,
+/* 0x070b: ctx_86c */
+	0x8000f804,
+	0xf6022300,
+	0x04bd000f,
+	0x148effb2,
+	0x9d7e408a,
+	0xffb20000,
+	0x41a88c8e,
+	0x00009d7e,
+/* 0x072a: ctx_mem */
+	0x008000f8,
+	0x0ff60284,
+/* 0x0733: ctx_mem_wait */
+	0x8f04bd00,
+	0xcf028400,
+	0xfffd00ff,
+	0xf61bf405,
+/* 0x0742: ctx_load */
+	0x94bd00f8,
+	0x800599f0,
+	0xf6023700,
+	0x04bd0009,
+	0xc67e0c0a,
+	0xf4bd0000,
+	0x02890080,
 	0xbd000ff6,
-/* 0x0725: ctx_mem_wait */
-	0x84008f04,
-	0x00ffcf02,
-	0xf405fffd,
-	0x00f8f61b,
-/* 0x0734: ctx_load */
-	0x99f094bd,
-	0x37008005,
-	0x0009f602,
-	0x0c0a04bd,
-	0x0000b87e,
-	0x0080f4bd,
-	0x0ff60289,
-	0x8004bd00,
-	0xf602c100,
-	0x04bd0002,
-	0x02830080,
+	0xc1008004,
+	0x0002f602,
+	0x008004bd,
+	0x02f60283,
+	0x0f04bd00,
+	0x072a7e07,
+	0xc0008000,
+	0x0002f602,
+	0x0bfe04bd,
+	0x1f2af000,
+	0xb60424b6,
+	0x94bd0220,
+	0x800899f0,
+	0xf6023700,
+	0x04bd0009,
+	0x02810080,
 	0xbd0002f6,
-	0x7e070f04,
-	0x8000071c,
-	0xf602c000,
-	0x04bd0002,
-	0xf0000bfe,
-	0x24b61f2a,
-	0x0220b604,
+	0x0000d204,
+	0x25f08000,
+	0x88008002,
+	0x0002f602,
+	0x100104bd,
+	0xf0020042,
+	0x12fa0223,
+	0xbd03f805,
+	0x0899f094,
+	0x02170080,
+	0xbd0009f6,
+	0x81019804,
+	0x981814b6,
+	0x25b68002,
+	0x0512fd08,
+	0xbd1601b5,
+	0x0999f094,
+	0x02370080,
+	0xbd0009f6,
+	0x81008004,
+	0x0001f602,
+	0x010204bd,
+	0x02880080,
+	0xbd0002f6,
+	0x01004104,
+	0xfa0613f0,
+	0x03f80501,
 	0x99f094bd,
-	0x37008008,
+	0x17008009,
 	0x0009f602,
-	0x008004bd,
-	0x02f60281,
-	0xd204bd00,
-	0x80000000,
-	0x800225f0,
-	0xf6028800,
-	0x04bd0002,
-	0x00421001,
-	0x0223f002,
-	0xf80512fa,
-	0xf094bd03,
-	0x00800899,
-	0x09f60217,
-	0x9804bd00,
-	0x14b68101,
-	0x80029818,
-	0xfd0825b6,
-	0x01b50512,
-	0xf094bd16,
-	0x00800999,
-	0x09f60237,
-	0x8004bd00,
-	0xf6028100,
-	0x04bd0001,
-	0x00800102,
-	0x02f60288,
-	0x4104bd00,
-	0x13f00100,
-	0x0501fa06,
-	0x94bd03f8,
-	0x800999f0,
+	0x94bd04bd,
+	0x800599f0,
 	0xf6021700,
 	0x04bd0009,
-	0x99f094bd,
-	0x17008005,
-	0x0009f602,
-	0x00f804bd,
-/* 0x0820: ctx_chan */
-	0x0007347e,
-	0xb87e0c0a,
-	0x050f0000,
-	0x00071c7e,
-/* 0x0832: ctx_mmio_exec */
-	0x039800f8,
-	0x81008041,
-	0x0003f602,
-	0x34bd04bd,
-/* 0x0840: ctx_mmio_loop */
-	0xf4ff34c4,
-	0x00450e1b,
-	0x0653f002,
-	0xf80535fa,
-/* 0x0851: ctx_mmio_pull */
-	0x804e9803,
-	0x7e814f98,
-	0xb600008f,
-	0x12b60830,
-	0xdf1bf401,
-/* 0x0864: ctx_mmio_done */
-	0x80160398,
+/* 0x082e: ctx_chan */
+	0x427e00f8,
+	0x0c0a0007,
+	0x0000c67e,
+	0x2a7e050f,
+	0x00f80007,
+/* 0x0840: ctx_mmio_exec */
+	0x80410398,
 	0xf6028100,
 	0x04bd0003,
-	0x414000b5,
-	0x13f00100,
-	0x0601fa06,
-	0x00f803f8,
-/* 0x0880: ctx_xfer */
-	0x0080040e,
-	0x0ef60302,
-/* 0x088b: ctx_xfer_idle */
-	0x8e04bd00,
-	0xcf030000,
-	0xe4f100ee,
-	0x1bf42000,
-	0x0611f4f5,
-/* 0x089f: ctx_xfer_pre */
-	0x0f0c02f4,
-	0x06fd7e10,
-	0x1b11f400,
-/* 0x08a8: ctx_xfer_pre_load */
-	0xac7e020f,
-	0xbb7e0006,
-	0xcd7e0006,
-	0xf4bd0006,
-	0x0006ac7e,
-	0x0007347e,
-/* 0x08c0: ctx_xfer_exec */
-	0xbd160198,
-	0x05008024,
-	0x0002f601,
-	0x1fb204bd,
-	0x41a5008e,
-	0x00008f7e,
-	0xf001fcf0,
-	0x24b6022c,
-	0x05f2fd01,
-	0x048effb2,
-	0x8f7e41a5,
-	0x167e0000,
-	0x24bd0002,
-	0x0247fc80,
-	0xbd0002f6,
-	0x012cf004,
-	0x800320b6,
-	0xf6024afc,
+/* 0x084e: ctx_mmio_loop */
+	0x34c434bd,
+	0x0e1bf4ff,
+	0xf0020045,
+	0x35fa0653,
+/* 0x085f: ctx_mmio_pull */
+	0x9803f805,
+	0x4f98804e,
+	0x009d7e81,
+	0x0830b600,
+	0xf40112b6,
+/* 0x0872: ctx_mmio_done */
+	0x0398df1b,
+	0x81008016,
+	0x0003f602,
+	0x00b504bd,
+	0x01004140,
+	0xfa0613f0,
+	0x03f80601,
+/* 0x088e: ctx_xfer */
+	0x040e00f8,
+	0x03020080,
+	0xbd000ef6,
+/* 0x0899: ctx_xfer_idle */
+	0x00008e04,
+	0x00eecf03,
+	0x2000e4f1,
+	0xf4f51bf4,
+	0x02f40611,
+/* 0x08ad: ctx_xfer_pre */
+	0x7e100f0c,
+	0xf400070b,
+/* 0x08b6: ctx_xfer_pre_load */
+	0x020f1b11,
+	0x0006ba7e,
+	0x0006c97e,
+	0x0006db7e,
+	0xba7ef4bd,
+	0x427e0006,
+/* 0x08ce: ctx_xfer_exec */
+	0x01980007,
+	0x8024bd16,
+	0xf6010500,
 	0x04bd0002,
-	0xf001acf0,
-	0x000b06a5,
-	0x98000c98,
-	0x000e010d,
-	0x00013d7e,
-	0xec7e080a,
-	0x0a7e0000,
-	0x01f40002,
-	0x7e0c0a12,
-	0x0f0000b8,
-	0x071c7e05,
-	0x2d02f400,
-/* 0x093c: ctx_xfer_post */
-	0xac7e020f,
+	0x008e1fb2,
+	0x9d7e41a5,
+	0xfcf00000,
+	0x022cf001,
+	0xfd0124b6,
+	0xffb205f2,
+	0x41a5048e,
+	0x00009d7e,
+	0x0002247e,
+	0xfc8024bd,
+	0x02f60247,
+	0xf004bd00,
+	0x20b6012c,
+	0x4afc8003,
+	0x0002f602,
+	0xacf004bd,
+	0x06a5f001,
+	0x0c98000b,
+	0x010d9800,
+	0x4b7e000e,
+	0x080a0001,
+	0x0000fa7e,
+	0x0002187e,
+	0x0a1201f4,
+	0x00c67e0c,
+	0x7e050f00,
+	0xf400072a,
+/* 0x094a: ctx_xfer_post */
+	0x020f2d02,
+	0x0006ba7e,
+	0x0b7ef4bd,
+	0x357e0007,
+	0xc97e0002,
 	0xf4bd0006,
-	0x0006fd7e,
-	0x0002277e,
-	0x0006bb7e,
-	0xac7ef4bd,
-	0x11f40006,
-	0x40019810,
-	0xf40511fd,
-	0x327e070b,
-/* 0x0966: ctx_xfer_no_post_mmio */
-/* 0x0966: ctx_xfer_done */
-	0x00f80008,
-	0x00000000,
-	0x00000000,
-	0x00000000,
-	0x00000000,
+	0x0006ba7e,
+	0x981011f4,
+	0x11fd4001,
+	0x070bf405,
+	0x0008407e,
+/* 0x0974: ctx_xfer_no_post_mmio */
+/* 0x0974: ctx_xfer_done */
+	0x000000f8,
 	0x00000000,
 	0x00000000,
 	0x00000000,
-- 
2.5.5