Skip to content

L
linux
Commit 57f0ec15 authored by Ben Skeggs's avatar Ben Skeggs
Browse files
Options

drm/nvc0/gr: cleanup register lists, and add nvce/nvcf to switches 

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent eb12f57b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 344 additions and 600 deletions
drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnvc0.fuc
View file @ 57f0ec15
...@@ -48,30 +48,30 @@ cmd_queue: queue_init ...@@ -48,30 +48,30 @@ cmd_queue: queue_init
// chipset descriptions // chipset descriptions
chipsets: chipsets:
.b8 0xc0 0 0 0 .b8 0xc0 0 0 0
.b16 #nnvc0_gpc_mmio_head .b16 #nvc0_gpc_mmio_head
.b16 #nnvc0_gpc_mmio_tail .b16 #nvc0_gpc_mmio_tail
.b16 #nnvc0_tpc_mmio_head .b16 #nvc0_tpc_mmio_head
.b16 #nnvc0_tpc_mmio_tail .b16 #nvc0_tpc_mmio_tail
.b8 0xc1 0 0 0 .b8 0xc1 0 0 0
.b16 #nnvc0_gpc_mmio_head .b16 #nvc0_gpc_mmio_head
.b16 #nnvc1_gpc_mmio_tail .b16 #nvc1_gpc_mmio_tail
.b16 #nnvc3_tpc_mmio_head .b16 #nvc0_tpc_mmio_head
.b16 #nnvc1_tpc_mmio_tail .b16 #nvc1_tpc_mmio_tail
.b8 0xc3 0 0 0 .b8 0xc3 0 0 0
.b16 #nnvc0_gpc_mmio_head .b16 #nvc0_gpc_mmio_head
.b16 #nnvc0_gpc_mmio_tail .b16 #nvc0_gpc_mmio_tail
.b16 #nnvc3_tpc_mmio_head .b16 #nvc0_tpc_mmio_head
.b16 #nnvc3_tpc_mmio_tail .b16 #nvc3_tpc_mmio_tail
.b8 0xc4 0 0 0 .b8 0xc4 0 0 0
.b16 #nnvc0_gpc_mmio_head .b16 #nvc0_gpc_mmio_head
.b16 #nnvc0_gpc_mmio_tail .b16 #nvc0_gpc_mmio_tail
.b16 #nnvc3_tpc_mmio_head .b16 #nvc0_tpc_mmio_head
.b16 #nnvc3_tpc_mmio_tail .b16 #nvc3_tpc_mmio_tail
.b8 0xc8 0 0 0 .b8 0xc8 0 0 0
.b16 #nnvc0_gpc_mmio_head .b16 #nvc0_gpc_mmio_head
.b16 #nnvc0_gpc_mmio_tail .b16 #nvc0_gpc_mmio_tail
.b16 #nnvc0_tpc_mmio_head .b16 #nvc0_tpc_mmio_head
.b16 #nnvc0_tpc_mmio_tail .b16 #nvc0_tpc_mmio_tail
.b8 0xce 0 0 0 .b8 0xce 0 0 0
.b16 #nvc0_gpc_mmio_head .b16 #nvc0_gpc_mmio_head
.b16 #nvc0_gpc_mmio_tail .b16 #nvc0_gpc_mmio_tail
...@@ -81,23 +81,26 @@ chipsets: ...@@ -81,23 +81,26 @@ chipsets:
.b16 #nvc0_gpc_mmio_head .b16 #nvc0_gpc_mmio_head
.b16 #nvc0_gpc_mmio_tail .b16 #nvc0_gpc_mmio_tail
.b16 #nvc0_tpc_mmio_head .b16 #nvc0_tpc_mmio_head
.b16 #nvcf_tpc_mmio_tail .b16 #nvc3_tpc_mmio_tail
.b8 0xd9 0 0 0 .b8 0xd9 0 0 0
.b16 #nvd9_gpc_mmio_head .b16 #nvd9_gpc_mmio_head
.b16 #nvd9_gpc_mmio_tail .b16 #nvc1_gpc_mmio_tail
.b16 #nvd9_tpc_mmio_head .b16 #nvc0_tpc_mmio_head
.b16 #nvd9_tpc_mmio_tail .b16 #nvd9_tpc_mmio_tail
.b8 0xd7 0 0 0 .b8 0xd7 0 0 0
.b16 #nvd9_gpc_mmio_head .b16 #nvd9_gpc_mmio_head
.b16 #nvd9_gpc_mmio_tail .b16 #nvc1_gpc_mmio_tail
.b16 #nvd9_tpc_mmio_head .b16 #nvc0_tpc_mmio_head
.b16 #nvd9_tpc_mmio_tail .b16 #nvd9_tpc_mmio_tail
.b8 0 0 0 0 .b8 0 0 0 0
// GPC mmio lists // GPC mmio lists
nvc0_gpc_mmio_head: nvc0_gpc_mmio_head:
mmctx_data(0x000408, 1)
nvd9_gpc_mmio_head:
mmctx_data(0x000380, 1) mmctx_data(0x000380, 1)
mmctx_data(0x000400, 6) mmctx_data(0x000400, 2);
mmctx_data(0x00040c, 3);
mmctx_data(0x000450, 9) mmctx_data(0x000450, 9)
mmctx_data(0x000600, 1) mmctx_data(0x000600, 1)
mmctx_data(0x000684, 1) mmctx_data(0x000684, 1)
...@@ -121,64 +124,8 @@ mmctx_data(0x000c8c, 1) ...@@ -121,64 +124,8 @@ mmctx_data(0x000c8c, 1)
mmctx_data(0x001000, 3) mmctx_data(0x001000, 3)
mmctx_data(0x001014, 1) mmctx_data(0x001014, 1)
nvc0_gpc_mmio_tail: nvc0_gpc_mmio_tail:
nnvc0_gpc_mmio_head:
mmctx_data(0x000380, 1)
mmctx_data(0x000400, 6)
mmctx_data(0x000450, 9)
mmctx_data(0x000600, 1)
mmctx_data(0x000684, 1)
mmctx_data(0x000700, 5)
mmctx_data(0x000800, 1)
mmctx_data(0x000808, 3)
mmctx_data(0x000828, 1)
mmctx_data(0x000830, 1)
mmctx_data(0x0008d8, 1)
mmctx_data(0x0008e0, 1)
mmctx_data(0x0008e8, 6)
mmctx_data(0x00091c, 1)
mmctx_data(0x000924, 3)
mmctx_data(0x000b00, 1)
mmctx_data(0x000b08, 6)
mmctx_data(0x000bb8, 1)
mmctx_data(0x000c08, 1)
mmctx_data(0x000c10, 8)
mmctx_data(0x000c80, 1)
mmctx_data(0x000c8c, 1)
mmctx_data(0x001000, 3)
mmctx_data(0x001014, 1)
nnvc0_gpc_mmio_tail:
mmctx_data(0x000c6c, 1); mmctx_data(0x000c6c, 1);
nnvc1_gpc_mmio_tail: nvc1_gpc_mmio_tail:
nvd9_gpc_mmio_head:
mmctx_data(0x000380, 1)
mmctx_data(0x000400, 2)
mmctx_data(0x00040c, 3)
mmctx_data(0x000450, 9)
mmctx_data(0x000600, 1)
mmctx_data(0x000684, 1)
mmctx_data(0x000700, 5)
mmctx_data(0x000800, 1)
mmctx_data(0x000808, 3)
mmctx_data(0x000828, 1)
mmctx_data(0x000830, 1)
mmctx_data(0x0008d8, 1)
mmctx_data(0x0008e0, 1)
mmctx_data(0x0008e8, 6)
mmctx_data(0x00091c, 1)
mmctx_data(0x000924, 3)
mmctx_data(0x000b00, 1)
mmctx_data(0x000b08, 6)
mmctx_data(0x000bb8, 1)
mmctx_data(0x000c08, 1)
mmctx_data(0x000c10, 8)
mmctx_data(0x000c6c, 1)
mmctx_data(0x000c80, 1)
mmctx_data(0x000c8c, 1)
mmctx_data(0x001000, 3)
mmctx_data(0x001014, 1)
nvd9_gpc_mmio_tail:
// TPC mmio lists // TPC mmio lists
nvc0_tpc_mmio_head: nvc0_tpc_mmio_head:
...@@ -188,7 +135,6 @@ mmctx_data(0x000048, 1) ...@@ -188,7 +135,6 @@ mmctx_data(0x000048, 1)
mmctx_data(0x000064, 1) mmctx_data(0x000064, 1)
mmctx_data(0x000088, 1) mmctx_data(0x000088, 1)
mmctx_data(0x000200, 6) mmctx_data(0x000200, 6)
mmctx_data(0x00021c, 2)
mmctx_data(0x000300, 6) mmctx_data(0x000300, 6)
mmctx_data(0x0003d0, 1) mmctx_data(0x0003d0, 1)
mmctx_data(0x0003e0, 2) mmctx_data(0x0003e0, 2)
...@@ -203,86 +149,15 @@ mmctx_data(0x000644, 20) ...@@ -203,86 +149,15 @@ mmctx_data(0x000644, 20)
mmctx_data(0x000698, 1) mmctx_data(0x000698, 1)
mmctx_data(0x000750, 2) mmctx_data(0x000750, 2)
nvc0_tpc_mmio_tail: nvc0_tpc_mmio_tail:
mmctx_data(0x000758, 1)
mmctx_data(0x0002c4, 1)
mmctx_data(0x0006e0, 1)
nvcf_tpc_mmio_tail:
mmctx_data(0x0004bc, 1)
nvc3_tpc_mmio_tail:
nnvc0_tpc_mmio_head:
mmctx_data(0x000018, 1)
mmctx_data(0x00003c, 1)
mmctx_data(0x000048, 1)
mmctx_data(0x000064, 1)
mmctx_data(0x000088, 1)
mmctx_data(0x000200, 6)
mmctx_data(0x000300, 6)
mmctx_data(0x0003d0, 1)
mmctx_data(0x0003e0, 2)
mmctx_data(0x000400, 3)
mmctx_data(0x000420, 1)
mmctx_data(0x0004b0, 1)
mmctx_data(0x0004e8, 1)
mmctx_data(0x0004f4, 1)
mmctx_data(0x000520, 2)
mmctx_data(0x000604, 4)
mmctx_data(0x000644, 20)
mmctx_data(0x000698, 1)
mmctx_data(0x000750, 2)
nnvc0_tpc_mmio_tail:
nnvc3_tpc_mmio_head:
mmctx_data(0x000018, 1)
mmctx_data(0x00003c, 1)
mmctx_data(0x000048, 1)
mmctx_data(0x000064, 1)
mmctx_data(0x000088, 1)
mmctx_data(0x000200, 6)
mmctx_data(0x00021c, 2) mmctx_data(0x00021c, 2)
mmctx_data(0x0002c4, 1) mmctx_data(0x0002c4, 1)
mmctx_data(0x000300, 6) mmctx_data(0x000730, 8)
mmctx_data(0x0003d0, 1) mmctx_data(0x000758, 1)
mmctx_data(0x0003e0, 2) nvc3_tpc_mmio_tail:
mmctx_data(0x000400, 3)
mmctx_data(0x000420, 1)
mmctx_data(0x0004b0, 1)
mmctx_data(0x0004e8, 1)
mmctx_data(0x0004f4, 1)
mmctx_data(0x000520, 2)
mmctx_data(0x000604, 4)
mmctx_data(0x000644, 20)
mmctx_data(0x000698, 1)
mmctx_data(0x0006e0, 1)
mmctx_data(0x000730, 11)
nnvc3_tpc_mmio_tail:
mmctx_data(0x000544, 1)
nnvc1_tpc_mmio_tail:
nvd9_tpc_mmio_head:
mmctx_data(0x000018, 1)
mmctx_data(0x00003c, 1)
mmctx_data(0x000048, 1)
mmctx_data(0x000064, 1)
mmctx_data(0x000088, 1)
mmctx_data(0x000200, 6)
mmctx_data(0x00021c, 2)
mmctx_data(0x0002c4, 1)
mmctx_data(0x000300, 6)
mmctx_data(0x0003d0, 1)
mmctx_data(0x0003e0, 2)
mmctx_data(0x000400, 3)
mmctx_data(0x000420, 3)
mmctx_data(0x0004b0, 1)
mmctx_data(0x0004e8, 1)
mmctx_data(0x0004f4, 1)
mmctx_data(0x000520, 2)
mmctx_data(0x000544, 1) mmctx_data(0x000544, 1)
mmctx_data(0x000604, 4) nvc1_tpc_mmio_tail:
mmctx_data(0x000644, 20) mmctx_data(0x000424, 2);
mmctx_data(0x000698, 1) mmctx_data(0x0006e0, 1);
mmctx_data(0x0006e0, 1)
mmctx_data(0x000730, 11)
nvd9_tpc_mmio_tail: nvd9_tpc_mmio_tail:
.section #nvc0_grgpc_code .section #nvc0_grgpc_code
......
drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnvc0.fuc.h
View file @ 57f0ec15
...@@ -34,88 +34,36 @@ uint32_t nvc0_grgpc_data[] = { ...@@ -34,88 +34,36 @@ uint32_t nvc0_grgpc_data[] = {
0x00000000, 0x00000000,
/* 0x0064: chipsets */ /* 0x0064: chipsets */
0x000000c0, 0x000000c0,
0x01940134, 0x013c00d4,
0x02ac0260, 0x018c0140,
0x000000c1, 0x000000c1,
0x01980134, 0x014000d4,
0x030802ac, 0x01a00140,
0x000000c3, 0x000000c3,
0x01940134, 0x013c00d4,
0x030402ac, 0x019c0140,
0x000000c4, 0x000000c4,
0x01940134, 0x013c00d4,
0x030402ac, 0x019c0140,
0x000000c8, 0x000000c8,
0x01940134, 0x013c00d4,
0x02ac0260, 0x018c0140,
0x000000ce, 0x000000ce,
0x013400d4, 0x013c00d4,
0x02600200, 0x019c0140,
0x000000cf, 0x000000cf,
0x013400d4, 0x013c00d4,
0x025c0200, 0x019c0140,
0x000000d9, 0x000000d9,
0x02000198, 0x014000d8,
0x03640308, 0x01a80140,
0x000000d7, 0x000000d7,
0x02000198, 0x014000d8,
0x03640308, 0x01a80140,
0x00000000, 0x00000000,
/* 0x00d4: nvc0_gpc_mmio_head */ /* 0x00d4: nvc0_gpc_mmio_head */
0x00000380, 0x00000408,
0x14000400, /* 0x00d8: nvd9_gpc_mmio_head */
0x20000450,
0x00000600,
0x00000684,
0x10000700,
0x00000800,
0x08000808,
0x00000828,
0x00000830,
0x000008d8,
0x000008e0,
0x140008e8,
0x0000091c,
0x08000924,
0x00000b00,
0x14000b08,
0x00000bb8,
0x00000c08,
0x1c000c10,
0x00000c80,
0x00000c8c,
0x08001000,
0x00001014,
/* 0x0134: nvc0_gpc_mmio_tail */
/* 0x0134: nnvc0_gpc_mmio_head */
0x00000380,
0x14000400,
0x20000450,
0x00000600,
0x00000684,
0x10000700,
0x00000800,
0x08000808,
0x00000828,
0x00000830,
0x000008d8,
0x000008e0,
0x140008e8,
0x0000091c,
0x08000924,
0x00000b00,
0x14000b08,
0x00000bb8,
0x00000c08,
0x1c000c10,
0x00000c80,
0x00000c8c,
0x08001000,
0x00001014,
/* 0x0194: nnvc0_gpc_mmio_tail */
0x00000c6c,
/* 0x0198: nnvc1_gpc_mmio_tail */
/* 0x0198: nvd9_gpc_mmio_head */
0x00000380, 0x00000380,
0x04000400, 0x04000400,
0x0800040c, 0x0800040c,
...@@ -137,41 +85,14 @@ uint32_t nvc0_grgpc_data[] = { ...@@ -137,41 +85,14 @@ uint32_t nvc0_grgpc_data[] = {
0x00000bb8, 0x00000bb8,
0x00000c08, 0x00000c08,
0x1c000c10, 0x1c000c10,
0x00000c6c,
0x00000c80, 0x00000c80,
0x00000c8c, 0x00000c8c,
0x08001000, 0x08001000,
0x00001014, 0x00001014,
/* 0x0200: nvd9_gpc_mmio_tail */ /* 0x013c: nvc0_gpc_mmio_tail */
/* 0x0200: nvc0_tpc_mmio_head */ 0x00000c6c,
0x00000018, /* 0x0140: nvc1_gpc_mmio_tail */
0x0000003c, /* 0x0140: nvc0_tpc_mmio_head */
0x00000048,
0x00000064,
0x00000088,
0x14000200,
0x0400021c,
0x14000300,
0x000003d0,
0x040003e0,
0x08000400,
0x00000420,
0x000004b0,
0x000004e8,
0x000004f4,
0x04000520,
0x0c000604,
0x4c000644,
0x00000698,
0x04000750,
/* 0x0250: nvc0_tpc_mmio_tail */
0x00000758,
0x000002c4,
0x000006e0,
/* 0x025c: nvcf_tpc_mmio_tail */
0x000004bc,
/* 0x0260: nvc3_tpc_mmio_tail */
/* 0x0260: nnvc0_tpc_mmio_head */
0x00000018, 0x00000018,
0x0000003c, 0x0000003c,
0x00000048, 0x00000048,
...@@ -191,57 +112,16 @@ uint32_t nvc0_grgpc_data[] = { ...@@ -191,57 +112,16 @@ uint32_t nvc0_grgpc_data[] = {
0x4c000644, 0x4c000644,
0x00000698, 0x00000698,
0x04000750, 0x04000750,
/* 0x02ac: nnvc0_tpc_mmio_tail */ /* 0x018c: nvc0_tpc_mmio_tail */
/* 0x02ac: nnvc3_tpc_mmio_head */
0x00000018,
0x0000003c,
0x00000048,
0x00000064,
0x00000088,
0x14000200,
0x0400021c,
0x000002c4,
0x14000300,
0x000003d0,
0x040003e0,
0x08000400,
0x00000420,
0x000004b0,
0x000004e8,
0x000004f4,
0x04000520,
0x0c000604,
0x4c000644,
0x00000698,
0x000006e0,
0x28000730,
/* 0x0304: nnvc3_tpc_mmio_tail */
0x00000544,
/* 0x0308: nnvc1_tpc_mmio_tail */
/* 0x0308: nvd9_tpc_mmio_head */
0x00000018,
0x0000003c,
0x00000048,
0x00000064,
0x00000088,
0x14000200,
0x0400021c, 0x0400021c,
0x000002c4, 0x000002c4,
0x14000300, 0x1c000730,
0x000003d0, 0x00000758,
0x040003e0, /* 0x019c: nvc3_tpc_mmio_tail */
0x08000400,
0x08000420,
0x000004b0,
0x000004e8,
0x000004f4,
0x04000520,
0x00000544, 0x00000544,
0x0c000604, /* 0x01a0: nvc1_tpc_mmio_tail */
0x4c000644, 0x04000424,
0x00000698,
0x000006e0, 0x000006e0,
0x28000730,
}; };
uint32_t nvc0_grgpc_code[] = { uint32_t nvc0_grgpc_code[] = {
......
drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnvc0.fuc
View file @ 57f0ec15
...@@ -48,20 +48,20 @@ xfer_data: .b32 0 ...@@ -48,20 +48,20 @@ xfer_data: .b32 0
.align 256 .align 256
chipsets: chipsets:
.b8 0xc0 0 0 0 .b8 0xc0 0 0 0
.b16 #nnvc0_hub_mmio_head .b16 #nvc0_hub_mmio_head
.b16 #nnvc0_hub_mmio_tail .b16 #nvc0_hub_mmio_tail
.b8 0xc1 0 0 0 .b8 0xc1 0 0 0
.b16 #nnvc0_hub_mmio_head .b16 #nvc0_hub_mmio_head
.b16 #nvc1_hub_mmio_tail .b16 #nvc1_hub_mmio_tail
.b8 0xc3 0 0 0 .b8 0xc3 0 0 0
.b16 #nnvc0_hub_mmio_head .b16 #nvc0_hub_mmio_head
.b16 #nnvc0_hub_mmio_tail .b16 #nvc0_hub_mmio_tail
.b8 0xc4 0 0 0 .b8 0xc4 0 0 0
.b16 #nnvc0_hub_mmio_head .b16 #nvc0_hub_mmio_head
.b16 #nnvc0_hub_mmio_tail .b16 #nvc0_hub_mmio_tail
.b8 0xc8 0 0 0 .b8 0xc8 0 0 0
.b16 #nnvc0_hub_mmio_head .b16 #nvc0_hub_mmio_head
.b16 #nnvc0_hub_mmio_tail .b16 #nvc0_hub_mmio_tail
.b8 0xce 0 0 0 .b8 0xce 0 0 0
.b16 #nvc0_hub_mmio_head .b16 #nvc0_hub_mmio_head
.b16 #nvc0_hub_mmio_tail .b16 #nvc0_hub_mmio_tail
...@@ -77,91 +77,8 @@ chipsets: ...@@ -77,91 +77,8 @@ chipsets:
.b8 0 0 0 0 .b8 0 0 0 0
nvc0_hub_mmio_head: nvc0_hub_mmio_head:
mmctx_data(0x17e91c, 2) mmctx_data(0x40402c, 1)
mmctx_data(0x400204, 2) mmctx_data(0x404174, 1)
mmctx_data(0x404004, 11)
mmctx_data(0x404044, 1)
mmctx_data(0x404094, 14)
mmctx_data(0x4040d0, 7)
mmctx_data(0x4040f8, 1)
mmctx_data(0x404130, 3)
mmctx_data(0x404150, 3)
mmctx_data(0x404164, 2)
mmctx_data(0x404174, 3)
mmctx_data(0x404200, 8)
mmctx_data(0x404404, 14)
mmctx_data(0x404460, 4)
mmctx_data(0x404480, 1)
mmctx_data(0x404498, 1)
mmctx_data(0x404604, 4)
mmctx_data(0x404618, 32)
mmctx_data(0x404698, 21)
mmctx_data(0x4046f0, 2)
mmctx_data(0x404700, 22)
mmctx_data(0x405800, 1)
mmctx_data(0x405830, 3)
mmctx_data(0x405854, 1)
mmctx_data(0x405870, 4)
mmctx_data(0x405a00, 2)
mmctx_data(0x405a18, 1)
mmctx_data(0x406020, 1)
mmctx_data(0x406028, 4)
mmctx_data(0x4064a8, 2)
mmctx_data(0x4064b4, 2)
mmctx_data(0x407804, 1)
mmctx_data(0x40780c, 6)
mmctx_data(0x4078bc, 1)
mmctx_data(0x408000, 7)
mmctx_data(0x408064, 1)
mmctx_data(0x408800, 3)
mmctx_data(0x408900, 4)
mmctx_data(0x408980, 1)
nvc0_hub_mmio_tail:
nnvc0_hub_mmio_head:
mmctx_data(0x17e91c, 2)
mmctx_data(0x400204, 2)
mmctx_data(0x404004, 11)
mmctx_data(0x404044, 1)
mmctx_data(0x404094, 14)
mmctx_data(0x4040d0, 7)
mmctx_data(0x4040f8, 1)
mmctx_data(0x404130, 3)
mmctx_data(0x404150, 3)
mmctx_data(0x404164, 2)
mmctx_data(0x404174, 3)
mmctx_data(0x404200, 8)
mmctx_data(0x404404, 14)
mmctx_data(0x404460, 4)
mmctx_data(0x404480, 1)
mmctx_data(0x404498, 1)
mmctx_data(0x404604, 4)
mmctx_data(0x404618, 32)
mmctx_data(0x404698, 21)
mmctx_data(0x4046f0, 2)
mmctx_data(0x404700, 22)
mmctx_data(0x405800, 1)
mmctx_data(0x405830, 3)
mmctx_data(0x405854, 1)
mmctx_data(0x405870, 4)
mmctx_data(0x405a00, 2)
mmctx_data(0x405a18, 1)
mmctx_data(0x406020, 1)
mmctx_data(0x406028, 4)
mmctx_data(0x4064a8, 2)
mmctx_data(0x4064b4, 2)
mmctx_data(0x407804, 1)
mmctx_data(0x40780c, 6)
mmctx_data(0x4078bc, 1)
mmctx_data(0x408000, 7)
mmctx_data(0x408064, 1)
mmctx_data(0x408800, 3)
mmctx_data(0x408900, 3)
mmctx_data(0x408980, 1)
nnvc0_hub_mmio_tail:
mmctx_data(0x4064c0, 2)
nvc1_hub_mmio_tail:
nvd9_hub_mmio_head: nvd9_hub_mmio_head:
mmctx_data(0x17e91c, 2) mmctx_data(0x17e91c, 2)
mmctx_data(0x400204, 2) mmctx_data(0x400204, 2)
...@@ -193,7 +110,7 @@ mmctx_data(0x405a18, 1) ...@@ -193,7 +110,7 @@ mmctx_data(0x405a18, 1)
mmctx_data(0x406020, 1) mmctx_data(0x406020, 1)
mmctx_data(0x406028, 4) mmctx_data(0x406028, 4)
mmctx_data(0x4064a8, 2) mmctx_data(0x4064a8, 2)
mmctx_data(0x4064b4, 5) mmctx_data(0x4064b4, 2)
mmctx_data(0x407804, 1) mmctx_data(0x407804, 1)
mmctx_data(0x40780c, 6) mmctx_data(0x40780c, 6)
mmctx_data(0x4078bc, 1) mmctx_data(0x4078bc, 1)
...@@ -202,6 +119,10 @@ mmctx_data(0x408064, 1) ...@@ -202,6 +119,10 @@ mmctx_data(0x408064, 1)
mmctx_data(0x408800, 3) mmctx_data(0x408800, 3)
mmctx_data(0x408900, 3) mmctx_data(0x408900, 3)
mmctx_data(0x408980, 1) mmctx_data(0x408980, 1)
nvc0_hub_mmio_tail:
mmctx_data(0x4064c0, 2)
nvc1_hub_mmio_tail:
mmctx_data(0x4064bc, 3)
nvd9_hub_mmio_tail: nvd9_hub_mmio_tail:
.section #nvc0_grhub_code .section #nvc0_grhub_code
......
drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnvc0.fuc.h
View file @ 57f0ec15
...@@ -203,109 +203,28 @@ uint32_t nvc0_grhub_data[] = { ...@@ -203,109 +203,28 @@ uint32_t nvc0_grhub_data[] = {
0x00000000, 0x00000000,
/* 0x0300: chipsets */ /* 0x0300: chipsets */
0x000000c0, 0x000000c0,
0x048403e8, 0x03f0034c,
0x000000c1, 0x000000c1,
0x048803e8, 0x03f4034c,
0x000000c3, 0x000000c3,
0x048403e8, 0x03f0034c,
0x000000c4, 0x000000c4,
0x048403e8, 0x03f0034c,
0x000000c8, 0x000000c8,
0x048403e8, 0x03f0034c,
0x000000ce, 0x000000ce,
0x03e8034c, 0x03f0034c,
0x000000cf, 0x000000cf,
0x03e8034c, 0x03f0034c,
0x000000d9, 0x000000d9,
0x05240488, 0x03f80354,
0x000000d7, 0x000000d7,
0x05240488, 0x03f80354,
0x00000000, 0x00000000,
/* 0x034c: nvc0_hub_mmio_head */ /* 0x034c: nvc0_hub_mmio_head */
0x0417e91c, 0x0040402c,
0x04400204, 0x00404174,
0x28404004, /* 0x0354: nvd9_hub_mmio_head */
0x00404044,
0x34404094,
0x184040d0,
0x004040f8,
0x08404130,
0x08404150,
0x04404164,
0x08404174,
0x1c404200,
0x34404404,
0x0c404460,
0x00404480,
0x00404498,
0x0c404604,
0x7c404618,
0x50404698,
0x044046f0,
0x54404700,
0x00405800,
0x08405830,
0x00405854,
0x0c405870,
0x04405a00,
0x00405a18,
0x00406020,
0x0c406028,
0x044064a8,
0x044064b4,
0x00407804,
0x1440780c,
0x004078bc,
0x18408000,
0x00408064,
0x08408800,
0x0c408900,
0x00408980,
/* 0x03e8: nvc0_hub_mmio_tail */
/* 0x03e8: nnvc0_hub_mmio_head */
0x0417e91c,
0x04400204,
0x28404004,
0x00404044,
0x34404094,
0x184040d0,
0x004040f8,
0x08404130,
0x08404150,
0x04404164,
0x08404174,
0x1c404200,
0x34404404,
0x0c404460,
0x00404480,
0x00404498,
0x0c404604,
0x7c404618,
0x50404698,
0x044046f0,
0x54404700,
0x00405800,
0x08405830,
0x00405854,
0x0c405870,
0x04405a00,
0x00405a18,
0x00406020,
0x0c406028,
0x044064a8,
0x044064b4,
0x00407804,
0x1440780c,
0x004078bc,
0x18408000,
0x00408064,
0x08408800,
0x08408900,
0x00408980,
/* 0x0484: nnvc0_hub_mmio_tail */
0x044064c0,
/* 0x0488: nvc1_hub_mmio_tail */
/* 0x0488: nvd9_hub_mmio_head */
0x0417e91c, 0x0417e91c,
0x04400204, 0x04400204,
0x24404004, 0x24404004,
...@@ -336,7 +255,7 @@ uint32_t nvc0_grhub_data[] = { ...@@ -336,7 +255,7 @@ uint32_t nvc0_grhub_data[] = {
0x00406020, 0x00406020,
0x0c406028, 0x0c406028,
0x044064a8, 0x044064a8,
0x104064b4, 0x044064b4,
0x00407804, 0x00407804,
0x1440780c, 0x1440780c,
0x004078bc, 0x004078bc,
...@@ -345,6 +264,10 @@ uint32_t nvc0_grhub_data[] = { ...@@ -345,6 +264,10 @@ uint32_t nvc0_grhub_data[] = {
0x08408800, 0x08408800,
0x08408900, 0x08408900,
0x00408980, 0x00408980,
/* 0x03f0: nvc0_hub_mmio_tail */
0x044064c0,
/* 0x03f4: nvc1_hub_mmio_tail */
0x084064bc,
}; };
uint32_t nvc0_grhub_code[] = { uint32_t nvc0_grhub_code[] = {
......
drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c
View file @ 57f0ec15
...@@ -757,7 +757,11 @@ nvc0_graph_init_unk64xx(struct nvc0_graph_priv *priv) ...@@ -757,7 +757,11 @@ nvc0_graph_init_unk64xx(struct nvc0_graph_priv *priv)
case 0xc4: case 0xc4:
case 0xc1: case 0xc1:
case 0xc8: case 0xc8:
case 0xce:
case 0xcf:
break;
default: default:
BUG_ON(1);
break; break;
} }
} }
...@@ -771,13 +775,17 @@ nvc0_graph_init_unk58xx(struct nvc0_graph_priv *priv) ...@@ -771,13 +775,17 @@ nvc0_graph_init_unk58xx(struct nvc0_graph_priv *priv)
case 0xc3: case 0xc3:
case 0xc4: case 0xc4:
case 0xc1: case 0xc1:
case 0xce:
case 0xcf:
case 0xd9: case 0xd9:
case 0xd7: case 0xd7:
nv_wr32(priv, 0x405900, 0x00002834); nv_wr32(priv, 0x405900, 0x00002834);
break; break;
case 0xc0: case 0xc0:
case 0xc8: case 0xc8:
break;
default: default:
BUG_ON(1);
break; break;
} }
nv_wr32(priv, 0x405908, 0x00000000); nv_wr32(priv, 0x405908, 0x00000000);
...@@ -792,7 +800,11 @@ nvc0_graph_init_unk58xx(struct nvc0_graph_priv *priv) ...@@ -792,7 +800,11 @@ nvc0_graph_init_unk58xx(struct nvc0_graph_priv *priv)
case 0xc4: case 0xc4:
case 0xc1: case 0xc1:
case 0xc8: case 0xc8:
case 0xce:
case 0xcf:
break;
default: default:
BUG_ON(1);
break; break;
} }
} }
...@@ -816,7 +828,11 @@ nvc0_graph_init_gpc(struct nvc0_graph_priv *priv) ...@@ -816,7 +828,11 @@ nvc0_graph_init_gpc(struct nvc0_graph_priv *priv)
case 0xc4: case 0xc4:
case 0xc1: case 0xc1:
case 0xc8: case 0xc8:
case 0xce:
case 0xcf:
break;
default: default:
BUG_ON(1);
break; break;
} }
nv_wr32(priv, 0x4184a0, 0x00000000); nv_wr32(priv, 0x4184a0, 0x00000000);
...@@ -831,7 +847,11 @@ nvc0_graph_init_gpc(struct nvc0_graph_priv *priv) ...@@ -831,7 +847,11 @@ nvc0_graph_init_gpc(struct nvc0_graph_priv *priv)
case 0xc4: case 0xc4:
case 0xc1: case 0xc1:
case 0xc8: case 0xc8:
case 0xce:
case 0xcf:
break;
default: default:
BUG_ON(1);
break; break;
} }
nv_wr32(priv, 0x418604, 0x00000000); nv_wr32(priv, 0x418604, 0x00000000);
...@@ -846,9 +866,13 @@ nvc0_graph_init_gpc(struct nvc0_graph_priv *priv) ...@@ -846,9 +866,13 @@ nvc0_graph_init_gpc(struct nvc0_graph_priv *priv)
case 0xc3: case 0xc3:
case 0xc4: case 0xc4:
case 0xc8: case 0xc8:
default: case 0xce:
case 0xcf:
nv_wr32(priv, 0x418714, 0x80000000); nv_wr32(priv, 0x418714, 0x80000000);
break; break;
default:
BUG_ON(1);
break;
} }
nv_wr32(priv, 0x418384, 0x00000000); nv_wr32(priv, 0x418384, 0x00000000);
nv_wr32(priv, 0x418814, 0x00000000); nv_wr32(priv, 0x418814, 0x00000000);
...@@ -865,9 +889,13 @@ nvc0_graph_init_gpc(struct nvc0_graph_priv *priv) ...@@ -865,9 +889,13 @@ nvc0_graph_init_gpc(struct nvc0_graph_priv *priv)
case 0xc0: case 0xc0:
case 0xc3: case 0xc3:
case 0xc4: case 0xc4:
default: case 0xce:
case 0xcf:
nv_wr32(priv, 0x4188c8, 0x80000000); nv_wr32(priv, 0x4188c8, 0x80000000);
break; break;
default:
BUG_ON(1);
break;
} }
nv_wr32(priv, 0x4188cc, 0x00000000); nv_wr32(priv, 0x4188cc, 0x00000000);
nv_wr32(priv, 0x4188d0, 0x00010000); nv_wr32(priv, 0x4188d0, 0x00010000);
...@@ -891,7 +919,11 @@ nvc0_graph_init_gpc(struct nvc0_graph_priv *priv) ...@@ -891,7 +919,11 @@ nvc0_graph_init_gpc(struct nvc0_graph_priv *priv)
case 0xc4: case 0xc4:
case 0xc1: case 0xc1:
case 0xc8: case 0xc8:
case 0xce:
case 0xcf:
break;
default: default:
BUG_ON(1);
break; break;
} }
nv_wr32(priv, 0x418c88, 0x00000000); nv_wr32(priv, 0x418c88, 0x00000000);
...@@ -906,7 +938,11 @@ nvc0_graph_init_gpc(struct nvc0_graph_priv *priv) ...@@ -906,7 +938,11 @@ nvc0_graph_init_gpc(struct nvc0_graph_priv *priv)
case 0xc4: case 0xc4:
case 0xc1: case 0xc1:
case 0xc8: case 0xc8:
case 0xce:
case 0xcf:
break;
default: default:
BUG_ON(1);
break; break;
} }
nv_wr32(priv, 0x418d00, 0x00000000); nv_wr32(priv, 0x418d00, 0x00000000);
...@@ -922,7 +958,11 @@ nvc0_graph_init_gpc(struct nvc0_graph_priv *priv) ...@@ -922,7 +958,11 @@ nvc0_graph_init_gpc(struct nvc0_graph_priv *priv)
case 0xc4: case 0xc4:
case 0xc1: case 0xc1:
case 0xc8: case 0xc8:
case 0xce:
case 0xcf:
break;
default: default:
BUG_ON(1);
break; break;
} }
nv_wr32(priv, 0x418f08, 0x00000000); nv_wr32(priv, 0x418f08, 0x00000000);
...@@ -939,9 +979,13 @@ nvc0_graph_init_gpc(struct nvc0_graph_priv *priv) ...@@ -939,9 +979,13 @@ nvc0_graph_init_gpc(struct nvc0_graph_priv *priv)
case 0xc3: case 0xc3:
case 0xc4: case 0xc4:
case 0xc8: case 0xc8:
default: case 0xce:
case 0xcf:
nv_wr32(priv, 0x418e00, 0x00000050); nv_wr32(priv, 0x418e00, 0x00000050);
break; break;
default:
BUG_ON(1);
break;
} }
nv_wr32(priv, 0x418e08, 0x00000000); nv_wr32(priv, 0x418e08, 0x00000000);
switch (nv_device(priv)->chipset) { switch (nv_device(priv)->chipset) {
...@@ -955,7 +999,11 @@ nvc0_graph_init_gpc(struct nvc0_graph_priv *priv) ...@@ -955,7 +999,11 @@ nvc0_graph_init_gpc(struct nvc0_graph_priv *priv)
case 0xc4: case 0xc4:
case 0xc1: case 0xc1:
case 0xc8: case 0xc8:
case 0xce:
case 0xcf:
break;
default: default:
BUG_ON(1);
break; break;
} }
nv_wr32(priv, 0x41900c, 0x00000000); nv_wr32(priv, 0x41900c, 0x00000000);
...@@ -973,13 +1021,17 @@ nvc0_graph_init_tpc(struct nvc0_graph_priv *priv) ...@@ -973,13 +1021,17 @@ nvc0_graph_init_tpc(struct nvc0_graph_priv *priv)
case 0xc3: case 0xc3:
case 0xc4: case 0xc4:
case 0xc1: case 0xc1:
case 0xce:
case 0xcf:
case 0xd9: case 0xd9:
case 0xd7: case 0xd7:
nv_wr32(priv, 0x419ac8, 0x00000000); nv_wr32(priv, 0x419ac8, 0x00000000);
break; break;
case 0xc0: case 0xc0:
case 0xc8: case 0xc8:
break;
default: default:
BUG_ON(1);
break; break;
} }
nv_wr32(priv, 0x419ab8, 0x000000e7); nv_wr32(priv, 0x419ab8, 0x000000e7);
...@@ -996,9 +1048,13 @@ nvc0_graph_init_tpc(struct nvc0_graph_priv *priv) ...@@ -996,9 +1048,13 @@ nvc0_graph_init_tpc(struct nvc0_graph_priv *priv)
case 0xc4: case 0xc4:
case 0xc1: case 0xc1:
case 0xc8: case 0xc8:
default: case 0xce:
case 0xcf:
nv_wr32(priv, 0x41980c, 0x00000000); nv_wr32(priv, 0x41980c, 0x00000000);
break; break;
default:
BUG_ON(1);
break;
} }
nv_wr32(priv, 0x419810, 0x00000000); nv_wr32(priv, 0x419810, 0x00000000);
switch (nv_device(priv)->chipset) { switch (nv_device(priv)->chipset) {
...@@ -1011,9 +1067,13 @@ nvc0_graph_init_tpc(struct nvc0_graph_priv *priv) ...@@ -1011,9 +1067,13 @@ nvc0_graph_init_tpc(struct nvc0_graph_priv *priv)
case 0xc3: case 0xc3:
case 0xc4: case 0xc4:
case 0xc8: case 0xc8:
default: case 0xce:
case 0xcf:
nv_wr32(priv, 0x419814, 0x00000000); nv_wr32(priv, 0x419814, 0x00000000);
break; break;
default:
BUG_ON(1);
break;
} }
nv_wr32(priv, 0x419844, 0x00000000); nv_wr32(priv, 0x419844, 0x00000000);
switch (nv_device(priv)->chipset) { switch (nv_device(priv)->chipset) {
...@@ -1026,9 +1086,13 @@ nvc0_graph_init_tpc(struct nvc0_graph_priv *priv) ...@@ -1026,9 +1086,13 @@ nvc0_graph_init_tpc(struct nvc0_graph_priv *priv)
case 0xc4: case 0xc4:
case 0xc1: case 0xc1:
case 0xc8: case 0xc8:
default: case 0xce:
case 0xcf:
nv_wr32(priv, 0x41984c, 0x00005bc5); nv_wr32(priv, 0x41984c, 0x00005bc5);
break; break;
default:
BUG_ON(1);
break;
} }
nv_wr32(priv, 0x419850, 0x00000000); nv_wr32(priv, 0x419850, 0x00000000);
nv_wr32(priv, 0x419854, 0x00000000); nv_wr32(priv, 0x419854, 0x00000000);
...@@ -1038,13 +1102,17 @@ nvc0_graph_init_tpc(struct nvc0_graph_priv *priv) ...@@ -1038,13 +1102,17 @@ nvc0_graph_init_tpc(struct nvc0_graph_priv *priv)
case 0xc3: case 0xc3:
case 0xc4: case 0xc4:
case 0xc1: case 0xc1:
case 0xce:
case 0xcf:
case 0xd9: case 0xd9:
case 0xd7: case 0xd7:
nv_wr32(priv, 0x419880, 0x00000002); nv_wr32(priv, 0x419880, 0x00000002);
break; break;
case 0xc0: case 0xc0:
case 0xc8: case 0xc8:
break;
default: default:
BUG_ON(1);
break; break;
} }
nv_wr32(priv, 0x419c98, 0x00000000); nv_wr32(priv, 0x419c98, 0x00000000);
...@@ -1067,7 +1135,11 @@ nvc0_graph_init_tpc(struct nvc0_graph_priv *priv) ...@@ -1067,7 +1135,11 @@ nvc0_graph_init_tpc(struct nvc0_graph_priv *priv)
case 0xc4: case 0xc4:
case 0xc1: case 0xc1:
case 0xc8: case 0xc8:
case 0xce:
case 0xcf:
break;
default: default:
BUG_ON(1);
break; break;
} }
nv_wr32(priv, 0x419d2c, 0x00000000); nv_wr32(priv, 0x419d2c, 0x00000000);
...@@ -1082,7 +1154,11 @@ nvc0_graph_init_tpc(struct nvc0_graph_priv *priv) ...@@ -1082,7 +1154,11 @@ nvc0_graph_init_tpc(struct nvc0_graph_priv *priv)
case 0xc4: case 0xc4:
case 0xc1: case 0xc1:
case 0xc8: case 0xc8:
case 0xce:
case 0xcf:
break;
default: default:
BUG_ON(1);
break; break;
} }
nv_wr32(priv, 0x419c0c, 0x00000000); nv_wr32(priv, 0x419c0c, 0x00000000);
...@@ -1099,9 +1175,13 @@ nvc0_graph_init_tpc(struct nvc0_graph_priv *priv) ...@@ -1099,9 +1175,13 @@ nvc0_graph_init_tpc(struct nvc0_graph_priv *priv)
case 0xc4: case 0xc4:
case 0xc1: case 0xc1:
case 0xc8: case 0xc8:
default: case 0xce:
case 0xcf:
nv_wr32(priv, 0x419ea8, 0x00001100); nv_wr32(priv, 0x419ea8, 0x00001100);
break; break;
default:
BUG_ON(1);
break;
} }
switch (nv_device(priv)->chipset) { switch (nv_device(priv)->chipset) {
...@@ -1112,11 +1192,15 @@ nvc0_graph_init_tpc(struct nvc0_graph_priv *priv) ...@@ -1112,11 +1192,15 @@ nvc0_graph_init_tpc(struct nvc0_graph_priv *priv)
case 0xc3: case 0xc3:
case 0xc4: case 0xc4:
case 0xc1: case 0xc1:
case 0xce:
case 0xcf:
case 0xd9: case 0xd9:
case 0xd7: case 0xd7:
default:
nv_wr32(priv, 0x419eac, 0x11100702); nv_wr32(priv, 0x419eac, 0x11100702);
break; break;
default:
BUG_ON(1);
break;
} }
nv_wr32(priv, 0x419eb0, 0x00000003); nv_wr32(priv, 0x419eb0, 0x00000003);
nv_wr32(priv, 0x419eb4, 0x00000000); nv_wr32(priv, 0x419eb4, 0x00000000);
...@@ -1127,6 +1211,8 @@ nvc0_graph_init_tpc(struct nvc0_graph_priv *priv) ...@@ -1127,6 +1211,8 @@ nvc0_graph_init_tpc(struct nvc0_graph_priv *priv)
case 0xc3: case 0xc3:
case 0xc4: case 0xc4:
case 0xc1: case 0xc1:
case 0xce:
case 0xcf:
case 0xd9: case 0xd9:
case 0xd7: case 0xd7:
nv_wr32(priv, 0x419ec8, 0x0e063818); nv_wr32(priv, 0x419ec8, 0x0e063818);
...@@ -1135,10 +1221,12 @@ nvc0_graph_init_tpc(struct nvc0_graph_priv *priv) ...@@ -1135,10 +1221,12 @@ nvc0_graph_init_tpc(struct nvc0_graph_priv *priv)
break; break;
case 0xc0: case 0xc0:
case 0xc8: case 0xc8:
default:
nv_wr32(priv, 0x419ec8, 0x06060618); nv_wr32(priv, 0x419ec8, 0x06060618);
nv_wr32(priv, 0x419ed0, 0x0eff0e38); nv_wr32(priv, 0x419ed0, 0x0eff0e38);
break; break;
default:
BUG_ON(1);
break;
} }
nv_wr32(priv, 0x419ed4, 0x011104f1); nv_wr32(priv, 0x419ed4, 0x011104f1);
nv_wr32(priv, 0x419edc, 0x00000000); nv_wr32(priv, 0x419edc, 0x00000000);
...@@ -1407,30 +1495,16 @@ nvc0_graph_init(struct nouveau_object *object) ...@@ -1407,30 +1495,16 @@ nvc0_graph_init(struct nouveau_object *object)
nvc0_graph_init_obj418880(priv); nvc0_graph_init_obj418880(priv);
nvc0_graph_init_regs(priv); nvc0_graph_init_regs(priv);
nvc0_graph_init_unk40xx(priv);
switch (nv_device(priv)->chipset) { nvc0_graph_init_unk44xx(priv);
case 0xc0: nvc0_graph_init_unk78xx(priv);
case 0xc3: nvc0_graph_init_unk60xx(priv);
case 0xc4: nvc0_graph_init_unk64xx(priv);
case 0xc1: nvc0_graph_init_unk58xx(priv);
case 0xc8: nvc0_graph_init_unk80xx(priv);
case 0xd9: nvc0_graph_init_gpc(priv);
case 0xd7: nvc0_graph_init_tpc(priv);
nvc0_graph_init_unk40xx(priv); nvc0_graph_init_unk88xx(priv);
nvc0_graph_init_unk44xx(priv);
nvc0_graph_init_unk78xx(priv);
nvc0_graph_init_unk60xx(priv);
nvc0_graph_init_unk64xx(priv);
nvc0_graph_init_unk58xx(priv);
nvc0_graph_init_unk80xx(priv);
nvc0_graph_init_gpc(priv);
nvc0_graph_init_tpc(priv);
nvc0_graph_init_unk88xx(priv);
break;
default:
break;
}
nvc0_graph_init_gpc_0(priv); nvc0_graph_init_gpc_0(priv);
/*nvc0_graph_init_unitplemented_c242(priv);*/ /*nvc0_graph_init_unitplemented_c242(priv);*/
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7