Commit 21f560e9 authored by Ben Skeggs's avatar Ben Skeggs

drm/nouveau/gr/gm107-: make use of gpc_addr() macro for tpc ramchain setup

Should be no functional change here.
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent b306712d
...@@ -247,10 +247,7 @@ init: ...@@ -247,10 +247,7 @@ init:
tpc_strand_info(-1); tpc_strand_info(-1);
ld b32 $r4 D[$r0 + #tpc_count] ld b32 $r4 D[$r0 + #tpc_count]
mov $r5 NV_PGRAPH_GPC0_TPC0 gpc_addr($r5, NV_PGRAPH_GPC0_TPC0)
ld b32 $r6 D[$r0 + #gpc_id]
shl b32 $r6 15
add b32 $r5 $r6
tpc_strand_init_tpc_loop: tpc_strand_init_tpc_loop:
add b32 $r14 $r5 NV_TPC_STRAND_CNT add b32 $r14 $r5 NV_TPC_STRAND_CNT
call(nv_rd32) call(nv_rd32)
......
...@@ -289,7 +289,7 @@ uint32_t gm107_grgpc_code[] = { ...@@ -289,7 +289,7 @@ uint32_t gm107_grgpc_code[] = {
0x020014fe, 0x020014fe,
0x12004002, 0x12004002,
0xbd0002f6, 0xbd0002f6,
0x05b34104, 0x05ad4104,
0x400010fe, 0x400010fe,
0x00f60700, 0x00f60700,
0x0204bd00, 0x0204bd00,
...@@ -387,180 +387,180 @@ uint32_t gm107_grgpc_code[] = { ...@@ -387,180 +387,180 @@ uint32_t gm107_grgpc_code[] = {
0x7e00008f, 0x7e00008f,
0x98000314, 0x98000314,
0x00850504, 0x00850504,
0x06985040, 0x55f05040,
0x0f64b604, /* 0x04dd: tpc_strand_init_tpc_loop */
/* 0x04e3: tpc_strand_init_tpc_loop */ 0x705eb801,
0xb80056bb, 0x657e0005,
0x0005705e, 0xf6b20000,
0x0000657e, /* 0x04ea: tpc_strand_init_idx_loop */
0x74bdf6b2, 0x5eb874bd,
/* 0x04f0: tpc_strand_init_idx_loop */ 0xb2000560,
0x05605eb8, 0x008f7e7f,
0x7e7fb200, 0x885eb800,
0xb800008f, 0x2f950005,
0x0005885e, 0x008f7e08,
0x7e082f95, 0x8c5eb800,
0xb800008f, 0x2f950005,
0x00058c5e, 0x008f7e08,
0x7e082f95, 0x905eb800,
0xb800008f, 0x657e0005,
0x0005905e, 0xf5b60000,
0x0000657e, 0x01f0b606,
0xb606f5b6, 0xbb08f4b6,
0xf4b601f0, 0x3fbb002f,
0x002fbb08, 0x0170b600,
0xb6003fbb, 0xf40162b6,
0x62b60170, 0x50b7bf1b,
0xbf1bf401, 0x42b60800,
0x080050b7, 0xa81bf401,
0xf40142b6,
0x3f0fa81b,
0x501d608e,
0xb201e5f0,
0x008f7eff,
0x8e0d0f00,
0xf0501da8,
0xffb201e5,
0x00008f7e,
0x0003147e,
0x02010080,
0xbd0003f6,
0xf024bd04,
0x00801f29,
0x02f60230,
/* 0x0577: main */
0xf404bd00,
0x28f40031,
0x7e240d00,
0xf4000037,
0xe4b0f401,
0x1d18f404,
0x020181fe,
0xfd20bd06,
0xe4b60412,
0x051efd01,
0x7e0018fe,
0xf400064a,
/* 0x05a6: main_not_ctx_xfer */
0xef94d40e,
0x01f5f010,
0x0002f87e,
/* 0x05b3: ih */
0xf9c70ef4,
0x0188fe80,
0x90f980f9,
0xb0f9a0f9,
0xe0f9d0f9,
0x04bdf0f9,
0xcf02004a,
0xabc400aa,
0x1f0bf404,
0x004e240d,
0x00eecf1a,
0xcf19004f,
0x047e00ff,
0x010e0000,
0xf61d0040,
0x04bd000e,
/* 0x05f0: ih_no_fifo */
0xf6010040,
0x04bd000a,
0xe0fcf0fc,
0xb0fcd0fc,
0x90fca0fc,
0x88fe80fc,
0xf480fc00,
0x01f80032,
/* 0x0610: hub_barrier_done */
0x0e98010f,
0x04febb04,
0x188effb2,
0x8f7e4094,
0x00f80000,
/* 0x0624: ctx_redswitch */
0x0080200f,
0x0ff60185,
0x0e04bd00,
/* 0x0631: ctx_redswitch_delay */
0x01e2b608,
0xf1fd1bf4,
0xf10800f5,
0x800200f5,
0xf6018500,
0x04bd000f,
/* 0x064a: ctx_xfer */
0x008000f8,
0x0ff60281,
0x8e04bd00,
0xf0501dc4,
0xffb201e5,
0x00008f7e,
0x7e0711f4,
/* 0x0667: ctx_xfer_not_load */
0x7e000624,
0xbd000216,
0x47fc8024,
0x0002f602,
0x2cf004bd,
0x0320b601,
0x024afc80,
0xbd0002f6,
0x8e0c0f04,
0xf0501da8,
0xffb201e5,
0x00008f7e,
0x0003147e,
0x608e3f0f, 0x608e3f0f,
0xe5f0501d, 0xe5f0501d,
0x7effb201, 0x7effb201,
0x0f00008f, 0x0f00008f,
0x1d9c8e00, 0x1da88e0d,
0x01e5f050, 0x01e5f050,
0x8f7effb2, 0x8f7effb2,
0x010f0000, 0x147e0000,
0x0003147e, 0x00800003,
0xb601fcf0, 0x03f60201,
0xa88e03f0, 0xbd04bd00,
0xe5f0501d, 0x1f29f024,
0x7effb201, 0x02300080,
0xf000008f, 0xbd0002f6,
0xa5f001ac, /* 0x0571: main */
0x00008b02, 0x0031f404,
0x040c9850, 0x0d0028f4,
0xbb0fc4b6, 0x00377e24,
0x0c9800bc, 0xf401f400,
0x010d9800, 0xf404e4b0,
0x3d7e000e, 0x81fe1d18,
0xacf00001, 0xbd060201,
0x40008b01, 0x0412fd20,
0x040c9850, 0xfd01e4b6,
0xbb0fc4b6, 0x18fe051e,
0x0c9800bc, 0x06447e00,
0x020d9801, 0xd40ef400,
0x4e060f98, /* 0x05a0: main_not_ctx_xfer */
0x3d7e0800, 0xf010ef94,
0xacf00001, 0xf87e01f5,
0x04a5f001, 0x0ef40002,
0x5030008b, /* 0x05ad: ih */
0xb6040c98, 0xfe80f9c7,
0xbcbb0fc4, 0x80f90188,
0x020c9800, 0xa0f990f9,
0x98030d98, 0xd0f9b0f9,
0x004e080f, 0xf0f9e0f9,
0x013d7e02, 0x004a04bd,
0x020a7e00, 0x00aacf02,
0x03147e00, 0xf404abc4,
0x0601f400, 0x240d1f0b,
/* 0x073f: ctx_xfer_post */ 0xcf1a004e,
0x7e1a12f4, 0x004f00ee,
0x0f000227, 0x00ffcf19,
0x1da88e0d, 0x0000047e,
0x0040010e,
0x000ef61d,
/* 0x05ea: ih_no_fifo */
0x004004bd,
0x000af601,
0xf0fc04bd,
0xd0fce0fc,
0xa0fcb0fc,
0x80fc90fc,
0xfc0088fe,
0x0032f480,
/* 0x060a: hub_barrier_done */
0x010f01f8,
0xbb040e98,
0xffb204fe,
0x4094188e,
0x00008f7e,
/* 0x061e: ctx_redswitch */
0x200f00f8,
0x01850080,
0xbd000ff6,
/* 0x062b: ctx_redswitch_delay */
0xb6080e04,
0x1bf401e2,
0x00f5f1fd,
0x00f5f108,
0x85008002,
0x000ff601,
0x00f804bd,
/* 0x0644: ctx_xfer */
0x02810080,
0xbd000ff6,
0x1dc48e04,
0x01e5f050,
0x8f7effb2,
0x11f40000,
0x061e7e07,
/* 0x0661: ctx_xfer_not_load */
0x02167e00,
0x8024bd00,
0xf60247fc,
0x04bd0002,
0xb6012cf0,
0xfc800320,
0x02f6024a,
0x0f04bd00,
0x1da88e0c,
0x01e5f050, 0x01e5f050,
0x8f7effb2, 0x8f7effb2,
0x147e0000, 0x147e0000,
/* 0x0756: ctx_xfer_done */ 0x3f0f0003,
0x107e0003, 0x501d608e,
0x00f80006, 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,
/* 0x0739: ctx_xfer_post */
0x02277e1a,
0x8e0d0f00,
0xf0501da8,
0xffb201e5,
0x00008f7e,
0x0003147e,
/* 0x0750: ctx_xfer_done */
0x00060a7e,
0x000000f8,
0x00000000,
0x00000000, 0x00000000,
0x00000000, 0x00000000,
0x00000000, 0x00000000,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment