drm/nvc8/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 52712fb..e0305bd 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc0.c
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc0.c
@@ -1329,6 +1329,7 @@ nvc0_grctx_generate_9097(struct nvc0_graph_priv *priv)
        case 0xc3:
        case 0xc4:
        case 0xc1:
+       case 0xc8:
        case 0xd9:
        case 0xd7:
                break;
@@ -1479,6 +1480,7 @@ nvc0_grctx_generate_dispatch(struct nvc0_graph_priv *priv)
        case 0xc3:
        case 0xc4:
        case 0xc1:
+       case 0xc8:
        default:
                break;
        }
@@ -1502,6 +1504,7 @@ nvc0_grctx_generate_dispatch(struct nvc0_graph_priv *priv)
        case 0xc3:
        case 0xc4:
        case 0xc1:
+       case 0xc8:
        case 0xd9:
        case 0xd7:
                nv_wr32(priv, 0x4040d0, 0x00000000);
@@ -1532,6 +1535,7 @@ nvc0_grctx_generate_dispatch(struct nvc0_graph_priv *priv)
        case 0xc3:
        case 0xc4:
        case 0xc1:
+       case 0xc8:
        default:
                nv_wr32(priv, 0x404174, 0x00000000);
                break;
@@ -1676,6 +1680,7 @@ nvc0_grctx_generate_shaders(struct nvc0_graph_priv *priv)
        case 0xc0:
        case 0xc3:
        case 0xc4:
+       case 0xc8:
        default:
                nv_wr32(priv, 0x405800, 0x078000bf);
                nv_wr32(priv, 0x405830, 0x02180000);
@@ -1720,6 +1725,7 @@ nvc0_grctx_generate_unk64xx(struct nvc0_graph_priv *priv)
        case 0xc3:
        case 0xc4:
        case 0xc1:
+       case 0xc8:
        default:
                break;
        }
@@ -1733,6 +1739,7 @@ nvc0_grctx_generate_unk64xx(struct nvc0_graph_priv *priv)
        case 0xc0:
        case 0xc3:
        case 0xc4:
+       case 0xc8:
        default:
                break;
        }
@@ -1774,6 +1781,7 @@ nvc0_grctx_generate_rop(struct nvc0_graph_priv *priv)
        case 0xc0:
        case 0xc3:
        case 0xc4:
+       case 0xc8:
                nv_wr32(priv, 0x408808, 0x0003e00d);
                nv_wr32(priv, 0x408900, 0x3080b801);
                nv_wr32(priv, 0x408904, 0x02000001);
@@ -1820,6 +1828,7 @@ nvc0_grctx_generate_gpc(struct nvc0_graph_priv *priv)
        case 0xc3:
        case 0xc4:
        case 0xc1:
+       case 0xc8:
        default:
                nv_wr32(priv, 0x418408, 0x00000000);
                break;
@@ -1835,6 +1844,7 @@ nvc0_grctx_generate_gpc(struct nvc0_graph_priv *priv)
        case 0xc3:
        case 0xc4:
        case 0xc1:
+       case 0xc8:
        default:
                nv_wr32(priv, 0x418414, 0x00200fff);
                break;
@@ -1862,6 +1872,7 @@ nvc0_grctx_generate_gpc(struct nvc0_graph_priv *priv)
        case 0xc3:
        case 0xc4:
        case 0xc1:
+       case 0xc8:
        default:
                nv_wr32(priv, 0x41870c, 0x07c80000);
                break;
@@ -1876,6 +1887,7 @@ nvc0_grctx_generate_gpc(struct nvc0_graph_priv *priv)
        case 0xc3:
        case 0xc4:
        case 0xc1:
+       case 0xc8:
        default:
                nv_wr32(priv, 0x418800, 0x0006860a);
                break;
@@ -1893,6 +1905,7 @@ nvc0_grctx_generate_gpc(struct nvc0_graph_priv *priv)
        case 0xc0:
        case 0xc3:
        case 0xc4:
+       case 0xc8:
        default:
                nv_wr32(priv, 0x418830, 0x00000001);
                break;
@@ -1915,6 +1928,7 @@ nvc0_grctx_generate_gpc(struct nvc0_graph_priv *priv)
        case 0xc0:
        case 0xc3:
        case 0xc4:
