Skip to content

L
linux
Commit 1dd44acf authored by Ben Skeggs's avatar Ben Skeggs
Browse files
Options

drm/nve4/gr: update initial register/context values 

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent a8004a9e
Hide whitespace changes
Inline Side-by-side
Showing with 31 additions and 157 deletions
drivers/gpu/drm/nouveau/core/engine/graph/ctxnve0.c
View file @ 1dd44acf
...@@ -749,38 +749,6 @@ nve0_grctx_generate_icmd(struct nvc0_graph_priv *priv) ...@@ -749,38 +749,6 @@ nve0_grctx_generate_icmd(struct nvc0_graph_priv *priv)
nv_icmd(priv, 0x000841, 0x08000080); nv_icmd(priv, 0x000841, 0x08000080);
nv_icmd(priv, 0x000842, 0x00400008); nv_icmd(priv, 0x000842, 0x00400008);
nv_icmd(priv, 0x000843, 0x08000080); nv_icmd(priv, 0x000843, 0x08000080);
switch (nv_device(priv)->chipset) {
case 0xe7:
case 0xe6:
break;
default:
nv_icmd(priv, 0x000818, 0x00000000);
nv_icmd(priv, 0x000819, 0x00000000);
nv_icmd(priv, 0x00081a, 0x00000000);
nv_icmd(priv, 0x00081b, 0x00000000);
nv_icmd(priv, 0x00081c, 0x00000000);
nv_icmd(priv, 0x00081d, 0x00000000);
nv_icmd(priv, 0x00081e, 0x00000000);
nv_icmd(priv, 0x00081f, 0x00000000);
nv_icmd(priv, 0x000848, 0x00000000);
nv_icmd(priv, 0x000849, 0x00000000);
nv_icmd(priv, 0x00084a, 0x00000000);
nv_icmd(priv, 0x00084b, 0x00000000);
nv_icmd(priv, 0x00084c, 0x00000000);
nv_icmd(priv, 0x00084d, 0x00000000);
nv_icmd(priv, 0x00084e, 0x00000000);
nv_icmd(priv, 0x00084f, 0x00000000);
nv_icmd(priv, 0x000850, 0x00000000);
nv_icmd(priv, 0x000851, 0x00000000);
nv_icmd(priv, 0x000852, 0x00000000);
nv_icmd(priv, 0x000853, 0x00000000);
nv_icmd(priv, 0x000854, 0x00000000);
nv_icmd(priv, 0x000855, 0x00000000);
nv_icmd(priv, 0x000856, 0x00000000);
nv_icmd(priv, 0x000857, 0x00000000);
nv_icmd(priv, 0x000738, 0x00000000);
break;
}
nv_icmd(priv, 0x0006aa, 0x00000001); nv_icmd(priv, 0x0006aa, 0x00000001);
nv_icmd(priv, 0x0006ab, 0x00000002); nv_icmd(priv, 0x0006ab, 0x00000002);
nv_icmd(priv, 0x0006ac, 0x00000080); nv_icmd(priv, 0x0006ac, 0x00000080);
...@@ -869,38 +837,6 @@ nve0_grctx_generate_icmd(struct nvc0_graph_priv *priv) ...@@ -869,38 +837,6 @@ nve0_grctx_generate_icmd(struct nvc0_graph_priv *priv)
nv_icmd(priv, 0x000813, 0x00000006); nv_icmd(priv, 0x000813, 0x00000006);
nv_icmd(priv, 0x000814, 0x00000008); nv_icmd(priv, 0x000814, 0x00000008);
nv_icmd(priv, 0x000957, 0x00000003); nv_icmd(priv, 0x000957, 0x00000003);
switch (nv_device(priv)->chipset) {
case 0xe7:
case 0xe6:
break;
default:
nv_icmd(priv, 0x000818, 0x00000000);
nv_icmd(priv, 0x000819, 0x00000000);
nv_icmd(priv, 0x00081a, 0x00000000);
nv_icmd(priv, 0x00081b, 0x00000000);
nv_icmd(priv, 0x00081c, 0x00000000);
nv_icmd(priv, 0x00081d, 0x00000000);
nv_icmd(priv, 0x00081e, 0x00000000);
nv_icmd(priv, 0x00081f, 0x00000000);
nv_icmd(priv, 0x000848, 0x00000000);
nv_icmd(priv, 0x000849, 0x00000000);
nv_icmd(priv, 0x00084a, 0x00000000);
nv_icmd(priv, 0x00084b, 0x00000000);
nv_icmd(priv, 0x00084c, 0x00000000);
nv_icmd(priv, 0x00084d, 0x00000000);
nv_icmd(priv, 0x00084e, 0x00000000);
nv_icmd(priv, 0x00084f, 0x00000000);
nv_icmd(priv, 0x000850, 0x00000000);
nv_icmd(priv, 0x000851, 0x00000000);
nv_icmd(priv, 0x000852, 0x00000000);
nv_icmd(priv, 0x000853, 0x00000000);
nv_icmd(priv, 0x000854, 0x00000000);
nv_icmd(priv, 0x000855, 0x00000000);
nv_icmd(priv, 0x000856, 0x00000000);
nv_icmd(priv, 0x000857, 0x00000000);
nv_icmd(priv, 0x000738, 0x00000000);
break;
}
nv_icmd(priv, 0x000b07, 0x00000002); nv_icmd(priv, 0x000b07, 0x00000002);
nv_icmd(priv, 0x000b08, 0x00000100); nv_icmd(priv, 0x000b08, 0x00000100);
nv_icmd(priv, 0x000b09, 0x00000100); nv_icmd(priv, 0x000b09, 0x00000100);
...@@ -2180,6 +2116,7 @@ nve0_grctx_generate_902d(struct nvc0_graph_priv *priv) ...@@ -2180,6 +2116,7 @@ nve0_grctx_generate_902d(struct nvc0_graph_priv *priv)
case 0xe6: case 0xe6:
nv_mthd(priv, 0x902d, 0x3410, 0x80002006); nv_mthd(priv, 0x902d, 0x3410, 0x80002006);
break; break;
case 0xe4:
case 0xe7: case 0xe7:
default: default:
nv_mthd(priv, 0x902d, 0x3410, 0x00000000); nv_mthd(priv, 0x902d, 0x3410, 0x00000000);
...@@ -2716,6 +2653,7 @@ nve0_graph_generate_tpc(struct nvc0_graph_priv *priv) ...@@ -2716,6 +2653,7 @@ nve0_graph_generate_tpc(struct nvc0_graph_priv *priv)
nv_wr32(priv, 0x419e94, 0x0); nv_wr32(priv, 0x419e94, 0x0);
nv_wr32(priv, 0x419e98, 0x0); nv_wr32(priv, 0x419e98, 0x0);
switch (nv_device(priv)->chipset) { switch (nv_device(priv)->chipset) {
case 0xe4:
case 0xe7: case 0xe7:
case 0xe6: case 0xe6:
nv_wr32(priv, 0x419eac, 0x1f8f); nv_wr32(priv, 0x419eac, 0x1f8f);
...@@ -2726,10 +2664,6 @@ nve0_graph_generate_tpc(struct nvc0_graph_priv *priv) ...@@ -2726,10 +2664,6 @@ nve0_graph_generate_tpc(struct nvc0_graph_priv *priv)
nv_wr32(priv, 0x419eb0, 0xdb00da0); nv_wr32(priv, 0x419eb0, 0xdb00da0);
nv_wr32(priv, 0x419eb8, 0x0); nv_wr32(priv, 0x419eb8, 0x0);
break; break;
default:
nv_wr32(priv, 0x419eac, 0x1fcf);
nv_wr32(priv, 0x419eb0, 0xd3f);
break;
} }
nv_wr32(priv, 0x419ec8, 0x1304f); nv_wr32(priv, 0x419ec8, 0x1304f);
nv_wr32(priv, 0x419f30, 0x0); nv_wr32(priv, 0x419f30, 0x0);
...@@ -2749,6 +2683,7 @@ nve0_graph_generate_tpc(struct nvc0_graph_priv *priv) ...@@ -2749,6 +2683,7 @@ nve0_graph_generate_tpc(struct nvc0_graph_priv *priv)
nv_wr32(priv, 0x419f4c, 0x0); nv_wr32(priv, 0x419f4c, 0x0);
nv_wr32(priv, 0x419f58, 0x0); nv_wr32(priv, 0x419f58, 0x0);
switch (nv_device(priv)->chipset) { switch (nv_device(priv)->chipset) {
case 0xe4:
case 0xe7: case 0xe7:
case 0xe6: case 0xe6:
nv_wr32(priv, 0x419f70, 0x0); nv_wr32(priv, 0x419f70, 0x0);
...@@ -2760,9 +2695,6 @@ nve0_graph_generate_tpc(struct nvc0_graph_priv *priv) ...@@ -2760,9 +2695,6 @@ nve0_graph_generate_tpc(struct nvc0_graph_priv *priv)
nv_wr32(priv, 0x419f78, 0xeb); nv_wr32(priv, 0x419f78, 0xeb);
nv_wr32(priv, 0x419f7c, 0x404); nv_wr32(priv, 0x419f7c, 0x404);
break; break;
default:
nv_wr32(priv, 0x419f78, 0xb);
break;
} }
} }
......
drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnve0.fuc
View file @ 1dd44acf
...@@ -55,13 +55,13 @@ chipsets: ...@@ -55,13 +55,13 @@ chipsets:
.b8 0xe7 0 0 0 .b8 0xe7 0 0 0
.b16 #nve4_gpc_mmio_head .b16 #nve4_gpc_mmio_head
.b16 #nve4_gpc_mmio_tail .b16 #nve4_gpc_mmio_tail
.b16 #nve6_tpc_mmio_head .b16 #nve4_tpc_mmio_head
.b16 #nve6_tpc_mmio_tail .b16 #nve4_tpc_mmio_tail
.b8 0xe6 0 0 0 .b8 0xe6 0 0 0
.b16 #nve4_gpc_mmio_head .b16 #nve4_gpc_mmio_head
.b16 #nve4_gpc_mmio_tail .b16 #nve4_gpc_mmio_tail
.b16 #nve6_tpc_mmio_head .b16 #nve4_tpc_mmio_head
.b16 #nve6_tpc_mmio_tail .b16 #nve4_tpc_mmio_tail
.b8 0xf0 0 0 0 .b8 0xf0 0 0 0
.b16 #nvf0_gpc_mmio_head .b16 #nvf0_gpc_mmio_head
.b16 #nvf0_gpc_mmio_tail .b16 #nvf0_gpc_mmio_tail
...@@ -156,30 +156,9 @@ mmctx_data(0x0006ac, 2) ...@@ -156,30 +156,9 @@ mmctx_data(0x0006ac, 2)
mmctx_data(0x0006c8, 1) mmctx_data(0x0006c8, 1)
mmctx_data(0x000730, 8) mmctx_data(0x000730, 8)
mmctx_data(0x000758, 1) mmctx_data(0x000758, 1)
mmctx_data(0x000778, 1)
nve4_tpc_mmio_tail:
nve6_tpc_mmio_head:
mmctx_data(0x000048, 1)
mmctx_data(0x000064, 1)
mmctx_data(0x000088, 1)
mmctx_data(0x000200, 6)
mmctx_data(0x00021c, 2)
mmctx_data(0x000230, 1)
mmctx_data(0x0002c4, 1)
mmctx_data(0x000400, 3)
mmctx_data(0x000420, 3)
mmctx_data(0x0004e8, 1)
mmctx_data(0x0004f4, 1)
mmctx_data(0x000604, 4)
mmctx_data(0x000644, 22)
mmctx_data(0x0006ac, 2)
mmctx_data(0x0006c8, 1)
mmctx_data(0x000730, 8)
mmctx_data(0x000758, 1)
mmctx_data(0x000770, 1) mmctx_data(0x000770, 1)
mmctx_data(0x000778, 2) mmctx_data(0x000778, 2)
nve6_tpc_mmio_tail: nve4_tpc_mmio_tail:
nvf0_tpc_mmio_head: nvf0_tpc_mmio_head:
mmctx_data(0x000048, 1) mmctx_data(0x000048, 1)
......
drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnve0.fuc.h
View file @ 1dd44acf
...@@ -35,16 +35,16 @@ uint32_t nve0_grgpc_data[] = { ...@@ -35,16 +35,16 @@ uint32_t nve0_grgpc_data[] = {
/* 0x0064: chipsets */ /* 0x0064: chipsets */
0x000000e4, 0x000000e4,
0x011c0098, 0x011c0098,
0x01d4018c, 0x01d8018c,
0x000000e7, 0x000000e7,
0x011c0098, 0x011c0098,
0x022001d4, 0x01d8018c,
0x000000e6, 0x000000e6,
0x011c0098, 0x011c0098,
0x022001d4, 0x01d8018c,
0x000000f0, 0x000000f0,
0x018c011c, 0x018c011c,
0x02700220, 0x022801d8,
0x00000000, 0x00000000,
/* 0x0098: nve4_gpc_mmio_head */ /* 0x0098: nve4_gpc_mmio_head */
0x00000380, 0x00000380,
...@@ -112,26 +112,6 @@ uint32_t nve0_grgpc_data[] = { ...@@ -112,26 +112,6 @@ uint32_t nve0_grgpc_data[] = {
0x00001014, 0x00001014,
/* 0x018c: nvf0_gpc_mmio_tail */ /* 0x018c: nvf0_gpc_mmio_tail */
/* 0x018c: nve4_tpc_mmio_head */ /* 0x018c: nve4_tpc_mmio_head */
0x00000048,
0x00000064,
0x00000088,
0x14000200,
0x0400021c,
0x00000230,
0x000002c4,
0x08000400,
0x08000420,
0x000004e8,
0x000004f4,
0x0c000604,
0x54000644,
0x040006ac,
0x000006c8,
0x1c000730,
0x00000758,
0x00000778,
/* 0x01d4: nve4_tpc_mmio_tail */
/* 0x01d4: nve6_tpc_mmio_head */
0x00000048, 0x00000048,
0x00000064, 0x00000064,
0x00000088, 0x00000088,
...@@ -151,8 +131,8 @@ uint32_t nve0_grgpc_data[] = { ...@@ -151,8 +131,8 @@ uint32_t nve0_grgpc_data[] = {
0x00000758, 0x00000758,
0x00000770, 0x00000770,
0x04000778, 0x04000778,
/* 0x0220: nve6_tpc_mmio_tail */ /* 0x01d8: nve4_tpc_mmio_tail */
/* 0x0220: nvf0_tpc_mmio_head */ /* 0x01d8: nvf0_tpc_mmio_head */
0x00000048, 0x00000048,
0x00000064, 0x00000064,
0x00000088, 0x00000088,
......
drivers/gpu/drm/nouveau/core/engine/graph/nve0.c
View file @ 1dd44acf
...@@ -475,6 +475,7 @@ nve0_graph_ctor(struct nouveau_object *parent, struct nouveau_object *engine, ...@@ -475,6 +475,7 @@ nve0_graph_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
case 0xe6: case 0xe6:
priv->magic_not_rop_nr = 1; priv->magic_not_rop_nr = 1;
break; break;
case 0xf0:
default: default:
break; break;
} }
...@@ -803,11 +804,12 @@ nve0_graph_init_units(struct nvc0_graph_priv *priv) ...@@ -803,11 +804,12 @@ nve0_graph_init_units(struct nvc0_graph_priv *priv)
nv_wr32(priv, 0x409ffc, 0x00000000); nv_wr32(priv, 0x409ffc, 0x00000000);
nv_wr32(priv, 0x409c14, 0x00003e3e); nv_wr32(priv, 0x409c14, 0x00003e3e);
switch (nv_device(priv)->chipset) { switch (nv_device(priv)->chipset) {
case 0xe4:
case 0xe7: case 0xe7:
case 0xe6: case 0xe6:
nv_wr32(priv, 0x409c24, 0x000f0001); nv_wr32(priv, 0x409c24, 0x000f0001);
break; break;
default: case 0xf0:
nv_wr32(priv, 0x409c24, 0x000f0000); nv_wr32(priv, 0x409c24, 0x000f0000);
break; break;
} }
...@@ -817,16 +819,7 @@ nve0_graph_init_units(struct nvc0_graph_priv *priv) ...@@ -817,16 +819,7 @@ nve0_graph_init_units(struct nvc0_graph_priv *priv)
nv_wr32(priv, 0x408030, 0xc0000000); nv_wr32(priv, 0x408030, 0xc0000000);
nv_wr32(priv, 0x404490, 0xc0000000); nv_wr32(priv, 0x404490, 0xc0000000);
nv_wr32(priv, 0x406018, 0xc0000000); nv_wr32(priv, 0x406018, 0xc0000000);
switch (nv_device(priv)->chipset) { nv_wr32(priv, 0x407020, 0x40000000);
case 0xe7:
case 0xe6:
case 0xf0:
nv_wr32(priv, 0x407020, 0x40000000);
break;
default:
nv_wr32(priv, 0x407020, 0xc0000000);
break;
}
nv_wr32(priv, 0x405840, 0xc0000000); nv_wr32(priv, 0x405840, 0xc0000000);
nv_wr32(priv, 0x405844, 0x00ffffff); nv_wr32(priv, 0x405844, 0x00ffffff);
...@@ -1062,29 +1055,19 @@ nve0_graph_init(struct nouveau_object *object) ...@@ -1062,29 +1055,19 @@ nve0_graph_init(struct nouveau_object *object)
nve0_graph_init_obj418880(priv); nve0_graph_init_obj418880(priv);
nve0_graph_init_regs(priv); nve0_graph_init_regs(priv);
nve0_graph_init_unk40xx(priv);
switch (nv_device(priv)->chipset) { nve0_graph_init_unk44xx(priv);
case 0xe7: nve0_graph_init_unk78xx(priv);
case 0xe6: nve0_graph_init_unk60xx(priv);
case 0xf0: nve0_graph_init_unk64xx(priv);
nve0_graph_init_unk40xx(priv); nve0_graph_init_unk58xx(priv);
nve0_graph_init_unk44xx(priv); nve0_graph_init_unk80xx(priv);
nve0_graph_init_unk78xx(priv); nve0_graph_init_unk70xx(priv);
nve0_graph_init_unk60xx(priv); nve0_graph_init_unk5bxx(priv);
nve0_graph_init_unk64xx(priv); nve0_graph_init_gpc(priv);
nve0_graph_init_unk58xx(priv); nve0_graph_init_tpc(priv);
nve0_graph_init_unk80xx(priv); nve0_graph_init_tpcunk(priv);
nve0_graph_init_unk70xx(priv); nve0_graph_init_unk88xx(priv);
nve0_graph_init_unk5bxx(priv);
nve0_graph_init_gpc(priv);
nve0_graph_init_tpc(priv);
nve0_graph_init_tpcunk(priv);
nve0_graph_init_unk88xx(priv);
break;
default:
break;
}
nve0_graph_init_gpc_0(priv); nve0_graph_init_gpc_0(priv);
nv_wr32(priv, 0x400500, 0x00010001); nv_wr32(priv, 0x400500, 0x00010001);
......
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