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

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc0.c b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc0.c
index f98d0878dd123ea65bc53f00ba8403d4e061db4f..52712fbc856ba801d905d4d22787e8e7508b5c04 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc0.c
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc0.c
@@ -1327,6 +1327,7 @@ nvc0_grctx_generate_9097(struct nvc0_graph_priv *priv)
        switch (nv_device(priv)->chipset) {
        case 0xc0:
        case 0xc3:
+       case 0xc4:
        case 0xc1:
        case 0xd9:
        case 0xd7:
@@ -1476,6 +1477,7 @@ nvc0_grctx_generate_dispatch(struct nvc0_graph_priv *priv)
                break;
        case 0xc0:
        case 0xc3:
+       case 0xc4:
        case 0xc1:
        default:
                break;
@@ -1498,6 +1500,7 @@ nvc0_grctx_generate_dispatch(struct nvc0_graph_priv *priv)
        switch (nv_device(priv)->chipset) {
        case 0xc0:
        case 0xc3:
+       case 0xc4:
        case 0xc1:
        case 0xd9:
        case 0xd7:
@@ -1527,6 +1530,7 @@ nvc0_grctx_generate_dispatch(struct nvc0_graph_priv *priv)
                break;
        case 0xc0:
        case 0xc3:
+       case 0xc4:
        case 0xc1:
        default:
                nv_wr32(priv, 0x404174, 0x00000000);
@@ -1671,6 +1675,7 @@ nvc0_grctx_generate_shaders(struct nvc0_graph_priv *priv)
                break;
        case 0xc0:
        case 0xc3:
+       case 0xc4:
        default:
                nv_wr32(priv, 0x405800, 0x078000bf);
                nv_wr32(priv, 0x405830, 0x02180000);
@@ -1713,6 +1718,7 @@ nvc0_grctx_generate_unk64xx(struct nvc0_graph_priv *priv)
                break;
        case 0xc0:
        case 0xc3:
+       case 0xc4:
        case 0xc1:
        default:
                break;
@@ -1726,6 +1732,7 @@ nvc0_grctx_generate_unk64xx(struct nvc0_graph_priv *priv)
                break;
        case 0xc0:
        case 0xc3:
+       case 0xc4:
        default:
                break;
        }
@@ -1766,6 +1773,7 @@ nvc0_grctx_generate_rop(struct nvc0_graph_priv *priv)
        switch (nv_device(priv)->chipset) {
        case 0xc0:
        case 0xc3:
+       case 0xc4:
                nv_wr32(priv, 0x408808, 0x0003e00d);
                nv_wr32(priv, 0x408900, 0x3080b801);
                nv_wr32(priv, 0x408904, 0x02000001);
@@ -1810,6 +1818,7 @@ nvc0_grctx_generate_gpc(struct nvc0_graph_priv *priv)
                break;
        case 0xc0:
        case 0xc3:
+       case 0xc4:
        case 0xc1:
        default:
                nv_wr32(priv, 0x418408, 0x00000000);
@@ -1824,6 +1833,7 @@ nvc0_grctx_generate_gpc(struct nvc0_graph_priv *priv)
                break;
        case 0xc0:
        case 0xc3:
+       case 0xc4:
        case 0xc1:
        default:
                nv_wr32(priv, 0x418414, 0x00200fff);
@@ -1850,6 +1860,7 @@ nvc0_grctx_generate_gpc(struct nvc0_graph_priv *priv)
                break;
        case 0xc0:
        case 0xc3:
+       case 0xc4:
        case 0xc1:
        default:
                nv_wr32(priv, 0x41870c, 0x07c80000);
@@ -1863,6 +1874,7 @@ nvc0_grctx_generate_gpc(struct nvc0_graph_priv *priv)
                break;
        case 0xc0:
        case 0xc3:
+       case 0xc4:
        case 0xc1:
        default:
                nv_wr32(priv, 0x418800, 0x0006860a);
@@ -1880,6 +1892,7 @@ nvc0_grctx_generate_gpc(struct nvc0_graph_priv *priv)
                break;
        case 0xc0:
        case 0xc3:
+       case 0xc4:
        default:
                nv_wr32(priv, 0x418830, 0x00000001);
                break;
@@ -1901,6 +1914,7 @@ nvc0_grctx_generate_gpc(struct nvc0_graph_priv *priv)
                break;
        case 0xc0:
        case 0xc3:
+       case 0xc4:
        default:
                nv_wr32(priv, 0x4188fc, 0x00100000);
                break;
@@ -1925,6 +1939,7 @@ nvc0_grctx_generate_gpc(struct nvc0_graph_priv *priv)
                break;
        case 0xc0:
        case 0xc3:
+       case 0xc4:
        case 0xc1:
        default:
                nv_wr32(priv, 0x418b00, 0x00000000);
@@ -1954,6 +1969,7 @@ nvc0_grctx_generate_gpc(struct nvc0_graph_priv *priv)
                break;
        case 0xc0:
        case 0xc3:
+       case 0xc4:
        default:
                break;
        }
@@ -1980,6 +1996,7 @@ nvc0_grctx_generate_tp(struct nvc0_graph_priv *priv)
                break;
        case 0xc0:
        case 0xc3:
+       case 0xc4:
        default:
                nv_wr32(priv, 0x419864, 0x0000012a);
                break;
@@ -1995,6 +2012,7 @@ nvc0_grctx_generate_tp(struct nvc0_graph_priv *priv)
        case 0xc0:
                break;
        case 0xc3:
+       case 0xc4:
        case 0xc1:
        default:
                nv_wr32(priv, 0x419a1c, 0x00000000);
@@ -2010,6 +2028,7 @@ nvc0_grctx_generate_tp(struct nvc0_graph_priv *priv)
                nv_wr32(priv, 0x00419ac4, 0x0017f440);
                break;
        case 0xc3:
+       case 0xc4:
        case 0xc1:
        default:
                nv_wr32(priv, 0x00419ac4, 0x0007f440);
@@ -2030,6 +2049,7 @@ nvc0_grctx_generate_tp(struct nvc0_graph_priv *priv)
                break;
        case 0xc0:
        case 0xc3:
+       case 0xc4:
        default:
                nv_wr32(priv, 0x419be0, 0x00000001);
                break;
@@ -2042,6 +2062,7 @@ nvc0_grctx_generate_tp(struct nvc0_graph_priv *priv)
                break;
        case 0xc0:
        case 0xc3:
+       case 0xc4:
        case 0xc1:
        default:
                nv_wr32(priv, 0x419c00, 0x00000002);
@@ -2052,6 +2073,7 @@ nvc0_grctx_generate_tp(struct nvc0_graph_priv *priv)
        nv_wr32(priv, 0x419c20, 0x00000000);
        switch (nv_device(priv)->chipset) {
        case 0xc3:
+       case 0xc4:
        case 0xc1:
        case 0xce:
        case 0xcf:
@@ -2078,6 +2100,7 @@ nvc0_grctx_generate_tp(struct nvc0_graph_priv *priv)
                break;
        case 0xc0:
        case 0xc3:
+       case 0xc4:
        default:
                nv_wr32(priv, 0x419d20, 0x02180000);
                break;
@@ -2091,6 +2114,7 @@ nvc0_grctx_generate_tp(struct nvc0_graph_priv *priv)
                break;
        case 0xc0:
        case 0xc3:
+       case 0xc4:
        default:
                break;
        }
@@ -2128,6 +2152,7 @@ nvc0_grctx_generate_tp(struct nvc0_graph_priv *priv)
                nv_wr32(priv, 0x419ee0, 0x00010110);
                break;
        case 0xc3:
+       case 0xc4:
        case 0xc1:
        default:
                nv_wr32(priv, 0x419ee0, 0x00011110);
@@ -2140,6 +2165,7 @@ nvc0_grctx_generate_tp(struct nvc0_graph_priv *priv)
                nv_wr32(priv, 0x419f54, 0x00000000);
                break;
        case 0xc3:
+       case 0xc4:
        case 0xc1:
        case 0xd9:
        case 0xd7:
@@ -2478,6 +2504,7 @@ nvc0_grctx_generate(struct nvc0_graph_priv *priv)
                break;
        case 0xc0:
        case 0xc3:
+       case 0xc4:
        case 0xc1:
        default:
                break;
@@ -2498,6 +2525,7 @@ nvc0_grctx_generate(struct nvc0_graph_priv *priv)
                break;
        case 0xc0:
        case 0xc3:
+       case 0xc4:
        case 0xc1:
                break;
        default:
@@ -3073,6 +3101,7 @@ nvc0_grctx_generate(struct nvc0_graph_priv *priv)
                break;
        case 0xc0:
        case 0xc3:
+       case 0xc4:
        default:
                break;
        }