+       case 0xc8:
        default:
                nv_wr32(priv, 0x4188fc, 0x00100000);
                break;
@@ -1941,6 +1955,7 @@ nvc0_grctx_generate_gpc(struct nvc0_graph_priv *priv)
        case 0xc3:
        case 0xc4:
        case 0xc1:
+       case 0xc8:
        default:
                nv_wr32(priv, 0x418b00, 0x00000000);
                break;
@@ -1970,6 +1985,7 @@ nvc0_grctx_generate_gpc(struct nvc0_graph_priv *priv)
        case 0xc0:
        case 0xc3:
        case 0xc4:
+       case 0xc8:
        default:
                break;
        }
@@ -1997,6 +2013,7 @@ nvc0_grctx_generate_tp(struct nvc0_graph_priv *priv)
        case 0xc0:
        case 0xc3:
        case 0xc4:
+       case 0xc8:
        default:
                nv_wr32(priv, 0x419864, 0x0000012a);
                break;
@@ -2014,6 +2031,7 @@ nvc0_grctx_generate_tp(struct nvc0_graph_priv *priv)
        case 0xc3:
        case 0xc4:
        case 0xc1:
+       case 0xc8:
        default:
                nv_wr32(priv, 0x419a1c, 0x00000000);
                nv_wr32(priv, 0x419a20, 0x00000800);
@@ -2050,6 +2068,7 @@ nvc0_grctx_generate_tp(struct nvc0_graph_priv *priv)
        case 0xc0:
        case 0xc3:
        case 0xc4:
+       case 0xc8:
        default:
                nv_wr32(priv, 0x419be0, 0x00000001);
                break;
@@ -2064,6 +2083,7 @@ nvc0_grctx_generate_tp(struct nvc0_graph_priv *priv)
        case 0xc3:
        case 0xc4:
        case 0xc1:
+       case 0xc8:
        default:
                nv_wr32(priv, 0x419c00, 0x00000002);
                break;
@@ -2086,6 +2106,7 @@ nvc0_grctx_generate_tp(struct nvc0_graph_priv *priv)
                nv_wr32(priv, 0x419cb0, 0x00020048);
                break;
        case 0xc0:
+       case 0xc8:
        default:
                nv_wr32(priv, 0x419cb0, 0x00060048);
                break;
@@ -2101,6 +2122,7 @@ nvc0_grctx_generate_tp(struct nvc0_graph_priv *priv)
        case 0xc0:
        case 0xc3:
        case 0xc4:
+       case 0xc8:
        default:
                nv_wr32(priv, 0x419d20, 0x02180000);
                break;
@@ -2115,6 +2137,7 @@ nvc0_grctx_generate_tp(struct nvc0_graph_priv *priv)
        case 0xc0:
        case 0xc3:
        case 0xc4:
+       case 0xc8:
        default:
                break;
        }
@@ -2506,6 +2529,7 @@ nvc0_grctx_generate(struct nvc0_graph_priv *priv)
        case 0xc3:
        case 0xc4:
        case 0xc1:
+       case 0xc8:
        default:
                break;
        }
@@ -2527,6 +2551,7 @@ nvc0_grctx_generate(struct nvc0_graph_priv *priv)
        case 0xc3:
        case 0xc4:
        case 0xc1:
+       case 0xc8:
                break;
        default:
                break;
