Commit 23f67841 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/gf100-/gr: report class data to host on fwmthd failure 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 0892a5f2

drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpc.fuc

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ mmio_list_base: 
#ifdef INCLUDE_CODE

// reports an exception to the host

//

// In: $r15 error code (see nvc0.fuc)

// In: $r15 error code (see os.h)

//

error:

	push $r14

drivers/gpu/drm/nouveau/core/engine/graph/fuc/hub.fuc

+15 −3
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ hub_mmio_list_next: 
#ifdef INCLUDE_CODE

// reports an exception to the host

//

// In: $r15 error code (see nvc0.fuc)

// In: $r15 error code (see os.h)

//

error:

	nv_iowr(NV_PGRAPH_FECS_CC_SCRATCH_VAL(5), 0, $r15)
@@ -343,13 +343,25 @@ ih: 
	ih_no_ctxsw:

	and $r11 $r10 NV_PGRAPH_FECS_INTR_FWMTHD

	bra e #ih_no_fwmthd

		// none we handle, ack, and fall-through to unhandled

		// none we handle; report to host and ack

		nv_rd32($r15, NV_PGRAPH_TRAPPED_DATA_LO)

		nv_iowr(NV_PGRAPH_FECS_CC_SCRATCH_VAL(4), 0, $r15)

		nv_rd32($r15, NV_PGRAPH_TRAPPED_ADDR)

		nv_iowr(NV_PGRAPH_FECS_CC_SCRATCH_VAL(3), 0, $r15)

		extr $r14 $r15 16:18

		shl b32 $r14 $r14 2

		imm32($r15, NV_PGRAPH_FE_OBJECT_TABLE(0))

		add b32 $r14 $r15

		call(nv_rd32)

		nv_iowr(NV_PGRAPH_FECS_CC_SCRATCH_VAL(2), 0, $r15)

		mov $r15 E_BAD_FWMTHD

		call(error)

		mov $r11 0x100

		nv_wr32(0x400144, $r11)



	// anything we didn't handle, bring it to the host's attention

	ih_no_fwmthd:

	mov $r11 0x104 // FIFO | CHSW

	mov $r11 0x504 // FIFO | CHSW | FWMTHD

	not b32 $r11

	and $r11 $r10 $r11

	bra e #ih_no_other

drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubgm107.fuc5.h

