From 4382e9091c219305c1b3d7a074528bce8acc2b84 Mon Sep 17 00:00:00 2001
From: Karol Herbst <nouveau@karolherbst.de>
Date: Wed, 2 Mar 2016 17:23:04 +0100
Subject: [PATCH] drm/nouveau/pmu/fuc: fix imm32 for gk208+

Signed-off-by: Karol Herbst <nouveau@karolherbst.de>
Reviewed-by: Martin Peres <martin.peres@free.fr>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
---
 .../drm/nouveau/nvkm/subdev/pmu/fuc/gk208.fuc5.h   | 882 ++++++++++-----------
 .../gpu/drm/nouveau/nvkm/subdev/pmu/fuc/macros.fuc |   2 +-
 2 files changed, 442 insertions(+), 442 deletions(-)

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gk208.fuc5.h b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gk208.fuc5.h
index 8a2b628642ac..11179c120935 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gk208.fuc5.h
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/gk208.fuc5.h
@@ -24,8 +24,8 @@ uint32_t gk208_pmu_data[] = {
 	0x00000000,
 /* 0x0058: proc_list_head */
 	0x54534f48,
-	0x00000447,
-	0x000003f8,
+	0x00000437,
+	0x000003e8,
 	0x00000000,
 	0x00000000,
 	0x00000000,
@@ -46,8 +46,8 @@ uint32_t gk208_pmu_data[] = {
 	0x00000000,
 	0x00000000,
 	0x584d454d,
-	0x00000621,
-	0x00000613,
+	0x000005fe,
+	0x000005f0,
 	0x00000000,
 	0x00000000,
 	0x00000000,
@@ -68,8 +68,8 @@ uint32_t gk208_pmu_data[] = {
 	0x00000000,
 	0x00000000,
 	0x46524550,
-	0x00000625,
-	0x00000623,
+	0x00000602,
+	0x00000600,
 	0x00000000,
 	0x00000000,
 	0x00000000,
@@ -90,8 +90,8 @@ uint32_t gk208_pmu_data[] = {
 	0x00000000,
 	0x00000000,
 	0x5f433249,
-	0x00000a29,
-	0x000008d0,
+	0x00000a03,
+	0x000008ad,
 	0x00000000,
 	0x00000000,
 	0x00000000,
@@ -112,8 +112,8 @@ uint32_t gk208_pmu_data[] = {
 	0x00000000,
 	0x00000000,
 	0x54534554,
-	0x00000a4a,
-	0x00000a2b,
+	0x00000a24,
+	0x00000a05,
 	0x00000000,
 	0x00000000,
 	0x00000000,
@@ -134,8 +134,8 @@ uint32_t gk208_pmu_data[] = {
 	0x00000000,
 	0x00000000,
 	0x454c4449,
-	0x00000a55,
-	0x00000a53,
+	0x00000a2f,
+	0x00000a2d,
 	0x00000000,
 	0x00000000,
 	0x00000000,
@@ -229,26 +229,26 @@ uint32_t gk208_pmu_data[] = {
 /* 0x0370: memx_func_head */
 	0x00000001,
 	0x00000000,
-	0x00000477,
+	0x00000467,
 /* 0x037c: memx_func_next */
 	0x00000002,
 	0x00000000,
-	0x000004f4,
+	0x000004da,
 	0x00000003,
 	0x00000002,
-	0x00000574,
+	0x00000551,
 	0x00040004,
 	0x00000000,
-	0x00000591,
+	0x0000056e,
 	0x00010005,
 	0x00000000,
-	0x000005ab,
+	0x00000588,
 	0x00010006,
 	0x00000000,
-	0x0000056f,
+	0x0000054c,
 	0x00000007,
 	0x00000000,
-	0x000005b7,
+	0x00000594,
 /* 0x03c4: memx_func_tail */
 /* 0x03c4: memx_ts_start */
 	0x00000000,
@@ -916,7 +916,7 @@ uint32_t gk208_pmu_data[] = {
 };
 
 uint32_t gk208_pmu_code[] = {
-	0x03100ef5,
+	0x03000ef5,
 /* 0x0004: rd32 */
 	0xf607a040,
 	0x04bd000e,
@@ -972,7 +972,7 @@ uint32_t gk208_pmu_code[] = {
 	0x0a98280b,
 	0x029abb9a,
 	0x0d0e1cf4,
-	0x02557e01,
+	0x02457e01,
 	0xf494bd00,
 /* 0x00c2: intr_watchdog_next_time */
 	0x0a98140e,
@@ -1017,7 +1017,7 @@ uint32_t gk208_pmu_code[] = {
 	0xc0f900cc,
 	0xf14f484e,
 	0x0d5453e3,
-	0x02b67e00,
+	0x02a67e00,
 	0x40c0fc00,
 	0x0cf604c0,
 /* 0x0167: intr_subintr_skip_fifo */
@@ -1037,33 +1037,29 @@ uint32_t gk208_pmu_code[] = {
 	0x0032f400,
 /* 0x019a: ticks_from_ns */
 	0xc0f901f8,
-	0xd7f1b0f9,
-	0xd3f00144,
-	0x6b21f500,
+	0x444db0f9,
+	0x5b21f501,
 	0xe8ccec03,
 	0x00b4b003,
-	0xec120bf4,
-	0xf103e8ee,
-	0xf00144d7,
-	0x21f500d3,
-/* 0x01c2: ticks_from_ns_quit */
-	0xceb2036b,
+	0xec0e0bf4,
+	0x4d03e8ee,
+	0x21f50144,
+/* 0x01ba: ticks_from_ns_quit */
+	0xceb2035b,
 	0xc0fcb0fc,
-/* 0x01ca: ticks_from_us */
+/* 0x01c2: ticks_from_us */
 	0xc0f900f8,
-	0xd7f1b0f9,
-	0xd3f00144,
-	0x6b21f500,
+	0x444db0f9,
+	0x5b21f501,
 	0xb0ceb203,
 	0x0bf400b4,
-/* 0x01e3: ticks_from_us_quit */
+/* 0x01d7: ticks_from_us_quit */
 	0xfce4bd05,
 	0xf8c0fcb0,
-/* 0x01e9: ticks_to_us */
-	0x44d7f100,
-	0x00d3f001,
+/* 0x01dd: ticks_to_us */
+	0x01444d00,
 	0xf8ecedff,
-/* 0x01f5: timer */
+/* 0x01e5: timer */
 	0xf990f900,
 	0x1032f480,
 	0xb003f898,
@@ -1081,17 +1077,17 @@ uint32_t gk208_pmu_code[] = {
 	0xa60088cf,
 	0x080bf4e0,
 	0x1cf4e8a6,
-/* 0x0239: timer_reset */
+/* 0x0229: timer_reset */
 	0xf634000d,
 	0x04bd000e,
-/* 0x0243: timer_enable */
+/* 0x0233: timer_enable */
 	0x089a0eb5,
 	0xf6380001,
 	0x04bd0008,
-/* 0x024c: timer_done */
+/* 0x023c: timer_done */
 	0xfc1031f4,
 	0xf890fc80,
-/* 0x0255: send_proc */
+/* 0x0245: send_proc */
 	0xf980f900,
 	0x05e89890,
 	0xf004e998,
@@ -1106,24 +1102,24 @@ uint32_t gk208_pmu_code[] = {
 	0x90b6038b,
 	0x0794f001,
 	0xf404e9b5,
-/* 0x028e: send_done */
+/* 0x027e: send_done */
 	0x90fc0231,
 	0x00f880fc,
-/* 0x0294: find */
+/* 0x0284: find */
 	0x580880f9,
-/* 0x029b: find_loop */
+/* 0x028b: find_loop */
 	0x980131f4,
 	0xaea6008a,
 	0xb6100bf4,
 	0x86b15880,
 	0x1bf40268,
 	0x0132f4f1,
-/* 0x02b0: find_done */
+/* 0x02a0: find_done */
 	0x80fc8eb2,
-/* 0x02b6: send */
-	0x947e00f8,
+/* 0x02a6: send */
+	0x847e00f8,
 	0x01f40002,
-/* 0x02bf: recv */
+/* 0x02af: recv */
 	0xf900f89b,
 	0x9880f990,
 	0xe99805e8,
@@ -1143,10 +1139,10 @@ uint32_t gk208_pmu_code[] = {
 	0xa5f900ee,
 	0xf8fef0fc,
 	0x0131f400,
-/* 0x030a: recv_done */
+/* 0x02fa: recv_done */
 	0x80fcf0fc,
 	0x00f890fc,
-/* 0x0310: init */
+/* 0x0300: init */
 	0xcf010841,
 	0x11e70011,
 	0x14b60109,
@@ -1165,12 +1161,12 @@ uint32_t gk208_pmu_code[] = {
 	0x011031f4,
 	0xf6380001,
 	0x04bd0001,
-/* 0x035a: init_proc */
+/* 0x034a: init_proc */
 	0xf198580f,
 	0x0016b001,
 	0xf9fa0bf4,
 	0x58f0b615,
-/* 0x036b: mulu32_32_64 */
+/* 0x035b: mulu32_32_64 */
 	0xf9f20ef4,
 	0xf920f910,
 	0x9540f930,
@@ -1191,7 +1187,7 @@ uint32_t gk208_pmu_code[] = {
 	0x00b3bb30,
 	0x30fc40fc,
 	0x10fc20fc,
-/* 0x03ba: host_send */
+/* 0x03aa: host_send */
 	0xb04100f8,
 	0x0011cf04,
 	0xcf04a042,
@@ -1202,18 +1198,18 @@ uint32_t gk208_pmu_code[] = {
 	0x03eb9802,
 	0x9802ec98,
 	0xee9801ed,
-	0x02b67e00,
+	0x02a67e00,
 	0x0110b600,
 	0x400f1ec4,
 	0x0ef604b0,
 	0xf404bd00,
-/* 0x03f6: host_send_done */
+/* 0x03e6: host_send_done */
 	0x00f8c70e,
-/* 0x03f8: host_recv */
+/* 0x03e8: host_recv */
 	0xf14e4941,
 	0xa6525413,
 	0xb90bf4e1,
-/* 0x0404: host_recv_wait */
+/* 0x03f4: host_recv_wait */
 	0xcf04cc41,
 	0xc8420011,
 	0x0022cf04,
@@ -1230,7 +1226,7 @@ uint32_t gk208_pmu_code[] = {
 	0x04bd0002,
 	0x00004002,
 	0xbd0002f6,
-/* 0x0447: host_init */
+/* 0x0437: host_init */
 	0x4100f804,
 	0x14b60080,
 	0x7015f110,
@@ -1243,462 +1239,466 @@ uint32_t gk208_pmu_code[] = {
 	0x0104bd00,
 	0x04c44001,
 	0xbd0001f6,
-/* 0x0477: memx_func_enter */
+/* 0x0467: memx_func_enter */
 	0xf100f804,
 	0xf1162067,
-	0xf1f55d77,
-	0xb2ffff73,
+	0xb2f55d77,
 	0x00047e6e,
 	0xfdd8b200,
 	0x60f90487,
 	0xd0fc80f9,
 	0x2e7ee0fc,
-	0x77f10000,
-	0x73f1fffe,
-	0x6eb2ffff,
-	0x0000047e,
-	0x87fdd8b2,
-	0xf960f904,
-	0xfcd0fc80,
-	0x002e7ee0,
-	0xf067f100,
-	0x7e6eb226,
-	0xb2000004,
-	0x0487fdd8,
-	0x80f960f9,
-	0xe0fcd0fc,
-	0x00002e7e,
-	0xe0400406,
-	0x0006f607,
-/* 0x04de: memx_func_enter_wait */
-	0xc04604bd,
-	0x0066cf07,
-	0xf40464f0,
-	0x2c06f70b,
-	0xb50066cf,
-	0x00f8f106,
-/* 0x04f4: memx_func_leave */
-	0x66cf2c06,
-	0xf206b500,
-	0xe4400406,
-	0x0006f607,
-/* 0x0506: memx_func_leave_wait */
-	0xc04604bd,
-	0x0066cf07,
-	0xf40464f0,
-	0x67f1f71b,
-	0x77f126f0,
-	0x73f00001,
-	0x7e6eb200,
-	0xb2000004,
-	0x0587fdd8,
-	0x80f960f9,
-	0xe0fcd0fc,
-	0x00002e7e,
-	0x162067f1,
+	0xfe070000,
 	0x047e6eb2,
 	0xd8b20000,
-	0xf90587fd,
+	0xf90487fd,
 	0xfc80f960,
 	0x7ee0fcd0,
 	0xf100002e,
-	0xf00aa277,
-	0x6eb20073,
+	0xb226f067,
+	0x00047e6e,
+	0xfdd8b200,
+	0x60f90487,
+	0xd0fc80f9,
+	0x2e7ee0fc,
+	0x04060000,
+	0xf607e040,
+	0x04bd0006,
+/* 0x04c4: memx_func_enter_wait */
+	0xcf07c046,
+	0x64f00066,
+	0xf70bf404,
+	0x66cf2c06,
+	0xf106b500,
+/* 0x04da: memx_func_leave */
+	0x2c0600f8,
+	0xb50066cf,
+	0x0406f206,
+	0xf607e440,
+	0x04bd0006,
+/* 0x04ec: memx_func_leave_wait */
+	0xcf07c046,
+	0x64f00066,
+	0xf71bf404,
+	0x26f067f1,
+	0x6eb20107,
 	0x0000047e,
 	0x87fdd8b2,
 	0xf960f905,
 	0xfcd0fc80,
 	0x002e7ee0,
-/* 0x056f: memx_func_wait_vblank */
-	0xb600f800,
-	0x00f80410,
-/* 0x0574: memx_func_wr32 */
-	0x98001698,
-	0x10b60115,
-	0xf960f908,
-	0xfcd0fc50,
-	0x002e7ee0,
-	0x0242b600,
-	0xf8e81bf4,
-/* 0x0591: memx_func_wait */
-	0xcf2c0800,
-	0x1e980088,
-	0x011d9800,
-	0x98021c98,
-	0x10b6031b,
-	0x00797e10,
-/* 0x05ab: memx_func_delay */
-	0x9800f800,
-	0x10b6001e,
-	0x005d7e04,
-/* 0x05b7: memx_func_train */
-	0xf800f800,
-/* 0x05b9: memx_exec */
-	0xf9e0f900,
-	0xb2c1b2d0,
-/* 0x05c1: memx_exec_next */
-	0x001398b2,
-	0xe70410b6,
-	0xe701f034,
-	0xb601e033,
-	0x30f00132,
-	0xde35980c,
-	0x12a655f9,
-	0x98e51ef4,
-	0x0c98f10b,
-	0x02cbbbf2,
-	0xcf07c44b,
-	0xd0fc00bb,
-	0xb67ee0fc,
+	0x2067f100,
+	0x7e6eb216,
+	0xb2000004,
+	0x0587fdd8,
+	0x80f960f9,
+	0xe0fcd0fc,
+	0x00002e7e,
+	0xb20aa247,
+	0x00047e6e,
+	0xfdd8b200,
+	0x60f90587,
+	0xd0fc80f9,
+	0x2e7ee0fc,
+	0x00f80000,
+/* 0x054c: memx_func_wait_vblank */
+	0xf80410b6,
+/* 0x0551: memx_func_wr32 */
+	0x00169800,
+	0xb6011598,
+	0x60f90810,
+	0xd0fc50f9,
+	0x2e7ee0fc,
+	0x42b60000,
+	0xe81bf402,
+/* 0x056e: memx_func_wait */
+	0x2c0800f8,
+	0x980088cf,
+	0x1d98001e,
+	0x021c9801,
+	0xb6031b98,
+	0x797e1010,
+	0x00f80000,
+/* 0x0588: memx_func_delay */
+	0xb6001e98,
+	0x5d7e0410,
+	0x00f80000,
+/* 0x0594: memx_func_train */
+/* 0x0596: memx_exec */
+	0xe0f900f8,
+	0xc1b2d0f9,
+/* 0x059e: memx_exec_next */
+	0x1398b2b2,
+	0x0410b600,
+	0x01f034e7,
+	0x01e033e7,
+	0xf00132b6,
+	0x35980c30,
+	0xa655f9de,
+	0xe51ef412,
+	0x98f10b98,
+	0xcbbbf20c,
+	0x07c44b02,
+	0xfc00bbcf,
+	0x7ee0fcd0,
+	0xf80002a6,
+/* 0x05d5: memx_info */
+	0x01c67000,
+/* 0x05db: memx_info_data */
+	0x4c0c0bf4,
+	0x004b03cc,
+	0x090ef408,
+/* 0x05e4: memx_info_train */
+	0x4b0bcc4c,
+/* 0x05ea: memx_info_send */
+	0xa67e0100,
 	0x00f80002,
-/* 0x05f8: memx_info */
-	0xf401c670,
-/* 0x05fe: memx_info_data */
-	0xcc4c0c0b,
-	0x08004b03,
-/* 0x0607: memx_info_train */
-	0x4c090ef4,
-	0x004b0bcc,
-/* 0x060d: memx_info_send */
-	0x02b67e01,
-/* 0x0613: memx_recv */
-	0xb000f800,
-	0x0bf401d6,
-	0x00d6b0a3,
-	0xf8dc0bf4,
-/* 0x0621: memx_init */
-/* 0x0623: perf_recv */
-	0xf800f800,
-/* 0x0625: perf_init */
-/* 0x0627: i2c_drive_scl */
-	0xb000f800,
-	0x0bf40036,
-	0x07e0400d,
-	0xbd0001f6,
-/* 0x0637: i2c_drive_scl_lo */
-	0x4000f804,
-	0x01f607e4,
-	0xf804bd00,
-/* 0x0641: i2c_drive_sda */
-	0x0036b000,
-	0x400d0bf4,
-	0x02f607e0,
-	0xf804bd00,
-/* 0x0651: i2c_drive_sda_lo */
-	0x07e44000,
-	0xbd0002f6,
-/* 0x065b: i2c_sense_scl */
-	0xf400f804,
-	0xc4430132,
-	0x0033cf07,
-	0xf40431fd,
-	0x31f4060b,
-/* 0x066d: i2c_sense_scl_done */
-/* 0x066f: i2c_sense_sda */
-	0xf400f801,
-	0xc4430132,
-	0x0033cf07,
-	0xf40432fd,
-	0x31f4060b,
-/* 0x0681: i2c_sense_sda_done */
-/* 0x0683: i2c_raise_scl */
-	0xf900f801,
-	0x08984440,
-	0x277e0103,
-/* 0x068e: i2c_raise_scl_wait */
-	0xe84e0006,
-	0x005d7e03,
-	0x065b7e00,
-	0x0901f400,
-	0xf40142b6,
-/* 0x06a2: i2c_raise_scl_done */
-	0x40fcef1b,
-/* 0x06a6: i2c_start */
-	0x5b7e00f8,
+/* 0x05f0: memx_recv */
+	0xf401d6b0,
+	0xd6b0a30b,
+	0xdc0bf400,
+/* 0x05fe: memx_init */
+	0x00f800f8,
+/* 0x0600: perf_recv */
+/* 0x0602: perf_init */
+	0x00f800f8,
+/* 0x0604: i2c_drive_scl */
+	0xf40036b0,
+	0xe0400d0b,
+	0x0001f607,
+	0x00f804bd,
+/* 0x0614: i2c_drive_scl_lo */
+	0xf607e440,
+	0x04bd0001,
+/* 0x061e: i2c_drive_sda */
+	0x36b000f8,
+	0x0d0bf400,
+	0xf607e040,
+	0x04bd0002,
+/* 0x062e: i2c_drive_sda_lo */
+	0xe44000f8,
+	0x0002f607,
+	0x00f804bd,
+/* 0x0638: i2c_sense_scl */
+	0x430132f4,
+	0x33cf07c4,
+	0x0431fd00,
+	0xf4060bf4,
+/* 0x064a: i2c_sense_scl_done */
+	0x00f80131,
+/* 0x064c: i2c_sense_sda */
+	0x430132f4,
+	0x33cf07c4,
+	0x0432fd00,
+	0xf4060bf4,
+/* 0x065e: i2c_sense_sda_done */
+	0x00f80131,
+/* 0x0660: i2c_raise_scl */
+	0x984440f9,
+	0x7e010308,
+/* 0x066b: i2c_raise_scl_wait */
+	0x4e000604,
+	0x5d7e03e8,
+	0x387e0000,
+	0x01f40006,
+	0x0142b609,
+/* 0x067f: i2c_raise_scl_done */
+	0xfcef1bf4,
+/* 0x0683: i2c_start */
+	0x7e00f840,
+	0xf4000638,
+	0x4c7e0d11,
 	0x11f40006,
-	0x066f7e0d,
-	0x0611f400,
-/* 0x06b7: i2c_start_rep */
-	0x032e0ef4,
-	0x06277e00,
-	0x7e010300,
-	0xbb000641,
-	0x65b60076,
-	0x9450f904,
-	0x56bb0465,
-	0xfd50bd02,
-	0x50fc0475,
-	0x0006837e,
-	0xf40464b6,
-/* 0x06e2: i2c_start_send */
-	0x00031d11,
-	0x0006417e,
-	0x7e13884e,
-	0x0300005d,
-	0x06277e00,
-	0x13884e00,
-	0x00005d7e,
-/* 0x06fc: i2c_start_out */
-/* 0x06fe: i2c_stop */
-	0x000300f8,
-	0x0006277e,
-	0x417e0003,
-	0xe84e0006,
-	0x005d7e03,
-	0x7e010300,
-	0x4e000627,
-	0x5d7e1388,
-	0x01030000,
-	0x0006417e,
-	0x7e13884e,
-	0xf800005d,
-/* 0x072d: i2c_bitw */
-	0x06417e00,
-	0x03e84e00,
-	0x00005d7e,
+	0x2e0ef406,
+/* 0x0694: i2c_start_rep */
+	0x047e0003,
+	0x01030006,
+	0x00061e7e,
 	0xb60076bb,
 	0x50f90465,
 	0xbb046594,
 	0x50bd0256,
 	0xfc0475fd,
-	0x06837e50,
+	0x06607e50,
 	0x0464b600,
-	0x4e1711f4,
-	0x5d7e1388,
-	0x00030000,
-	0x0006277e,
-	0x7e13884e,
-/* 0x076b: i2c_bitw_out */
-	0xf800005d,
-/* 0x076d: i2c_bitr */
-	0x7e010300,
-	0x4e000641,
-	0x5d7e03e8,
-	0x76bb0000,
-	0x0465b600,
-	0x659450f9,
-	0x0256bb04,
-	0x75fd50bd,
-	0x7e50fc04,
-	0xb6000683,
-	0x11f40464,
-	0x066f7e1a,
+/* 0x06bf: i2c_start_send */
+	0x031d11f4,
+	0x061e7e00,
+	0x13884e00,
+	0x00005d7e,
+	0x047e0003,
+	0x884e0006,
+	0x005d7e13,
+/* 0x06d9: i2c_start_out */
+/* 0x06db: i2c_stop */
+	0x0300f800,
+	0x06047e00,
 	0x7e000300,
-	0x4e000627,
-	0x5d7e1388,
-	0x3cf00000,
-	0x0131f401,
-/* 0x07b0: i2c_bitr_done */
-/* 0x07b2: i2c_get_byte */
-	0x000500f8,
-/* 0x07b6: i2c_get_byte_next */
-	0x54b60804,
-	0x0076bb01,
+	0x4e00061e,
+	0x5d7e03e8,
+	0x01030000,
+	0x0006047e,
+	0x7e13884e,
+	0x0300005d,
+	0x061e7e01,
+	0x13884e00,
+	0x00005d7e,
+/* 0x070a: i2c_bitw */
+	0x1e7e00f8,
+	0xe84e0006,
+	0x005d7e03,
+	0x0076bb00,
 	0xf90465b6,
 	0x04659450,
 	0xbd0256bb,
 	0x0475fd50,
-	0x6d7e50fc,
-	0x64b60007,
-	0x2a11f404,
-	0xb60553fd,
-	0x1bf40142,
-	0xbb0103d8,
+	0x607e50fc,
+	0x64b60006,
+	0x1711f404,
+	0x7e13884e,
+	0x0300005d,
+	0x06047e00,
+	0x13884e00,
+	0x00005d7e,
+/* 0x0748: i2c_bitw_out */
+/* 0x074a: i2c_bitr */
+	0x010300f8,
+	0x00061e7e,
+	0x7e03e84e,
+	0xbb00005d,
 	0x65b60076,
 	0x9450f904,
 	0x56bb0465,
 	0xfd50bd02,
 	0x50fc0475,
-	0x00072d7e,
-/* 0x07ff: i2c_get_byte_done */
-	0xf80464b6,
-/* 0x0801: i2c_put_byte */
-/* 0x0803: i2c_put_byte_next */
+	0x0006607e,
+	0xf40464b6,
+	0x4c7e1a11,
+	0x00030006,
+	0x0006047e,
+	0x7e13884e,
+	0xf000005d,
+	0x31f4013c,
+/* 0x078d: i2c_bitr_done */
+/* 0x078f: i2c_get_byte */
+	0x0500f801,
+/* 0x0793: i2c_get_byte_next */
 	0xb6080400,
-	0x54ff0142,
-	0x0076bb38,
-	0xf90465b6,
-	0x04659450,
-	0xbd0256bb,
-	0x0475fd50,
-	0x2d7e50fc,
-	0x64b60007,
-	0x3411f404,
-	0xf40046b0,
-	0x76bbd81b,
+	0x76bb0154,
+	0x0465b600,
+	0x659450f9,
+	0x0256bb04,
+	0x75fd50bd,
+	0x7e50fc04,
+	0xb600074a,
+	0x11f40464,
+	0x0553fd2a,
+	0xf40142b6,
+	0x0103d81b,
+	0xb60076bb,
+	0x50f90465,
+	0xbb046594,
+	0x50bd0256,
+	0xfc0475fd,
+	0x070a7e50,
+	0x0464b600,
+/* 0x07dc: i2c_get_byte_done */
+/* 0x07de: i2c_put_byte */
+	0x080400f8,
+/* 0x07e0: i2c_put_byte_next */
+	0xff0142b6,
+	0x76bb3854,
 	0x0465b600,
 	0x659450f9,
 	0x0256bb04,
 	0x75fd50bd,
 	0x7e50fc04,
-	0xb600076d,
+	0xb600070a,
 	0x11f40464,
-	0x0076bb0f,
-	0xf40136b0,
-	0x32f4061b,
-/* 0x0859: i2c_put_byte_done */
-/* 0x085b: i2c_addr */
-	0xbb00f801,
+	0x0046b034,
+	0xbbd81bf4,
 	0x65b60076,
 	0x9450f904,
 	0x56bb0465,
 	0xfd50bd02,
 	0x50fc0475,
-	0x0006a67e,
+	0x00074a7e,
 	0xf40464b6,
-	0xc3e72911,
-	0x34b6012e,
-	0x0553fd01,
+	0x76bb0f11,
+	0x0136b000,
+	0xf4061bf4,
+/* 0x0836: i2c_put_byte_done */
+	0x00f80132,
+/* 0x0838: i2c_addr */
 	0xb60076bb,
 	0x50f90465,
 	0xbb046594,
 	0x50bd0256,
 	0xfc0475fd,
-	0x08017e50,
+	0x06837e50,
 	0x0464b600,
-/* 0x08a0: i2c_addr_done */
-/* 0x08a2: i2c_acquire_addr */
-	0xcec700f8,
-	0x05e4b6f8,
-	0xd014e0b7,
-/* 0x08ae: i2c_acquire */
-	0xa27e00f8,
-	0x047e0008,
-	0xd9f00000,
-	0x002e7e03,
-/* 0x08bf: i2c_release */
-	0x7e00f800,
-	0x7e0008a2,
+	0xe72911f4,
+	0xb6012ec3,
+	0x53fd0134,
+	0x0076bb05,
+	0xf90465b6,
+	0x04659450,
+	0xbd0256bb,
+	0x0475fd50,
+	0xde7e50fc,
+	0x64b60007,
+/* 0x087d: i2c_addr_done */
+/* 0x087f: i2c_acquire_addr */
+	0xc700f804,
+	0xe4b6f8ce,
+	0x14e0b705,
+/* 0x088b: i2c_acquire */
+	0x7e00f8d0,
+	0x7e00087f,
 	0xf0000004,
-	0x2e7e03da,
+	0x2e7e03d9,
 	0x00f80000,
-/* 0x08d0: i2c_recv */
-	0xc70132f4,
-	0x14b6f8c1,
-	0x2816b002,
-	0x01371ff5,
-	0x0cf413b8,
-	0x00329800,
-	0x0ccc13b8,
-	0x00319800,
-	0xf90231f4,
-	0xf9e0f9d0,
-	0x0067f1d0,
-	0x0063f100,
-	0x01679210,
+/* 0x089c: i2c_release */
+	0x00087f7e,
+	0x0000047e,
+	0x7e03daf0,
+	0xf800002e,
+/* 0x08ad: i2c_recv */
+	0x0132f400,
+	0xb6f8c1c7,
+	0x16b00214,
+	0x341ff528,
+	0xf413b801,
+	0x3298000c,
+	0xcc13b800,
+	0x3198000c,
+	0x0231f400,
+	0xe0f9d0f9,
+	0x00d6d0f9,
+	0x92100000,
+	0x76bb0167,
+	0x0465b600,
+	0x659450f9,
+	0x0256bb04,
+	0x75fd50bd,
+	0x7e50fc04,
+	0xb600088b,
+	0xd0fc0464,
+	0xf500d6b0,
+	0x0500b01b,
+	0x0076bb00,
+	0xf90465b6,
+	0x04659450,
+	0xbd0256bb,
+	0x0475fd50,
+	0x387e50fc,
+	0x64b60008,
+	0xcc11f504,
+	0xe0c5c700,
 	0xb60076bb,
 	0x50f90465,
 	0xbb046594,
 	0x50bd0256,
 	0xfc0475fd,
-	0x08ae7e50,
+	0x07de7e50,
 	0x0464b600,
-	0xd6b0d0fc,
-	0xb01bf500,
-	0xbb000500,
-	0x65b60076,
-	0x9450f904,
-	0x56bb0465,
-	0xfd50bd02,
-	0x50fc0475,
-	0x00085b7e,
-	0xf50464b6,
-	0xc700cc11,
-	0x76bbe0c5,
+	0x00a911f5,
+	0x76bb0105,
 	0x0465b600,
 	0x659450f9,
 	0x0256bb04,
 	0x75fd50bd,
 	0x7e50fc04,
-	0xb6000801,
+	0xb6000838,
 	0x11f50464,
-	0x010500a9,
-	0xb60076bb,
-	0x50f90465,
-	0xbb046594,
-	0x50bd0256,
-	0xfc0475fd,
-	0x085b7e50,
-	0x0464b600,
-	0x008711f5,
+	0x76bb0087,
+	0x0465b600,
+	0x659450f9,
+	0x0256bb04,
+	0x75fd50bd,
+	0x7e50fc04,
+	0xb600078f,
+	0x11f40464,
+	0xe05bcb67,
 	0xb60076bb,
 	0x50f90465,
 	0xbb046594,
 	0x50bd0256,
 	0xfc0475fd,
-	0x07b27e50,
+	0x06db7e50,
 	0x0464b600,
-	0xcb6711f4,
-	0x76bbe05b,
-	0x0465b600,
-	0x659450f9,
-	0x0256bb04,
-	0x75fd50bd,
-	0x7e50fc04,
-	0xb60006fe,
-	0x5bb20464,
-	0x0ef474bd,
-/* 0x09d5: i2c_recv_not_rd08 */
-	0x01d6b041,
-	0x053b1bf4,
-	0x085b7e00,
-	0x3211f400,
-	0x7ee0c5c7,
-	0xf4000801,
-	0x00052811,
-	0x00085b7e,
-	0xc71f11f4,
-	0x017ee0b5,
+	0x74bd5bb2,
+/* 0x09af: i2c_recv_not_rd08 */
+	0xb0410ef4,
+	0x1bf401d6,
+	0x7e00053b,
+	0xf4000838,
+	0xc5c73211,
+	0x07de7ee0,
+	0x2811f400,
+	0x387e0005,
 	0x11f40008,
-	0x06fe7e15,
-	0xc774bd00,
-	0x1bf408c5,
-	0x0232f409,
-/* 0x0a13: i2c_recv_not_wr08 */
-/* 0x0a13: i2c_recv_done */
-	0xc7030ef4,
-	0xbf7ef8ce,
-	0xe0fc0008,
-	0x12f4d0fc,
-	0x7e7cb209,
-/* 0x0a27: i2c_recv_exit */
-	0xf80002b6,
-/* 0x0a29: i2c_init */
-/* 0x0a2b: test_recv */
-	0x4100f800,
-	0x11cf0458,
-	0x0110b600,
-	0xf6045840,
-	0x04bd0001,
-	0xd900e7f1,
-	0x134fe3f1,
-	0x0001f57e,
-/* 0x0a4a: test_init */
-	0x004e00f8,
-	0x01f57e08,
-/* 0x0a53: idle_recv */
+	0xe0b5c71f,
+	0x0007de7e,
+	0x7e1511f4,
+	0xbd0006db,
+	0x08c5c774,
+	0xf4091bf4,
+	0x0ef40232,
+/* 0x09ed: i2c_recv_not_wr08 */
+/* 0x09ed: i2c_recv_done */
+	0xf8cec703,
+	0x00089c7e,
+	0xd0fce0fc,
+	0xb20912f4,
+	0x02a67e7c,
+/* 0x0a01: i2c_recv_exit */
+/* 0x0a03: i2c_init */
 	0xf800f800,
-/* 0x0a55: idle */
-	0x0031f400,
-	0xcf045441,
-	0x10b60011,
-	0x04544001,
-	0xbd0001f6,
-/* 0x0a69: idle_loop */
-	0xf4580104,
-/* 0x0a6e: idle_proc */
-/* 0x0a6e: idle_proc_exec */
-	0x10f90232,
-	0xbf7e1eb2,
-	0x10fc0002,
-	0xf40911f4,
-	0x0ef40231,
-/* 0x0a81: idle_proc_next */
-	0x5810b6f0,
-	0x1bf41fa6,
-	0xe002f4e8,
-	0xf40028f4,
-	0x0000c60e,
+/* 0x0a05: test_recv */
+	0x04584100,
+	0xb60011cf,
+	0x58400110,
+	0x0001f604,
+	0xe7f104bd,
+	0xe3f1d900,
+	0xe57e134f,
+	0x00f80001,
+/* 0x0a24: test_init */
+	0x7e08004e,
+	0xf80001e5,
+/* 0x0a2d: idle_recv */
+/* 0x0a2f: idle */
+	0xf400f800,
+	0x54410031,
+	0x0011cf04,
+	0x400110b6,
+	0x01f60454,
+/* 0x0a43: idle_loop */
+	0x0104bd00,
+	0x0232f458,
+/* 0x0a48: idle_proc */
+/* 0x0a48: idle_proc_exec */
+	0x1eb210f9,
+	0x0002af7e,
+	0x11f410fc,
+	0x0231f409,
+/* 0x0a5b: idle_proc_next */
+	0xb6f00ef4,
+	0x1fa65810,
+	0xf4e81bf4,
+	0x28f4e002,
+	0xc60ef400,
+	0x00000000,
+	0x00000000,
+	0x00000000,
+	0x00000000,
+	0x00000000,
+	0x00000000,
+	0x00000000,
+	0x00000000,
+	0x00000000,
+	0x00000000,
 	0x00000000,
 	0x00000000,
 	0x00000000,
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/macros.fuc b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/macros.fuc
index 96fc984dafdc..0d5cbeb8d4ef 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/macros.fuc
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/fuc/macros.fuc
@@ -169,7 +169,7 @@
 */	.b32 0 /*
 */	.skip 64
 
-#if NV_PPWR_CHIPSET < GK208
+#if NVKM_PPWR_CHIPSET < GK208
 #define imm32(reg,val) /*
 */	movw reg  ((val) & 0x0000ffff) /*
 */	sethi reg ((val) & 0xffff0000)
-- 
2.11.0