@@ -3095,6 +3120,7 @@ nvc0_grctx_generate(struct nvc0_graph_priv *priv)
        nv_icmd(priv, 0x00000576, 0x00000003);
        switch (nv_device(priv)->chipset) {
        case 0xc1:
+       case 0xc8:
        case 0xd9:
        case 0xd7:
                nv_icmd(priv, 0x0000057b, 0x00000059);
@@ -3208,6 +3234,7 @@ nvc0_grctx_generate(struct nvc0_graph_priv *priv)
        switch (nv_device(priv)->chipset) {
        case 0xd9:
        case 0xd7:
+       case 0xc8:
                nv_icmd(priv, 0x0000097d, 0x00000020);
                break;
        case 0xc0:
@@ -3364,6 +3391,7 @@ nvc0_grctx_generate(struct nvc0_graph_priv *priv)
        case 0xc3:
        case 0xc4:
        case 0xc1:
+       case 0xc8:
                nv_mthd(priv, 0x902d, 0x3410, 0x00000000);
                break;
        case 0xd9:

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 c5dd2f6..4539e33 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnvc0.fuc
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnvc0.fuc
@@ -68,10 +68,10 @@ chipsets:
 .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
-.b16 #nvc0_tpc_mmio_head
-.b16 #nvc0_tpc_mmio_tail
+.b16 #nnvc0_gpc_mmio_head
+.b16 #nnvc0_gpc_mmio_tail
+.b16 #nnvc0_tpc_mmio_head
+.b16 #nnvc0_tpc_mmio_tail
 .b8  0xce 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 f3a560c..bad9a16 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
@@ -46,8 +46,8 @@ uint32_t nvc0_grgpc_data[] = {
        0x01940134,
        0x030402ac,
        0x000000c8,
-       0x013400d4,
-       0x02500200,
+       0x01940134,
+       0x02ac0260,
        0x000000ce,
        0x013400d4,
        0x02600200,

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 92df038..6eb5168 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnvc0.fuc
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnvc0.fuc
@@ -60,8 +60,8 @@ chipsets:
 .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
+.b16 #nnvc0_hub_mmio_head
+.b16 #nnvc0_hub_mmio_tail
 .b8  0xce 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 bf4f4b3..9d55174 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
@@ -211,7 +211,7 @@ uint32_t nvc0_grhub_data[] = {
        0x000000c4,
        0x048403e8,
        0x000000c8,
-       0x03e8034c,
+       0x048403e8,
        0x000000ce,
        0x03e8034c,
        0x000000cf,

diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c b/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c
index 664747d..f146ebc 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c
@@ -756,6 +756,7 @@ nvc0_graph_init_unk64xx(struct nvc0_graph_priv *priv)
        case 0xc3:
        case 0xc4:
        case 0xc1:
+       case 0xc8:
        default:
                break;
        }
@@ -775,6 +776,7 @@ nvc0_graph_init_unk58xx(struct nvc0_graph_priv *priv)
                nv_wr32(priv, 0x405900, 0x00002834);
                break;
        case 0xc0:
+       case 0xc8:
        default:
                break;
        }
@@ -789,6 +791,7 @@ nvc0_graph_init_unk58xx(struct nvc0_graph_priv *priv)
        case 0xc3:
        case 0xc4:
        case 0xc1:
+       case 0xc8:
        default:
                break;
        }
@@ -812,6 +815,7 @@ nvc0_graph_init_gpc(struct nvc0_graph_priv *priv)
        case 0xc3:
        case 0xc4:
        case 0xc1:
+       case 0xc8:
        default:
                break;
        }
@@ -826,6 +830,7 @@ nvc0_graph_init_gpc(struct nvc0_graph_priv *priv)
        case 0xc3:
        case 0xc4:
        case 0xc1:
+       case 0xc8:
        default:
                break;
        }
@@ -840,6 +845,7 @@ nvc0_graph_init_gpc(struct nvc0_graph_priv *priv)
        case 0xc0:
        case 0xc3:
        case 0xc4:
+       case 0xc8:
        default:
                nv_wr32(priv, 0x418714, 0x80000000);
                break;
@@ -853,6 +859,7 @@ nvc0_graph_init_gpc(struct nvc0_graph_priv *priv)
        case 0xd9:
        case 0xd7:
        case 0xc1:
+       case 0xc8:
                nv_wr32(priv, 0x4188c8, 0x00000000);
                break;
        case 0xc0:
@@ -883,6 +890,7 @@ nvc0_graph_init_gpc(struct nvc0_graph_priv *priv)
        case 0xc3:
        case 0xc4:
        case 0xc1:
+       case 0xc8:
        default:
                break;
        }
@@ -897,6 +905,7 @@ nvc0_graph_init_gpc(struct nvc0_graph_priv *priv)
        case 0xc3:
        case 0xc4:
        case 0xc1:
+       case 0xc8:
        default:
                break;
        }
@@ -912,6 +921,7 @@ nvc0_graph_init_gpc(struct nvc0_graph_priv *priv)
        case 0xc3:
        case 0xc4:
        case 0xc1:
+       case 0xc8:
        default:
                break;
        }
@@ -928,6 +938,7 @@ nvc0_graph_init_gpc(struct nvc0_graph_priv *priv)
        case 0xc0:
        case 0xc3:
        case 0xc4:
+       case 0xc8:
        default:
                nv_wr32(priv, 0x418e00, 0x00000050);
                break;
@@ -943,6 +954,7 @@ nvc0_graph_init_gpc(struct nvc0_graph_priv *priv)
        case 0xc3:
        case 0xc4:
        case 0xc1:
+       case 0xc8:
        default:
                break;
        }
@@ -966,6 +978,7 @@ nvc0_graph_init_tpc(struct nvc0_graph_priv *priv)
                nv_wr32(priv, 0x419ac8, 0x00000000);
                break;
        case 0xc0:
+       case 0xc8:
        default:
                break;
        }
@@ -982,6 +995,7 @@ nvc0_graph_init_tpc(struct nvc0_graph_priv *priv)
        case 0xc3:
        case 0xc4:
        case 0xc1:
+       case 0xc8:
        default:
                nv_wr32(priv, 0x41980c, 0x00000000);
                break;
@@ -996,6 +1010,7 @@ nvc0_graph_init_tpc(struct nvc0_graph_priv *priv)
        case 0xc0:
        case 0xc3:
        case 0xc4:
+       case 0xc8:
        default:
                nv_wr32(priv, 0x419814, 0x00000000);
                break;
@@ -1010,6 +1025,7 @@ nvc0_graph_init_tpc(struct nvc0_graph_priv *priv)
        case 0xc3:
        case 0xc4:
        case 0xc1:
+       case 0xc8:
        default:
                nv_wr32(priv, 0x41984c, 0x00005bc5);
                break;
@@ -1027,6 +1043,7 @@ nvc0_graph_init_tpc(struct nvc0_graph_priv *priv)
                nv_wr32(priv, 0x419880, 0x00000002);
                break;
        case 0xc0:
+       case 0xc8:
        default:
                break;
        }
@@ -1049,6 +1066,7 @@ nvc0_graph_init_tpc(struct nvc0_graph_priv *priv)
        case 0xc3:
        case 0xc4:
        case 0xc1:
+       case 0xc8:
        default:
                break;
        }
@@ -1063,6 +1081,7 @@ nvc0_graph_init_tpc(struct nvc0_graph_priv *priv)
        case 0xc3:
        case 0xc4:
        case 0xc1:
+       case 0xc8:
        default:
                break;
        }
@@ -1079,11 +1098,26 @@ nvc0_graph_init_tpc(struct nvc0_graph_priv *priv)
        case 0xc3:
        case 0xc4:
        case 0xc1:
+       case 0xc8:
        default:
                nv_wr32(priv, 0x419ea8, 0x00001100);
                break;
        }
-       nv_wr32(priv, 0x419eac, 0x11100702);
+
+       switch (nv_device(priv)->chipset) {
+       case 0xc8:
+               nv_wr32(priv, 0x419eac, 0x11100f02);
+               break;
+       case 0xc0:
+       case 0xc3:
+       case 0xc4:
+       case 0xc1:
+       case 0xd9:
+       case 0xd7:
+       default:
+               nv_wr32(priv, 0x419eac, 0x11100702);
+               break;
+       }
        nv_wr32(priv, 0x419eb0, 0x00000003);
        nv_wr32(priv, 0x419eb4, 0x00000000);
        nv_wr32(priv, 0x419eb8, 0x00000000);
@@ -1100,6 +1134,7 @@ nvc0_graph_init_tpc(struct nvc0_graph_priv *priv)
                nv_wr32(priv, 0x419ed0, 0x00003818);
                break;
        case 0xc0:
+       case 0xc8:
        default:
                nv_wr32(priv, 0x419ec8, 0x06060618);
                nv_wr32(priv, 0x419ed0, 0x0eff0e38);
@@ -1378,6 +1413,7 @@ nvc0_graph_init(struct nouveau_object *object)
        case 0xc3:
        case 0xc4:
        case 0xc1:
+       case 0xc8:
        case 0xd9:
        case 0xd7:
                nvc0_graph_init_unk40xx(priv);