+230 −230
Original line number Diff line number Diff line
@@ -478,10 +478,10 @@ uint32_t gm107_grhub_code[] = { 
	0x01040080,

	0xbd0001f6,

	0x01004104,

	0x627e020f,

	0x717e0006,

	0xa87e020f,

	0xb77e0006,

	0x100f0006,

	0x0006b37e,

	0x0006f97e,

	0x98000e98,

	0x207e010f,

	0x14950001,
@@ -523,8 +523,8 @@ uint32_t gm107_grhub_code[] = { 
	0x800040b7,

	0xf40132b6,

	0x000fb41b,

	0x0006b37e,

	0x627e000f,

	0x0006f97e,

	0xa87e000f,

	0x00800006,

	0x01f60201,

	0xbd04bd00,
@@ -554,7 +554,7 @@ uint32_t gm107_grhub_code[] = { 
	0x0009f602,

	0x32f404bd,

	0x0231f401,

	0x0008367e,

	0x00087c7e,

	0x99f094bd,

	0x17008007,

	0x0009f602,
@@ -563,7 +563,7 @@ uint32_t gm107_grhub_code[] = { 
	0x37008006,

	0x0009f602,

	0x31f404bd,

	0x08367e01,

	0x087c7e01,

	0xf094bd00,

	0x00800699,

	0x09f60217,
@@ -572,7 +572,7 @@ uint32_t gm107_grhub_code[] = { 
	0x20f92f0e,

	0x32f412b2,

	0x0232f401,

	0x0008367e,

	0x00087c7e,

	0x008020fc,

	0x02f602c0,

	0xf404bd00,
@@ -580,7 +580,7 @@ uint32_t gm107_grhub_code[] = { 
	0x23c8130e,

	0x0d0bf41f,

	0xf40131f4,

	0x367e0232,

	0x7c7e0232,

/* 0x054e: chsw_done */

	0x01020008,

	0x02c30080,
@@ -593,7 +593,7 @@ uint32_t gm107_grhub_code[] = { 
	0xb0ff2a0e,

	0x1bf401e4,

	0x7ef2b20c,

	0xf40007d6,

	0xf400081c,

/* 0x057a: main_not_ctx_chan */

	0xe4b0400e,

	0x2c1bf402,
@@ -602,7 +602,7 @@ uint32_t gm107_grhub_code[] = { 
	0x0009f602,

	0x32f404bd,

	0x0232f401,

	0x0008367e,

	0x00087c7e,

	0x99f094bd,

	0x17008007,

	0x0009f602,
@@ -642,238 +642,238 @@ uint32_t gm107_grhub_code[] = { 
/* 0x061a: ih_no_ctxsw */

	0xabe40000,

	0x0bf40400,

	0x01004b10,

	0x448ebfb2,

	0x8f7e4001,

/* 0x062e: ih_no_fwmthd */

	0x044b0000,

	0xffb0bd01,

	0x0bf4b4ab,

	0x0700800c,

	0x000bf603,

/* 0x0642: ih_no_other */

	0x004004bd,

	0x000af601,

	0xf0fc04bd,

	0xd0fce0fc,

	0xa0fcb0fc,

	0x80fc90fc,

	0xfc0088fe,

	0x0032f480,

/* 0x0662: ctx_4170s */

	0xf5f001f8,

	0x8effb210,

	0x7e404170,

	0xf800008f,

/* 0x0671: ctx_4170w */

	0x41708e00,

	0x07088e56,

	0x00657e40,

	0xf0ffb200,

	0x1bf410f4,

/* 0x0683: ctx_redswitch */

	0x4e00f8f3,

	0xe5f00200,

	0x20e5f040,

	0x8010e5f0,

	0xf6018500,

	0x04bd000e,

/* 0x069a: ctx_redswitch_delay */

	0xf2b6080f,

	0xfd1bf401,

	0x0400e5f1,

	0x0100e5f1,

	0x01850080,

	0xbd000ef6,

/* 0x06b3: ctx_86c */

	0x8000f804,

	0xf6022300,

	0x80ffb200,

	0xf6020400,

	0x04bd000f,

	0x148effb2,

	0x8f7e408a,

	0xffb20000,

	0x41a88c8e,

	0x4007048e,

	0x0000657e,

	0x0080ffb2,

	0x0ff60203,

	0xc704bd00,

	0xee9450fe,

	0x07008f02,

	0x00efbb40,

	0x0000657e,

	0x02020080,

	0xbd000ff6,

	0x7e030f04,

	0x4b0002f8,

	0xbfb20100,

	0x4001448e,

	0x00008f7e,

/* 0x06d2: ctx_mem */

	0x008000f8,

	0x0ff60284,

/* 0x06db: ctx_mem_wait */

	0x8f04bd00,

	0xcf028400,

	0xfffd00ff,

	0xf61bf405,

/* 0x06ea: ctx_load */

	0x94bd00f8,

	0x800599f0,

	0xf6023700,

	0x04bd0009,

	0xb87e0c0a,

	0xf4bd0000,

	0x02890080,

/* 0x0674: ih_no_fwmthd */

	0xbd05044b,

	0xb4abffb0,

	0x800c0bf4,

	0xf6030700,

	0x04bd000b,

/* 0x0688: ih_no_other */

	0xf6010040,

	0x04bd000a,

	0xe0fcf0fc,

	0xb0fcd0fc,

	0x90fca0fc,

	0x88fe80fc,

	0xf480fc00,

	0x01f80032,

/* 0x06a8: ctx_4170s */

	0xb210f5f0,

	0x41708eff,

	0x008f7e40,

/* 0x06b7: ctx_4170w */

	0x8e00f800,

	0x7e404170,

	0xb2000065,

	0x10f4f0ff,

	0xf8f31bf4,

/* 0x06c9: ctx_redswitch */

	0x02004e00,

	0xf040e5f0,

	0xe5f020e5,

	0x85008010,

	0x000ef601,

	0x080f04bd,

/* 0x06e0: ctx_redswitch_delay */

	0xf401f2b6,

	0xe5f1fd1b,

	0xe5f10400,

	0x00800100,

	0x0ef60185,

	0xf804bd00,

/* 0x06f9: ctx_86c */

	0x23008000,

	0x000ff602,

	0xffb204bd,

	0x408a148e,

	0x00008f7e,

	0x8c8effb2,

	0x8f7e41a8,

	0x00f80000,

/* 0x0718: ctx_mem */

	0x02840080,

	0xbd000ff6,

	0xc1008004,

	0x0002f602,

	0x008004bd,

	0x02f60283,

	0x0f04bd00,

	0x06d27e07,

	0xc0008000,

	0x0002f602,

	0x0bfe04bd,

	0x1f2af000,

	0xb60424b6,

	0x94bd0220,

	0x800899f0,

	0xf6023700,

	0x04bd0009,

	0x02810080,

	0xbd0002f6,

	0x0000d204,

	0x25f08000,

	0x88008002,

	0x0002f602,

	0x100104bd,

	0xf0020042,

	0x12fa0223,

	0xbd03f805,

	0x0899f094,

	0x02170080,

	0xbd0009f6,

	0x81019804,

	0x981814b6,

	0x25b68002,

	0x0512fd08,

	0xbd1601b5,

	0x0999f094,

	0x02370080,

	0xbd0009f6,

	0x81008004,

	0x0001f602,

	0x010204bd,

	0x02880080,

/* 0x0721: ctx_mem_wait */

	0x84008f04,

	0x00ffcf02,

	0xf405fffd,

	0x00f8f61b,

/* 0x0730: ctx_load */

	0x99f094bd,

	0x37008005,

	0x0009f602,

	0x0c0a04bd,

	0x0000b87e,

	0x0080f4bd,

	0x0ff60289,

	0x8004bd00,

	0xf602c100,

	0x04bd0002,

	0x02830080,

	0xbd0002f6,

	0x01004104,

	0xfa0613f0,

	0x03f80501,

	0x7e070f04,

	0x80000718,

	0xf602c000,

	0x04bd0002,

	0xf0000bfe,

	0x24b61f2a,

	0x0220b604,

	0x99f094bd,

	0x17008009,

	0x37008008,

	0x0009f602,

	0x94bd04bd,

	0x800599f0,

	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,

	0xf6021700,

	0x04bd0009,

/* 0x07d6: ctx_chan */

	0xea7e00f8,

	0x0c0a0006,

	0x0000b87e,

	0xd27e050f,

	0x00f80006,

/* 0x07e8: ctx_mmio_exec */

	0x80410398,

	0x99f094bd,

	0x17008005,

	0x0009f602,

	0x00f804bd,

/* 0x081c: ctx_chan */

	0x0007307e,

	0xb87e0c0a,

	0x050f0000,

	0x0007187e,

/* 0x082e: ctx_mmio_exec */

	0x039800f8,

	0x81008041,

	0x0003f602,

	0x34bd04bd,

/* 0x083c: ctx_mmio_loop */

	0xf4ff34c4,

	0x00450e1b,

	0x0653f002,

	0xf80535fa,

/* 0x084d: ctx_mmio_pull */

	0x804e9803,

	0x7e814f98,

	0xb600008f,

	0x12b60830,

	0xdf1bf401,

/* 0x0860: ctx_mmio_done */

	0x80160398,

	0xf6028100,

	0x04bd0003,

/* 0x07f6: ctx_mmio_loop */

	0x34c434bd,

	0x0e1bf4ff,

	0xf0020045,

	0x35fa0653,

/* 0x0807: ctx_mmio_pull */

	0x9803f805,

	0x4f98804e,

	0x008f7e81,

	0x0830b600,

	0xf40112b6,

/* 0x081a: ctx_mmio_done */

	0x0398df1b,

	0x81008016,

	0x0003f602,

	0x00b504bd,

	0x01004140,

	0xfa0613f0,

	0x03f80601,

/* 0x0836: ctx_xfer */

	0x040e00f8,

	0x03020080,

	0xbd000ef6,

/* 0x0841: ctx_xfer_idle */

	0x00008e04,

	0x00eecf03,

	0x2000e4f1,

	0xf4f51bf4,

	0x02f40611,

/* 0x0855: ctx_xfer_pre */

	0x7e100f0c,

	0xf40006b3,

/* 0x085e: ctx_xfer_pre_load */

	0x020f1b11,

	0x0006627e,

	0x0006717e,

	0x0006837e,

	0x627ef4bd,

	0xea7e0006,

/* 0x0876: ctx_xfer_exec */

	0x01980006,

	0x8024bd16,

	0xf6010500,

	0x04bd0002,

	0x008e1fb2,

	0x8f7e41a5,

	0xfcf00000,

	0x022cf001,

	0xfd0124b6,

	0xffb205f2,

	0x41a5048e,

	0x414000b5,

	0x13f00100,

	0x0601fa06,

	0x00f803f8,

/* 0x087c: ctx_xfer */

	0x0080040e,

	0x0ef60302,

/* 0x0887: ctx_xfer_idle */

	0x8e04bd00,

	0xcf030000,

	0xe4f100ee,

	0x1bf42000,

	0x0611f4f5,

/* 0x089b: ctx_xfer_pre */

	0x0f0c02f4,

	0x06f97e10,

	0x1b11f400,

/* 0x08a4: ctx_xfer_pre_load */

	0xa87e020f,

	0xb77e0006,

	0xc97e0006,

	0xf4bd0006,

	0x0006a87e,

	0x0007307e,

/* 0x08bc: ctx_xfer_exec */

	0xbd160198,

	0x05008024,

	0x0002f601,

	0x1fb204bd,

	0x41a5008e,

	0x00008f7e,

	0x0002167e,

	0xfc8024bd,

	0x02f60247,

	0xf004bd00,

	0x20b6012c,

	0x4afc8003,

	0x0002f602,

	0xacf004bd,

	0x06a5f001,

	0x0c98000b,

	0x010d9800,

	0x3d7e000e,

	0x080a0001,

	0x0000ec7e,

	0x00020a7e,

	0x0a1201f4,

	0x00b87e0c,

	0x7e050f00,

	0xf40006d2,

/* 0x08f2: ctx_xfer_post */

	0x020f2d02,

	0x0006627e,

	0xb37ef4bd,

	0x277e0006,

	0x717e0002,

	0xf001fcf0,

	0x24b6022c,

	0x05f2fd01,

	0x048effb2,

	0x8f7e41a5,

	0x167e0000,

	0x24bd0002,

	0x0247fc80,

	0xbd0002f6,

	0x012cf004,

	0x800320b6,

	0xf6024afc,

	0x04bd0002,

	0xf001acf0,

	0x000b06a5,

	0x98000c98,

	0x000e010d,

	0x00013d7e,

	0xec7e080a,

	0x0a7e0000,

	0x01f40002,

	0x7e0c0a12,

	0x0f0000b8,

	0x07187e05,

	0x2d02f400,

/* 0x0938: ctx_xfer_post */

	0xa87e020f,

	0xf4bd0006,

	0x0006627e,

	0x981011f4,

	0x11fd4001,

	0x070bf405,

	0x0007e87e,

/* 0x091c: ctx_xfer_no_post_mmio */

/* 0x091c: ctx_xfer_done */

	0x000000f8,

	0x00000000,

	0x00000000,

	0x00000000,

	0x00000000,

	0x00000000,

	0x00000000,

	0x00000000,

	0x00000000,

	0x00000000,

	0x00000000,

	0x00000000,

	0x00000000,

	0x00000000,

	0x00000000,

	0x00000000,

	0x00000000,

	0x00000000,

	0x0006f97e,

	0x0002277e,

	0x0006b77e,

	0xa87ef4bd,

	0x11f40006,

	0x40019810,

	0xf40511fd,

	0x2e7e070b,

/* 0x0962: ctx_xfer_no_post_mmio */

/* 0x0962: ctx_xfer_done */

	0x00f80008,

	0x00000000,

	0x00000000,

	0x00000000,

drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnv108.fuc5.h

+230 −230
Original line number Diff line number Diff line
@@ -478,10 +478,10 @@ uint32_t nv108_grhub_code[] = { 
	0x01040080,

	0xbd0001f6,

	0x01004104,

	0x627e020f,

	0x717e0006,

	0xa87e020f,

	0xb77e0006,

	0x100f0006,

	0x0006b37e,

	0x0006f97e,

	0x98000e98,

	0x207e010f,

	0x14950001,
@@ -523,8 +523,8 @@ uint32_t nv108_grhub_code[] = { 
	0x800040b7,

	0xf40132b6,

	0x000fb41b,

	0x0006b37e,

	0x627e000f,

	0x0006f97e,

	0xa87e000f,

	0x00800006,

	0x01f60201,

	0xbd04bd00,
@@ -554,7 +554,7 @@ uint32_t nv108_grhub_code[] = { 
	0x0009f602,

	0x32f404bd,

	0x0231f401,

	0x0008367e,

	0x00087c7e,

	0x99f094bd,

	0x17008007,

	0x0009f602,
@@ -563,7 +563,7 @@ uint32_t nv108_grhub_code[] = { 
	0x37008006,

	0x0009f602,

	0x31f404bd,

	0x08367e01,

	0x087c7e01,

	0xf094bd00,

	0x00800699,

	0x09f60217,
@@ -572,7 +572,7 @@ uint32_t nv108_grhub_code[] = { 
	0x20f92f0e,

	0x32f412b2,

	0x0232f401,

	0x0008367e,

	0x00087c7e,

	0x008020fc,

	0x02f602c0,

	0xf404bd00,
@@ -580,7 +580,7 @@ uint32_t nv108_grhub_code[] = { 
	0x23c8130e,

	0x0d0bf41f,

	0xf40131f4,

	0x367e0232,

	0x7c7e0232,

/* 0x054e: chsw_done */

	0x01020008,

	0x02c30080,
@@ -593,7 +593,7 @@ uint32_t nv108_grhub_code[] = { 
	0xb0ff2a0e,

	0x1bf401e4,

	0x7ef2b20c,

	0xf40007d6,

	0xf400081c,

/* 0x057a: main_not_ctx_chan */

	0xe4b0400e,

	0x2c1bf402,
@@ -602,7 +602,7 @@ uint32_t nv108_grhub_code[] = { 
	0x0009f602,

	0x32f404bd,

	0x0232f401,

	0x0008367e,

	0x00087c7e,

	0x99f094bd,

	0x17008007,

	0x0009f602,
@@ -642,238 +642,238 @@ uint32_t nv108_grhub_code[] = { 
/* 0x061a: ih_no_ctxsw */

	0xabe40000,

	0x0bf40400,

	0x01004b10,

	0x448ebfb2,

	0x8f7e4001,

/* 0x062e: ih_no_fwmthd */

	0x044b0000,

	0xffb0bd01,

	0x0bf4b4ab,

	0x0700800c,

	0x000bf603,

/* 0x0642: ih_no_other */

	0x004004bd,

	0x000af601,

	0xf0fc04bd,

	0xd0fce0fc,

	0xa0fcb0fc,

	0x80fc90fc,

	0xfc0088fe,

	0x0032f480,

/* 0x0662: ctx_4170s */

	0xf5f001f8,

	0x8effb210,

	0x7e404170,

	0xf800008f,

/* 0x0671: ctx_4170w */

	0x41708e00,

	0x07088e56,

	0x00657e40,

	0xf0ffb200,

	0x1bf410f4,

/* 0x0683: ctx_redswitch */

	0x4e00f8f3,

	0xe5f00200,

	0x20e5f040,

	0x8010e5f0,

	0xf6018500,

	0x04bd000e,

/* 0x069a: ctx_redswitch_delay */

	0xf2b6080f,

	0xfd1bf401,

	0x0400e5f1,

	0x0100e5f1,

	0x01850080,

	0xbd000ef6,

/* 0x06b3: ctx_86c */

	0x8000f804,

	0xf6022300,

	0x80ffb200,

	0xf6020400,

	0x04bd000f,

	0x148effb2,

	0x8f7e408a,

	0xffb20000,

	0x41a88c8e,

	0x4007048e,

	0x0000657e,

	0x0080ffb2,

	0x0ff60203,

	0xc704bd00,

	0xee9450fe,

	0x07008f02,

	0x00efbb40,

	0x0000657e,

	0x02020080,

	0xbd000ff6,

	0x7e030f04,

	0x4b0002f8,

	0xbfb20100,

	0x4001448e,

	0x00008f7e,

/* 0x06d2: ctx_mem */

	0x008000f8,

	0x0ff60284,

/* 0x06db: ctx_mem_wait */

	0x8f04bd00,

	0xcf028400,

	0xfffd00ff,

	0xf61bf405,

/* 0x06ea: ctx_load */

	0x94bd00f8,

	0x800599f0,

	0xf6023700,

	0x04bd0009,

	0xb87e0c0a,

	0xf4bd0000,

	0x02890080,

/* 0x0674: ih_no_fwmthd */

	0xbd05044b,

	0xb4abffb0,

	0x800c0bf4,

	0xf6030700,

	0x04bd000b,

/* 0x0688: ih_no_other */

	0xf6010040,

	0x04bd000a,

	0xe0fcf0fc,

	0xb0fcd0fc,

	0x90fca0fc,

	0x88fe80fc,

	0xf480fc00,

	0x01f80032,

/* 0x06a8: ctx_4170s */

	0xb210f5f0,

	0x41708eff,

	0x008f7e40,

/* 0x06b7: ctx_4170w */

	0x8e00f800,

	0x7e404170,

	0xb2000065,

	0x10f4f0ff,

	0xf8f31bf4,

/* 0x06c9: ctx_redswitch */

	0x02004e00,

	0xf040e5f0,

	0xe5f020e5,

	0x85008010,

	0x000ef601,

	0x080f04bd,

/* 0x06e0: ctx_redswitch_delay */

	0xf401f2b6,

	0xe5f1fd1b,

	0xe5f10400,

	0x00800100,

	0x0ef60185,

	0xf804bd00,

/* 0x06f9: ctx_86c */

	0x23008000,

	0x000ff602,

	0xffb204bd,

	0x408a148e,

	0x00008f7e,

	0x8c8effb2,

	0x8f7e41a8,

	0x00f80000,

/* 0x0718: ctx_mem */

	0x02840080,

	0xbd000ff6,

	0xc1008004,

	0x0002f602,

	0x008004bd,

	0x02f60283,

	0x0f04bd00,

	0x06d27e07,

	0xc0008000,

	0x0002f602,

	0x0bfe04bd,

	0x1f2af000,

	0xb60424b6,

	0x94bd0220,

	0x800899f0,

	0xf6023700,

	0x04bd0009,

	0x02810080,

	0xbd0002f6,

	0x0000d204,

	0x25f08000,

	0x88008002,

	0x0002f602,

	0x100104bd,

	0xf0020042,

	0x12fa0223,

	0xbd03f805,

	0x0899f094,

	0x02170080,

	0xbd0009f6,

	0x81019804,

	0x981814b6,

	0x25b68002,

	0x0512fd08,

	0xbd1601b5,

	0x0999f094,

	0x02370080,

	0xbd0009f6,

	0x81008004,

	0x0001f602,

	0x010204bd,

	0x02880080,

/* 0x0721: ctx_mem_wait */

	0x84008f04,

	0x00ffcf02,

	0xf405fffd,

	0x00f8f61b,

/* 0x0730: ctx_load */

	0x99f094bd,

	0x37008005,

	0x0009f602,

	0x0c0a04bd,

	0x0000b87e,

	0x0080f4bd,

	0x0ff60289,

	0x8004bd00,

	0xf602c100,

	0x04bd0002,

	0x02830080,

	0xbd0002f6,

	0x01004104,

	0xfa0613f0,

	0x03f80501,

	0x7e070f04,

	0x80000718,

	0xf602c000,

	0x04bd0002,

	0xf0000bfe,

	0x24b61f2a,

	0x0220b604,

	0x99f094bd,

	0x17008009,

	0x37008008,

	0x0009f602,

	0x94bd04bd,

	0x800599f0,

	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,

	0xf6021700,

	0x04bd0009,

/* 0x07d6: ctx_chan */

	0xea7e00f8,

	0x0c0a0006,

	0x0000b87e,

	0xd27e050f,

	0x00f80006,

/* 0x07e8: ctx_mmio_exec */

	0x80410398,

	0x99f094bd,

	0x17008005,

	0x0009f602,

	0x00f804bd,

/* 0x081c: ctx_chan */

	0x0007307e,

	0xb87e0c0a,

	0x050f0000,

	0x0007187e,

/* 0x082e: ctx_mmio_exec */

	0x039800f8,

	0x81008041,

	0x0003f602,

	0x34bd04bd,

/* 0x083c: ctx_mmio_loop */

	0xf4ff34c4,

	0x00450e1b,

	0x0653f002,

	0xf80535fa,

/* 0x084d: ctx_mmio_pull */

	0x804e9803,

	0x7e814f98,

	0xb600008f,

	0x12b60830,

	0xdf1bf401,

/* 0x0860: ctx_mmio_done */

	0x80160398,

	0xf6028100,

	0x04bd0003,

/* 0x07f6: ctx_mmio_loop */

	0x34c434bd,

	0x0e1bf4ff,

	0xf0020045,

	0x35fa0653,

/* 0x0807: ctx_mmio_pull */

	0x9803f805,

	0x4f98804e,

	0x008f7e81,

	0x0830b600,

	0xf40112b6,

/* 0x081a: ctx_mmio_done */

	0x0398df1b,

	0x81008016,

	0x0003f602,

	0x00b504bd,

	0x01004140,

	0xfa0613f0,

	0x03f80601,

/* 0x0836: ctx_xfer */

	0x040e00f8,

	0x03020080,

	0xbd000ef6,

/* 0x0841: ctx_xfer_idle */

	0x00008e04,

	0x00eecf03,

	0x2000e4f1,

	0xf4f51bf4,

	0x02f40611,

/* 0x0855: ctx_xfer_pre */

	0x7e100f0c,

	0xf40006b3,

/* 0x085e: ctx_xfer_pre_load */

	0x020f1b11,

	0x0006627e,

	0x0006717e,

	0x0006837e,

	0x627ef4bd,

	0xea7e0006,

/* 0x0876: ctx_xfer_exec */

	0x01980006,

	0x8024bd16,

	0xf6010500,

	0x04bd0002,

	0x008e1fb2,

	0x8f7e41a5,

	0xfcf00000,

	0x022cf001,

	0xfd0124b6,

	0xffb205f2,

	0x41a5048e,

	0x414000b5,

	0x13f00100,

	0x0601fa06,

	0x00f803f8,

/* 0x087c: ctx_xfer */

	0x0080040e,

	0x0ef60302,

/* 0x0887: ctx_xfer_idle */

	0x8e04bd00,

	0xcf030000,

	0xe4f100ee,

	0x1bf42000,

	0x0611f4f5,

/* 0x089b: ctx_xfer_pre */

	0x0f0c02f4,

	0x06f97e10,

	0x1b11f400,

/* 0x08a4: ctx_xfer_pre_load */

	0xa87e020f,

	0xb77e0006,

	0xc97e0006,

	0xf4bd0006,

	0x0006a87e,

	0x0007307e,

/* 0x08bc: ctx_xfer_exec */

	0xbd160198,

	0x05008024,

	0x0002f601,

	0x1fb204bd,

	0x41a5008e,

	0x00008f7e,

	0x0002167e,

	0xfc8024bd,

	0x02f60247,

	0xf004bd00,

	0x20b6012c,

	0x4afc8003,

	0x0002f602,

	0xacf004bd,

	0x06a5f001,

	0x0c98000b,

	0x010d9800,

	0x3d7e000e,

	0x080a0001,

	0x0000ec7e,

	0x00020a7e,

	0x0a1201f4,

	0x00b87e0c,

	0x7e050f00,

	0xf40006d2,

/* 0x08f2: ctx_xfer_post */

	0x020f2d02,

	0x0006627e,

	0xb37ef4bd,

	0x277e0006,

	0x717e0002,

	0xf001fcf0,

	0x24b6022c,

	0x05f2fd01,

	0x048effb2,

	0x8f7e41a5,

	0x167e0000,

	0x24bd0002,

	0x0247fc80,

	0xbd0002f6,

	0x012cf004,

	0x800320b6,

	0xf6024afc,

	0x04bd0002,

	0xf001acf0,

	0x000b06a5,

	0x98000c98,

	0x000e010d,

	0x00013d7e,

	0xec7e080a,

	0x0a7e0000,

	0x01f40002,

	0x7e0c0a12,

	0x0f0000b8,

	0x07187e05,

	0x2d02f400,

/* 0x0938: ctx_xfer_post */

	0xa87e020f,

	0xf4bd0006,

	0x0006627e,

	0x981011f4,

	0x11fd4001,

	0x070bf405,

	0x0007e87e,

/* 0x091c: ctx_xfer_no_post_mmio */

/* 0x091c: ctx_xfer_done */

	0x000000f8,

	0x00000000,

	0x00000000,

	0x00000000,

	0x00000000,

	0x00000000,

	0x00000000,

	0x00000000,

	0x00000000,

	0x00000000,

	0x00000000,

	0x00000000,

	0x00000000,

	0x00000000,

	0x00000000,

	0x00000000,

	0x00000000,

	0x00000000,

	0x0006f97e,

	0x0002277e,

	0x0006b77e,

	0xa87ef4bd,

	0x11f40006,

	0x40019810,

	0xf40511fd,

	0x2e7e070b,

/* 0x0962: ctx_xfer_no_post_mmio */

/* 0x0962: ctx_xfer_done */

	0x00f80008,

	0x00000000,

	0x00000000,

	0x00000000,

drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnvc0.fuc.h

+126 −62
Original line number Diff line number Diff line
@@ -528,10 +528,10 @@ uint32_t nvc0_grhub_code[] = { 
	0x0001d001,

	0x17f104bd,

	0xf7f00100,

	0xb521f502,

	0xc721f507,

	0x10f7f007,

	0x081421f5,

	0x0d21f502,

	0x1f21f508,

	0x10f7f008,

	0x086c21f5,

	0x98000e98,

	0x21f5010f,

	0x14950150,
@@ -574,9 +574,9 @@ uint32_t nvc0_grhub_code[] = { 
	0xb6800040,

	0x1bf40132,

	0x00f7f0be,

	0x081421f5,

	0x086c21f5,

	0xf500f7f0,

	0xf107b521,

	0xf1080d21,

	0xf0010007,

	0x01d00203,

	0xbd04bd00,
@@ -610,8 +610,8 @@ uint32_t nvc0_grhub_code[] = { 
	0x09d00203,

	0xf404bd00,

	0x31f40132,

	0xe821f502,

	0xf094bd09,

	0x4021f502,

	0xf094bd0a,

	0x07f10799,

	0x03f01700,

	0x0009d002,
@@ -621,7 +621,7 @@ uint32_t nvc0_grhub_code[] = { 
	0x0203f00f,

	0xbd0009d0,

	0x0131f404,

	0x09e821f5,

	0x0a4021f5,

	0x99f094bd,

	0x0007f106,

	0x0203f017,
@@ -631,7 +631,7 @@ uint32_t nvc0_grhub_code[] = { 
	0x12b920f9,

	0x0132f402,

	0xf50232f4,

	0xfc09e821,

	0xfc0a4021,

	0x0007f120,

	0x0203f0c0,

	0xbd0002d0,
@@ -640,7 +640,7 @@ uint32_t nvc0_grhub_code[] = { 
	0xf41f23c8,

	0x31f40d0b,

	0x0232f401,

	0x09e821f5,

	0x0a4021f5,

/* 0x063c: chsw_done */

	0xf10127f0,

	0xf0c30007,
@@ -654,7 +654,7 @@ uint32_t nvc0_grhub_code[] = { 
/* 0x0660: main_not_ctx_switch */

	0xf401e4b0,

	0xf2b90d1b,

	0x7821f502,

	0xd021f502,

	0x460ef409,

/* 0x0670: main_not_ctx_chan */

	0xf402e4b0,
@@ -664,8 +664,8 @@ uint32_t nvc0_grhub_code[] = { 
	0x09d00203,

	0xf404bd00,

	0x32f40132,

	0xe821f502,

	0xf094bd09,

	0x4021f502,

	0xf094bd0a,

	0x07f10799,

	0x03f01700,

	0x0009d002,
@@ -710,18 +710,40 @@ uint32_t nvc0_grhub_code[] = { 
/* 0x072b: ih_no_ctxsw */

	0xe40421f4,

	0xf40400ab,

	0xb7f1140b,

	0xe7f16c0b,

	0xe3f00708,

	0x6821f440,

	0xf102ffb9,

	0xf0040007,

	0x0fd00203,

	0xf104bd00,

	0xf00704e7,

	0x21f440e3,

	0x02ffb968,

	0x030007f1,

	0xd00203f0,

	0x04bd000f,

	0x9450fec7,

	0xf7f102ee,

	0xf3f00700,

	0x00efbb40,

	0xf16821f4,

	0xf0020007,

	0x0fd00203,

	0xf004bd00,

	0x21f503f7,

	0xb7f1037e,

	0xbfb90100,

	0x44e7f102,

	0x40e3f001,

/* 0x0743: ih_no_fwmthd */

/* 0x079b: ih_no_fwmthd */

	0xf19d21f4,

	0xbd0104b7,

	0xbd0504b7,

	0xb4abffb0,

	0xf10f0bf4,

	0xf0070007,

	0x0bd00303,

/* 0x075b: ih_no_other */

/* 0x07b3: ih_no_other */

	0xf104bd00,

	0xf0010007,

	0x0ad00003,
@@ -731,36 +753,36 @@ uint32_t nvc0_grhub_code[] = { 
	0xfc90fca0,

	0x0088fe80,

	0x32f480fc,

/* 0x077f: ctx_4160s */

/* 0x07d7: ctx_4160s */

	0xf001f800,

	0xffb901f7,

	0x60e7f102,

	0x40e3f041,

/* 0x078f: ctx_4160s_wait */

/* 0x07e7: ctx_4160s_wait */

	0xf19d21f4,

	0xf04160e7,

	0x21f440e3,

	0x02ffb968,

	0xf404ffc8,

	0x00f8f00b,

/* 0x07a4: ctx_4160c */

/* 0x07fc: ctx_4160c */

	0xffb9f4bd,

	0x60e7f102,

	0x40e3f041,

	0xf89d21f4,

/* 0x07b5: ctx_4170s */

/* 0x080d: ctx_4170s */

	0x10f5f000,

	0xf102ffb9,

	0xf04170e7,

	0x21f440e3,

/* 0x07c7: ctx_4170w */

/* 0x081f: ctx_4170w */

	0xf100f89d,

	0xf04170e7,

	0x21f440e3,

	0x02ffb968,

	0xf410f4f0,

	0x00f8f01b,

/* 0x07dc: ctx_redswitch */

/* 0x0834: ctx_redswitch */

	0x0200e7f1,

	0xf040e5f0,

	0xe5f020e5,
@@ -768,7 +790,7 @@ uint32_t nvc0_grhub_code[] = { 
	0x0103f085,

	0xbd000ed0,

	0x08f7f004,

/* 0x07f8: ctx_redswitch_delay */

/* 0x0850: ctx_redswitch_delay */

	0xf401f2b6,

	0xe5f1fd1b,

	0xe5f10400,
@@ -776,7 +798,7 @@ uint32_t nvc0_grhub_code[] = { 
	0x03f08500,

	0x000ed001,

	0x00f804bd,

/* 0x0814: ctx_86c */

/* 0x086c: ctx_86c */

	0x1b0007f1,

	0xd00203f0,

	0x04bd000f,
@@ -787,16 +809,16 @@ uint32_t nvc0_grhub_code[] = { 
	0xa86ce7f1,

	0xf441e3f0,

	0x00f89d21,

/* 0x083c: ctx_mem */

/* 0x0894: ctx_mem */

	0x840007f1,

	0xd00203f0,

	0x04bd000f,

/* 0x0848: ctx_mem_wait */

/* 0x08a0: ctx_mem_wait */

	0x8400f7f1,

	0xcf02f3f0,

	0xfffd00ff,

	0xf31bf405,

/* 0x085a: ctx_load */

/* 0x08b2: ctx_load */

	0x94bd00f8,

	0xf10599f0,

	0xf00f0007,
@@ -814,7 +836,7 @@ uint32_t nvc0_grhub_code[] = { 
	0x02d00203,

	0xf004bd00,

	0x21f507f7,

	0x07f1083c,

	0x07f10894,

	0x03f0c000,

	0x0002d002,

	0x0bfe04bd,
@@ -869,31 +891,31 @@ uint32_t nvc0_grhub_code[] = { 
	0x03f01700,

	0x0009d002,

	0x00f804bd,

/* 0x0978: ctx_chan */

	0x077f21f5,

	0x085a21f5,

/* 0x09d0: ctx_chan */

	0x07d721f5,

	0x08b221f5,

	0xf40ca7f0,

	0xf7f0d021,

	0x3c21f505,

	0xa421f508,

/* 0x0993: ctx_mmio_exec */

	0x9421f505,

	0xfc21f508,

/* 0x09eb: ctx_mmio_exec */

	0x9800f807,

	0x07f14103,

	0x03f08100,

	0x0003d002,

	0x34bd04bd,

/* 0x09a4: ctx_mmio_loop */

/* 0x09fc: ctx_mmio_loop */

	0xf4ff34c4,

	0x57f10f1b,

	0x53f00200,

	0x0535fa06,

/* 0x09b6: ctx_mmio_pull */

/* 0x0a0e: ctx_mmio_pull */

	0x4e9803f8,

	0x814f9880,

	0xb69d21f4,

	0x12b60830,

	0xdf1bf401,

/* 0x09c8: ctx_mmio_done */

/* 0x0a20: ctx_mmio_done */

	0xf1160398,

	0xf0810007,

	0x03d00203,
@@ -902,30 +924,30 @@ uint32_t nvc0_grhub_code[] = { 
	0x13f00100,

	0x0601fa06,

	0x00f803f8,

/* 0x09e8: ctx_xfer */

/* 0x0a40: ctx_xfer */

	0xf104e7f0,

	0xf0020007,

	0x0ed00303,

/* 0x09f7: ctx_xfer_idle */

/* 0x0a4f: ctx_xfer_idle */

	0xf104bd00,

	0xf00000e7,

	0xeecf03e3,

	0x00e4f100,

	0xf21bf420,

	0xf40611f4,

/* 0x0a0e: ctx_xfer_pre */

/* 0x0a66: ctx_xfer_pre */

	0xf7f01102,

	0x1421f510,

	0x7f21f508,

	0x6c21f510,

	0xd721f508,

	0x1c11f407,

/* 0x0a1c: ctx_xfer_pre_load */

/* 0x0a74: ctx_xfer_pre_load */

	0xf502f7f0,

	0xf507b521,

	0xf507c721,

	0xbd07dc21,

	0xb521f5f4,

	0x5a21f507,

/* 0x0a35: ctx_xfer_exec */

	0xf5080d21,

	0xf5081f21,

	0xbd083421,

	0x0d21f5f4,

	0xb221f508,

/* 0x0a8d: ctx_xfer_exec */

	0x16019808,

	0x07f124bd,

	0x03f00500,
@@ -960,23 +982,65 @@ uint32_t nvc0_grhub_code[] = { 
	0x1301f402,

	0xf40ca7f0,

	0xf7f0d021,

	0x3c21f505,

	0x9421f505,

	0x3202f408,

/* 0x0ac4: ctx_xfer_post */

/* 0x0b1c: ctx_xfer_post */

	0xf502f7f0,

	0xbd07b521,

	0x1421f5f4,

	0xbd080d21,

	0x6c21f5f4,

	0x7f21f508,

	0xc721f502,

	0xf5f4bd07,

	0xf407b521,

	0x1f21f502,

	0xf5f4bd08,

	0xf4080d21,

	0x01981011,

	0x0511fd40,

	0xf5070bf4,

/* 0x0aef: ctx_xfer_no_post_mmio */

	0xf5099321,

/* 0x0af3: ctx_xfer_done */

	0xf807a421,

/* 0x0b47: ctx_xfer_no_post_mmio */

	0xf509eb21,

/* 0x0b4b: ctx_xfer_done */

	0xf807fc21,

	0x00000000,

	0x00000000,

	0x00000000,

	0x00000000,

	0x00000000,

	0x00000000,

	0x00000000,

	0x00000000,

	0x00000000,

	0x00000000,

	0x00000000,

	0x00000000,

	0x00000000,

	0x00000000,

	0x00000000,

	0x00000000,

	0x00000000,

	0x00000000,

	0x00000000,

	0x00000000,

	0x00000000,

	0x00000000,

	0x00000000,

	0x00000000,

	0x00000000,

	0x00000000,

	0x00000000,

	0x00000000,

	0x00000000,

	0x00000000,

	0x00000000,

	0x00000000,

	0x00000000,

	0x00000000,

	0x00000000,

	0x00000000,

	0x00000000,

	0x00000000,

	0x00000000,

	0x00000000,

	0x00000000,

	0x00000000,

	0x00000000,

	0x00000000,

	0x00000000,