@@ -3183,6 +3212,7 @@ nvc0_grctx_generate(struct nvc0_graph_priv *priv)
                break;
        case 0xc0:
        case 0xc3:
+       case 0xc4:
        case 0xc1:
        default:
                break;
@@ -3332,6 +3362,7 @@ nvc0_grctx_generate(struct nvc0_graph_priv *priv)
        switch (nv_device(priv)->chipset) {
        case 0xc0:
        case 0xc3:
+       case 0xc4:
        case 0xc1:
                nv_mthd(priv, 0x902d, 0x3410, 0x00000000);
                break;

diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnvc0.fuc b/drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnvc0.fuc
index 79a3a501180ac732631138df9b1c5d107356c051..c5dd2f68d41cd43aa1f0a98685392f1c8296300f 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnvc0.fuc
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnvc0.fuc
@@ -63,10 +63,10 @@ chipsets:
 .b16 #nnvc3_tpc_mmio_head
 .b16 #nnvc3_tpc_mmio_tail
 .b8  0xc4 0 0 0
-.b16 #nvc0_gpc_mmio_head
-.b16 #nvc0_gpc_mmio_tail
-.b16 #nvc0_tpc_mmio_head
-.b16 #nvc3_tpc_mmio_tail
+.b16 #nnvc0_gpc_mmio_head
+.b16 #nnvc0_gpc_mmio_tail
+.b16 #nnvc3_tpc_mmio_head
+.b16 #nnvc3_tpc_mmio_tail
 .b8  0xc8 0 0 0
 .b16 #nvc0_gpc_mmio_head
 .b16 #nvc0_gpc_mmio_tail

diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnvc0.fuc.h b/drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnvc0.fuc.h
index 1a16cbf561c328427ce348b2b986b9cd1f1901a5..f3a560ce438e00d20acc2dbe1d53501034548899 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnvc0.fuc.h
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnvc0.fuc.h
@@ -43,8 +43,8 @@ uint32_t nvc0_grgpc_data[] = {
        0x01940134,
        0x030402ac,
        0x000000c4,
-       0x013400d4,
-       0x02600200,
+       0x01940134,
+       0x030402ac,
        0x000000c8,
        0x013400d4,
        0x02500200,

diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnvc0.fuc b/drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnvc0.fuc
index 5305b0928e822f4ab00bdf67c9cbfa254ae50ab9..92df038abc48adb1b43bf8fa709241f0640a3b61 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnvc0.fuc
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnvc0.fuc
@@ -57,8 +57,8 @@ chipsets:
 .b16 #nnvc0_hub_mmio_head
 .b16 #nnvc0_hub_mmio_tail
 .b8  0xc4 0 0 0
-.b16 #nvc0_hub_mmio_head
-.b16 #nvc0_hub_mmio_tail
+.b16 #nnvc0_hub_mmio_head
+.b16 #nnvc0_hub_mmio_tail
 .b8  0xc8 0 0 0
 .b16 #nvc0_hub_mmio_head
 .b16 #nvc0_hub_mmio_tail

diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnvc0.fuc.h b/drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnvc0.fuc.h
index 1cdf9e991a3f009e45ac5e7611d5fac7489ebe6f..bf4f4b32e25bdb11df90f8c932e0fb989e55e9cc 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnvc0.fuc.h
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnvc0.fuc.h
@@ -209,7 +209,7 @@ uint32_t nvc0_grhub_data[] = {
        0x000000c3,
        0x048403e8,
        0x000000c4,
-       0x03e8034c,
+       0x048403e8,
        0x000000c8,
        0x03e8034c,
        0x000000ce,

diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c b/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c
index 18bcc34e9f8168d5314ae108d83d9f276da86702..664747d629060f1c013cbcc8f956ebf15423af49 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c
@@ -754,6 +754,7 @@ nvc0_graph_init_unk64xx(struct nvc0_graph_priv *priv)
                break;
        case 0xc0:
        case 0xc3:
+       case 0xc4:
        case 0xc1:
        default:
                break;
@@ -767,6 +768,7 @@ nvc0_graph_init_unk58xx(struct nvc0_graph_priv *priv)
        nv_wr32(priv, 0x405850, 0x00000000);
        switch (nv_device(priv)->chipset) {
        case 0xc3:
+       case 0xc4:
        case 0xc1:
        case 0xd9:
        case 0xd7:
@@ -785,6 +787,7 @@ nvc0_graph_init_unk58xx(struct nvc0_graph_priv *priv)
                break;
        case 0xc0:
        case 0xc3:
+       case 0xc4:
        case 0xc1:
        default:
                break;
@@ -807,6 +810,7 @@ nvc0_graph_init_gpc(struct nvc0_graph_priv *priv)
                break;
        case 0xc0:
        case 0xc3:
+       case 0xc4:
        case 0xc1:
        default:
                break;
@@ -820,6 +824,7 @@ nvc0_graph_init_gpc(struct nvc0_graph_priv *priv)
                break;
        case 0xc0:
        case 0xc3:
+       case 0xc4:
        case 0xc1:
        default:
                break;
@@ -834,6 +839,7 @@ nvc0_graph_init_gpc(struct nvc0_graph_priv *priv)
                break;
        case 0xc0:
        case 0xc3:
+       case 0xc4:
        default:
                nv_wr32(priv, 0x418714, 0x80000000);
                break;
@@ -851,6 +857,7 @@ nvc0_graph_init_gpc(struct nvc0_graph_priv *priv)
                break;
        case 0xc0:
        case 0xc3:
+       case 0xc4:
        default:
                nv_wr32(priv, 0x4188c8, 0x80000000);
                break;
@@ -874,6 +881,7 @@ nvc0_graph_init_gpc(struct nvc0_graph_priv *priv)
                break;
        case 0xc0:
        case 0xc3:
+       case 0xc4:
        case 0xc1:
        default:
                break;
@@ -887,6 +895,7 @@ nvc0_graph_init_gpc(struct nvc0_graph_priv *priv)
                break;
        case 0xc0:
        case 0xc3:
+       case 0xc4:
        case 0xc1:
        default:
                break;
@@ -901,6 +910,7 @@ nvc0_graph_init_gpc(struct nvc0_graph_priv *priv)
                break;
        case 0xc0:
        case 0xc3:
+       case 0xc4:
        case 0xc1:
        default:
                break;
@@ -917,6 +927,7 @@ nvc0_graph_init_gpc(struct nvc0_graph_priv *priv)
                break;
        case 0xc0:
        case 0xc3:
+       case 0xc4:
        default:
                nv_wr32(priv, 0x418e00, 0x00000050);
                break;
@@ -930,6 +941,7 @@ nvc0_graph_init_gpc(struct nvc0_graph_priv *priv)
                break;
        case 0xc0:
        case 0xc3:
+       case 0xc4:
        case 0xc1:
        default:
                break;
@@ -947,6 +959,7 @@ nvc0_graph_init_tpc(struct nvc0_graph_priv *priv)
        nv_wr32(priv, 0x419ab0, 0x00000000);
        switch (nv_device(priv)->chipset) {
        case 0xc3:
+       case 0xc4:
        case 0xc1:
        case 0xd9:
        case 0xd7:
@@ -967,6 +980,7 @@ nvc0_graph_init_tpc(struct nvc0_graph_priv *priv)
                break;
        case 0xc0:
        case 0xc3:
+       case 0xc4:
        case 0xc1:
        default:
                nv_wr32(priv, 0x41980c, 0x00000000);
@@ -981,6 +995,7 @@ nvc0_graph_init_tpc(struct nvc0_graph_priv *priv)
                break;
        case 0xc0:
        case 0xc3:
+       case 0xc4:
        default:
                nv_wr32(priv, 0x419814, 0x00000000);
                break;
@@ -993,6 +1008,7 @@ nvc0_graph_init_tpc(struct nvc0_graph_priv *priv)
                break;
        case 0xc0:
        case 0xc3:
+       case 0xc4:
        case 0xc1:
        default:
                nv_wr32(priv, 0x41984c, 0x00005bc5);
@@ -1004,6 +1020,7 @@ nvc0_graph_init_tpc(struct nvc0_graph_priv *priv)
        nv_wr32(priv, 0x41985c, 0x00000000);
        switch (nv_device(priv)->chipset) {
        case 0xc3:
+       case 0xc4:
        case 0xc1:
        case 0xd9:
        case 0xd7:
@@ -1030,6 +1047,7 @@ nvc0_graph_init_tpc(struct nvc0_graph_priv *priv)
                break;
        case 0xc0:
        case 0xc3:
+       case 0xc4:
        case 0xc1:
        default:
                break;
@@ -1043,6 +1061,7 @@ nvc0_graph_init_tpc(struct nvc0_graph_priv *priv)
                break;
        case 0xc0:
        case 0xc3:
+       case 0xc4:
        case 0xc1:
        default:
                break;
@@ -1058,6 +1077,7 @@ nvc0_graph_init_tpc(struct nvc0_graph_priv *priv)
                break;
        case 0xc0:
        case 0xc3:
+       case 0xc4:
        case 0xc1:
        default:
                nv_wr32(priv, 0x419ea8, 0x00001100);
@@ -1071,6 +1091,7 @@ nvc0_graph_init_tpc(struct nvc0_graph_priv *priv)
        nv_wr32(priv, 0x419ec0, 0x00000000);
        switch (nv_device(priv)->chipset) {
        case 0xc3:
+       case 0xc4:
        case 0xc1:
        case 0xd9:
        case 0xd7:
@@ -1355,6 +1376,7 @@ nvc0_graph_init(struct nouveau_object *object)
        switch (nv_device(priv)->chipset) {
        case 0xc0:
        case 0xc3:
+       case 0xc4:
        case 0xc1:
        case 0xd9:
        case 0xd7: