drm/nvd9/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 4cc6269d407720687931d5e17a783e711df833c2..31a84162632b0bac1bc93f4f2d7c97f793843925 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc0.c
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/ctxnvc0.c
@@ -1323,8 +1323,16 @@ nvc0_grctx_generate_9097(struct nvc0_graph_priv *priv)
        nv_mthd(priv, 0x9097, 0x1450, 0x00300008);
        nv_mthd(priv, 0x9097, 0x1454, 0x04000080);
        nv_mthd(priv, 0x9097, 0x0214, 0x00000000);
-       /* in trace, right after 0x90c0, not here */
-       nv_mthd(priv, 0x9097, 0x3410, 0x80002006);
+
+       switch (nv_device(priv)->chipset) {
+       case 0xd9:
+       case 0xd7:
+               break;
+       default:
+               /* in trace, right after 0x90c0, not here */
+               nv_mthd(priv, 0x9097, 0x3410, 0x80002006);
+               break;
+       }
 }
 
 static void
@@ -1417,6 +1425,8 @@ nvc0_grctx_generate_90c0(struct nvc0_graph_priv *priv)
        for (i = 0; nv_device(priv)->chipset >= 0xd0 && i < 4; i++) {
                nv_mthd(priv, 0x90c0, 0x2710 + (i * 0x40), 0x00014000);
                nv_mthd(priv, 0x90c0, 0x2730 + (i * 0x40), 0x00014000);
+       }
+       for (i = 0; nv_device(priv)->chipset >= 0xd0 && i < 4; i++) {
                nv_mthd(priv, 0x90c0, 0x2714 + (i * 0x40), 0x00000040);
                nv_mthd(priv, 0x90c0, 0x2734 + (i * 0x40), 0x00000040);
        }
@@ -1456,7 +1466,14 @@ nvc0_grctx_generate_dispatch(struct nvc0_graph_priv *priv)
        nv_wr32(priv, 0x404020, 0x00000000);
        nv_wr32(priv, 0x404024, 0x00000000);
        nv_wr32(priv, 0x404028, 0x00000000);
-       nv_wr32(priv, 0x40402c, 0x00000000);
+       switch (nv_device(priv)->chipset) {
+       case 0xd9:
+       case 0xd7:
+               nv_wr32(priv, 0x40402c, 0x00000000);
+               break;
+       default:
+               break;
+       }
        nv_wr32(priv, 0x404044, 0x00000000);
        nv_wr32(priv, 0x404094, 0x00000000);
        nv_wr32(priv, 0x404098, 0x00000000);
@@ -1472,6 +1489,14 @@ nvc0_grctx_generate_dispatch(struct nvc0_graph_priv *priv)
        nv_wr32(priv, 0x4040c0, 0x00000000);
        nv_wr32(priv, 0x4040c4, 0x00000000);
        nv_wr32(priv, 0x4040c8, 0xf0000087);
+       switch (nv_device(priv)->chipset) {
+       case 0xd9:
+       case 0xd7:
+               nv_wr32(priv, 0x4040d0, 0x00000000);
+               break;
+       default:
+               break;
+       }
        nv_wr32(priv, 0x4040d4, 0x00000000);
        nv_wr32(priv, 0x4040d8, 0x00000000);
        nv_wr32(priv, 0x4040dc, 0x00000000);
@@ -1487,7 +1512,14 @@ nvc0_grctx_generate_dispatch(struct nvc0_graph_priv *priv)
        nv_wr32(priv, 0x404158, 0x00000200);
        nv_wr32(priv, 0x404164, 0x00000055);
        nv_wr32(priv, 0x404168, 0x00000000);
-       nv_wr32(priv, 0x404174, 0x00000000);
+       switch (nv_device(priv)->chipset) {
+       case 0xd9:
+       case 0xd7:
+               break;
+       default:
+               nv_wr32(priv, 0x404174, 0x00000000);
+               break;
+       }
        nv_wr32(priv, 0x404178, 0x00000000);
        nv_wr32(priv, 0x40417c, 0x00000000);
        for (i = 0; i < 8; i++)
@@ -1657,12 +1689,23 @@ nvc0_grctx_generate_unk64xx(struct nvc0_graph_priv *priv)
        nv_wr32(priv, 0x4064ac, 0x00003fff);
        nv_wr32(priv, 0x4064b4, 0x00000000);
        nv_wr32(priv, 0x4064b8, 0x00000000);
-       if (nv_device(priv)->chipset >= 0xd0)
+       switch (nv_device(priv)->chipset) {
+       case 0xd9:
+       case 0xd7:
                nv_wr32(priv, 0x4064bc, 0x00000000);
-       if (nv_device(priv)->chipset == 0xc1 ||
-           nv_device(priv)->chipset >= 0xd0) {
+               break;
+       default:
+               break;
+       }
+       switch (nv_device(priv)->chipset) {
+       case 0xc1:
+       case 0xd9:
+       case 0xd7:
                nv_wr32(priv, 0x4064c0, 0x80140078);
                nv_wr32(priv, 0x4064c4, 0x0086ffff);
+               break;
+       default:
+               break;
        }
 }
 
@@ -1695,46 +1738,63 @@ nvc0_grctx_generate_ccache(struct nvc0_graph_priv *priv)
 static void
 nvc0_grctx_generate_rop(struct nvc0_graph_priv *priv)
 {
-       int chipset = nv_device(priv)->chipset;
-
        /* ROPC_BROADCAST */
        nv_wr32(priv, 0x408800, 0x02802a3c);
        nv_wr32(priv, 0x408804, 0x00000040);
-       if (chipset >= 0xd0) {
-               nv_wr32(priv, 0x408808, 0x1043e005);
-               nv_wr32(priv, 0x408900, 0x3080b801);
-               nv_wr32(priv, 0x408904, 0x1043e005);
-               nv_wr32(priv, 0x408908, 0x00c8102f);
-       } else
-       if (chipset == 0xc1) {
+       switch (nv_device(priv)->chipset) {
+       case 0xc1:
                nv_wr32(priv, 0x408808, 0x1003e005);
                nv_wr32(priv, 0x408900, 0x3080b801);
                nv_wr32(priv, 0x408904, 0x62000001);
                nv_wr32(priv, 0x408908, 0x00c80929);
-       } else {
+               nv_wr32(priv, 0x40890c, 0x00000000);
+               break;
+       case 0xd9:
+       case 0xd7:
+               nv_wr32(priv, 0x408808, 0x1043e005);
+               nv_wr32(priv, 0x408900, 0x3080b801);
+               nv_wr32(priv, 0x408904, 0x1043e005);
+               nv_wr32(priv, 0x408908, 0x00c8102f);
+               break;
+       default:
                nv_wr32(priv, 0x408808, 0x0003e00d);
                nv_wr32(priv, 0x408900, 0x3080b801);
                nv_wr32(priv, 0x408904, 0x02000001);
                nv_wr32(priv, 0x408908, 0x00c80929);
+               nv_wr32(priv, 0x40890c, 0x00000000);
+               break;
        }
-       nv_wr32(priv, 0x40890c, 0x00000000);
        nv_wr32(priv, 0x408980, 0x0000011d);
 }
 
 static void
 nvc0_grctx_generate_gpc(struct nvc0_graph_priv *priv)
 {
-       int chipset = nv_device(priv)->chipset;
        int i;
 
        /* GPC_BROADCAST */
        nv_wr32(priv, 0x418380, 0x00000016);
        nv_wr32(priv, 0x418400, 0x38004e00);
        nv_wr32(priv, 0x418404, 0x71e0ffff);
-       nv_wr32(priv, 0x418408, 0x00000000);
+       switch (nv_device(priv)->chipset) {
+       case 0xd9:
+       case 0xd7:
+               break;
+       default:
+               nv_wr32(priv, 0x418408, 0x00000000);
+               break;
+       }
        nv_wr32(priv, 0x41840c, 0x00001008);
        nv_wr32(priv, 0x418410, 0x0fff0fff);
-       nv_wr32(priv, 0x418414, chipset < 0xd0 ? 0x00200fff : 0x02200fff);
+       switch (nv_device(priv)->chipset) {
+       case 0xd9:
+       case 0xd7:
+               nv_wr32(priv, 0x418414, 0x02200fff);
+               break;
+       default:
+               nv_wr32(priv, 0x418414, 0x00200fff);
+               break;
+       }
        nv_wr32(priv, 0x418450, 0x00000000);
        nv_wr32(priv, 0x418454, 0x00000000);
        nv_wr32(priv, 0x418458, 0x00000000);
@@ -1749,17 +1809,39 @@ nvc0_grctx_generate_gpc(struct nvc0_graph_priv *priv)
        nv_wr32(priv, 0x418700, 0x00000002);
        nv_wr32(priv, 0x418704, 0x00000080);
        nv_wr32(priv, 0x418708, 0x00000000);
-       nv_wr32(priv, 0x41870c, chipset < 0xd0 ? 0x07c80000 : 0x00000000);
+       switch (nv_device(priv)->chipset) {
+       case 0xd9:
+       case 0xd7:
+               nv_wr32(priv, 0x41870c, 0x00000000);
+               break;
+       default:
+               nv_wr32(priv, 0x41870c, 0x07c80000);
+               break;
+       }
        nv_wr32(priv, 0x418710, 0x00000000);
-       nv_wr32(priv, 0x418800, chipset < 0xd0 ? 0x0006860a : 0x7006860a);
+       switch (nv_device(priv)->chipset) {
+       case 0xd9:
+       case 0xd7:
+               nv_wr32(priv, 0x418800, 0x7006860a);
+               break;
+       default:
+               nv_wr32(priv, 0x418800, 0x0006860a);
+               break;
+       }
        nv_wr32(priv, 0x418808, 0x00000000);
        nv_wr32(priv, 0x41880c, 0x00000000);
        nv_wr32(priv, 0x418810, 0x00000000);
        nv_wr32(priv, 0x418828, 0x00008442);
-       if (chipset == 0xc1 || chipset >= 0xd0)
+       switch (nv_device(priv)->chipset) {
+       case 0xc1:
+       case 0xd9:
+       case 0xd7:
                nv_wr32(priv, 0x418830, 0x10000001);
-       else
+               break;
+       default:
                nv_wr32(priv, 0x418830, 0x00000001);
+               break;
+       }
        nv_wr32(priv, 0x4188d8, 0x00000008);
        nv_wr32(priv, 0x4188e0, 0x01000000);
        nv_wr32(priv, 0x4188e8, 0x00000000);
@@ -1767,12 +1849,18 @@ nvc0_grctx_generate_gpc(struct nvc0_graph_priv *priv)
        nv_wr32(priv, 0x4188f0, 0x00000000);
        nv_wr32(priv, 0x4188f4, 0x00000000);
        nv_wr32(priv, 0x4188f8, 0x00000000);
-       if (chipset >= 0xd0)
-               nv_wr32(priv, 0x4188fc, 0x20100008);
-       else if (chipset == 0xc1)
+       switch (nv_device(priv)->chipset) {
+       case 0xc1:
                nv_wr32(priv, 0x4188fc, 0x00100018);
-       else
+               break;
+       case 0xd9:
+       case 0xd7:
+               nv_wr32(priv, 0x4188fc, 0x20100008);
+               break;
+       default:
                nv_wr32(priv, 0x4188fc, 0x00100000);
+               break;
+       }
        nv_wr32(priv, 0x41891c, 0x00ff00ff);
        nv_wr32(priv, 0x418924, 0x00000000);
        nv_wr32(priv, 0x418928, 0x00ffff00);
@@ -1786,7 +1874,15 @@ nvc0_grctx_generate_gpc(struct nvc0_graph_priv *priv)
                nv_wr32(priv, 0x418a14 + (i * 0x20), 0x00000000);
                nv_wr32(priv, 0x418a18 + (i * 0x20), 0x00000000);
        }
-       nv_wr32(priv, 0x418b00, chipset < 0xd0 ? 0x00000000 : 0x00000006);
+       switch (nv_device(priv)->chipset) {
+       case 0xd9:
+       case 0xd7:
+               nv_wr32(priv, 0x418b00, 0x00000006);
+               break;
+       default:
+               nv_wr32(priv, 0x418b00, 0x00000000);
+               break;
+       }
        nv_wr32(priv, 0x418b08, 0x0a418820);
        nv_wr32(priv, 0x418b0c, 0x062080e6);
        nv_wr32(priv, 0x418b10, 0x020398a4);
@@ -1803,8 +1899,15 @@ nvc0_grctx_generate_gpc(struct nvc0_graph_priv *priv)
        nv_wr32(priv, 0x418c24, 0x00000000);
        nv_wr32(priv, 0x418c28, 0x00000000);
        nv_wr32(priv, 0x418c2c, 0x00000000);
-       if (chipset == 0xc1 || chipset >= 0xd0)
+       switch (nv_device(priv)->chipset) {
+       case 0xc1:
+       case 0xd9:
+       case 0xd7:
                nv_wr32(priv, 0x418c6c, 0x00000001);
+               break;
+       default:
+               break;
+       }
        nv_wr32(priv, 0x418c80, 0x20200004);
        nv_wr32(priv, 0x418c8c, 0x00000001);
        nv_wr32(priv, 0x419000, 0x00000780);
@@ -1816,16 +1919,20 @@ nvc0_grctx_generate_gpc(struct nvc0_graph_priv *priv)
 static void
 nvc0_grctx_generate_tp(struct nvc0_graph_priv *priv)
 {
-       int chipset = nv_device(priv)->chipset;
-
        /* GPC_BROADCAST.TP_BROADCAST */
        nv_wr32(priv, 0x419818, 0x00000000);
        nv_wr32(priv, 0x41983c, 0x00038bc7);
        nv_wr32(priv, 0x419848, 0x00000000);
-       if (chipset == 0xc1 || chipset >= 0xd0)
+       switch (nv_device(priv)->chipset) {
+       case 0xc1:
+       case 0xd9:
+       case 0xd7:
                nv_wr32(priv, 0x419864, 0x00000129);
-       else
+               break;
+       default:
                nv_wr32(priv, 0x419864, 0x0000012a);
+               break;
+       }
        nv_wr32(priv, 0x419888, 0x00000000);
        nv_wr32(priv, 0x419a00, 0x000001f0);
        nv_wr32(priv, 0x419a04, 0x00000001);
@@ -1835,10 +1942,18 @@ nvc0_grctx_generate_tp(struct nvc0_graph_priv *priv)
        nv_wr32(priv, 0x419a14, 0x00000200);
        nv_wr32(priv, 0x419a1c, 0x00000000);
        nv_wr32(priv, 0x419a20, 0x00000800);
-       if (chipset >= 0xd0)
+       switch (nv_device(priv)->chipset) {
+       case 0xc0:
+       case 0xc8:
+               break;
+       case 0xd9:
+       case 0xd7:
                nv_wr32(priv, 0x00419ac4, 0x0017f440);
-       else if (chipset != 0xc0 && chipset != 0xc8)
+               break;
+       default:
                nv_wr32(priv, 0x00419ac4, 0x0007f440);
+               break;
+       }
        nv_wr32(priv, 0x419b00, 0x0a418820);
        nv_wr32(priv, 0x419b04, 0x062080e6);
        nv_wr32(priv, 0x419b08, 0x020398a4);
@@ -1846,34 +1961,66 @@ nvc0_grctx_generate_tp(struct nvc0_graph_priv *priv)
        nv_wr32(priv, 0x419b10, 0x0a418820);
        nv_wr32(priv, 0x419b14, 0x000000e6);
        nv_wr32(priv, 0x419bd0, 0x00900103);
-       if (chipset == 0xc1 || chipset >= 0xd0)
+       switch (nv_device(priv)->chipset) {
+       case 0xc1:
+       case 0xd9:
+       case 0xd7:
                nv_wr32(priv, 0x419be0, 0x00400001);
-       else
+               break;
+       default:
                nv_wr32(priv, 0x419be0, 0x00000001);
+               break;
+       }
        nv_wr32(priv, 0x419be4, 0x00000000);
-       nv_wr32(priv, 0x419c00, chipset < 0xd0 ? 0x00000002 : 0x0000000a);
+       switch (nv_device(priv)->chipset) {
+       case 0xd9:
+       case 0xd7:
+               nv_wr32(priv, 0x419c00, 0x0000000a);
+               break;
+       default:
+               nv_wr32(priv, 0x419c00, 0x00000002);
+               break;
+       }
        nv_wr32(priv, 0x419c04, 0x00000006);
        nv_wr32(priv, 0x419c08, 0x00000002);
        nv_wr32(priv, 0x419c20, 0x00000000);
-       if (nv_device(priv)->chipset >= 0xd0) {
+       switch (nv_device(priv)->chipset) {
+       case 0xce:
+       case 0xcf:
+               nv_wr32(priv, 0x419cb0, 0x00020048);
+               break;
+       case 0xd9:
+       case 0xd7:
                nv_wr32(priv, 0x419c24, 0x00084210);
                nv_wr32(priv, 0x419c28, 0x3cf3cf3c);
                nv_wr32(priv, 0x419cb0, 0x00020048);
-       } else
-       if (chipset == 0xce || chipset == 0xcf) {
-               nv_wr32(priv, 0x419cb0, 0x00020048);
-       } else {
+               break;
+       default:
                nv_wr32(priv, 0x419cb0, 0x00060048);
+               break;
        }
        nv_wr32(priv, 0x419ce8, 0x00000000);
        nv_wr32(priv, 0x419cf4, 0x00000183);
-       if (chipset == 0xc1 || chipset >= 0xd0)
+       switch (nv_device(priv)->chipset) {
+       case 0xc1:
+       case 0xd9:
+       case 0xd7:
                nv_wr32(priv, 0x419d20, 0x12180000);
-       else
+               break;
+       default:
                nv_wr32(priv, 0x419d20, 0x02180000);
+               break;
+       }
        nv_wr32(priv, 0x419d24, 0x00001fff);
-       if (chipset == 0xc1 || chipset >= 0xd0)
+       switch (nv_device(priv)->chipset) {
+       case 0xc1:
+       case 0xd9:
+       case 0xd7:
                nv_wr32(priv, 0x419d44, 0x02180218);
+               break;
+       default:
+               break;
+       }
        nv_wr32(priv, 0x419e04, 0x00000000);
        nv_wr32(priv, 0x419e08, 0x00000000);
        nv_wr32(priv, 0x419e0c, 0x00000000);
@@ -1899,12 +2046,44 @@ nvc0_grctx_generate_tp(struct nvc0_graph_priv *priv)
        nv_wr32(priv, 0x419e8c, 0x00000000);
        nv_wr32(priv, 0x419e90, 0x00000000);
        nv_wr32(priv, 0x419e98, 0x00000000);
-       if (chipset != 0xc0 && chipset != 0xc8)
+       switch (nv_device(priv)->chipset) {
+       case 0xc0:
+       case 0xc8:
+               break;
+       case 0xd9:
+       case 0xd7:
+               nv_wr32(priv, 0x419ee0, 0x00010110);
+               break;
+       default:
                nv_wr32(priv, 0x419ee0, 0x00011110);
-       nv_wr32(priv, 0x419f50, 0x00000000);
-       nv_wr32(priv, 0x419f54, 0x00000000);
-       if (chipset != 0xc0 && chipset != 0xc8)
+               break;
+       }
+       switch (nv_device(priv)->chipset) {
+       case 0xc0:
+       case 0xc8:
+               nv_wr32(priv, 0x419f50, 0x00000000);
+               nv_wr32(priv, 0x419f54, 0x00000000);
+               break;
+       case 0xd9:
+       case 0xd7:
+               nv_wr32(priv, 0x419f30, 0x00000000);
+               nv_wr32(priv, 0x419f34, 0x00000000);
+               nv_wr32(priv, 0x419f38, 0x00000000);
+               nv_wr32(priv, 0x419f3c, 0x00000000);
+               nv_wr32(priv, 0x419f40, 0x00000000);
+               nv_wr32(priv, 0x419f44, 0x00000000);
+               nv_wr32(priv, 0x419f48, 0x00000000);
+               nv_wr32(priv, 0x419f4c, 0x00000000);
+               nv_wr32(priv, 0x419f50, 0x00000000);
+               nv_wr32(priv, 0x419f54, 0x00000000);
                nv_wr32(priv, 0x419f58, 0x00000000);
+               break;
+       default:
+               nv_wr32(priv, 0x419f50, 0x00000000);
+               nv_wr32(priv, 0x419f54, 0x00000000);
+               nv_wr32(priv, 0x419f58, 0x00000000);
+               break;
+       }
 }
 
 int
@@ -1952,32 +2131,37 @@ nvc0_grctx_generate(struct nvc0_graph_priv *priv)
        mmio_list(0x419008, 0x00000000,  0, 0);
        mmio_list(0x418808, 0x00000000,  8, 0);
        mmio_list(0x41880c, 0x80000018,  0, 0);
-       if (nv_device(priv)->chipset != 0xc1) {
+       switch (nv_device(priv)->chipset) {
+       case 0xc1:
+       case 0xd9:
+       case 0xd7:
                tmp = 0x02180000;
-               mmio_list(0x405830, tmp, 0, 0);
+               mmio_list(0x405830, 0x00000218 | tmp, 0, 0);
+               mmio_list(0x4064c4, 0x0086ffff, 0, 0);
                for (gpc = 0; gpc < priv->gpc_nr; gpc++) {
                        for (tpc = 0; tpc < priv->tpc_nr[gpc]; tpc++) {
                                u32 reg = TPC_UNIT(gpc, tpc, 0x0520);
+                               mmio_list(reg, 0x10000000 | tmp, 0, 0);
+                               tmp += 0x0324;
+                       }
+                       for (tpc = 0; tpc < priv->tpc_nr[gpc]; tpc++) {
+                               u32 reg = TPC_UNIT(gpc, tpc, 0x0544);
                                mmio_list(reg, tmp, 0, 0);
                                tmp += 0x0324;
                        }
                }
-       } else {
+               break;
+       default:
                tmp = 0x02180000;
-               mmio_list(0x405830, 0x00000218 | tmp, 0, 0);
-               mmio_list(0x4064c4, 0x0086ffff, 0, 0);
+               mmio_list(0x405830, tmp, 0, 0);
                for (gpc = 0; gpc < priv->gpc_nr; gpc++) {
                        for (tpc = 0; tpc < priv->tpc_nr[gpc]; tpc++) {
                                u32 reg = TPC_UNIT(gpc, tpc, 0x0520);
-                               mmio_list(reg, 0x10000000 | tmp, 0, 0);
-                               tmp += 0x0324;
-                       }
-                       for (tpc = 0; tpc < priv->tpc_nr[gpc]; tpc++) {
-                               u32 reg = TPC_UNIT(gpc, tpc, 0x0544);
                                mmio_list(reg, tmp, 0, 0);
                                tmp += 0x0324;
                        }
                }
+               break;
        }
 
        for (tpc = 0, id = 0; tpc < 4; tpc++) {
@@ -2209,9 +2393,14 @@ nvc0_grctx_generate(struct nvc0_graph_priv *priv)
        nv_icmd(priv, 0x00000215, 0x00000040);
        nv_icmd(priv, 0x00000216, 0x00000040);
        nv_icmd(priv, 0x00000217, 0x00000040);
-       if (nv_device(priv)->chipset >= 0xd0) {
-               for (i = 0x0400; i <= 0x0417; i++)
+       switch (nv_device(priv)->chipset) {
+       case 0xd9:
+       case 0xd7:
+               for (i = 0x400; i <= 0x417; i++)
                        nv_icmd(priv, i, 0x00000040);
+               break;
+       default:
+               break;
        }
        nv_icmd(priv, 0x00000218, 0x0000c080);
        nv_icmd(priv, 0x00000219, 0x0000c080);
@@ -2221,9 +2410,14 @@ nvc0_grctx_generate(struct nvc0_graph_priv *priv)
        nv_icmd(priv, 0x0000021d, 0x0000c080);
        nv_icmd(priv, 0x0000021e, 0x0000c080);
        nv_icmd(priv, 0x0000021f, 0x0000c080);
-       if (nv_device(priv)->chipset >= 0xd0) {
-               for (i = 0x0440; i <= 0x0457; i++)
+       switch (nv_device(priv)->chipset) {
+       case 0xd9:
+       case 0xd7:
+               for (i = 0x440; i <= 0x457; i++)
                        nv_icmd(priv, i, 0x0000c080);
+               break;
+       default:
+               break;
        }
        nv_icmd(priv, 0x000000ad, 0x0000013e);
        nv_icmd(priv, 0x000000e1, 0x00000010);
@@ -2787,9 +2981,14 @@ nvc0_grctx_generate(struct nvc0_graph_priv *priv)
        nv_icmd(priv, 0x0000053f, 0xffff0000);
        nv_icmd(priv, 0x00000585, 0x0000003f);
        nv_icmd(priv, 0x00000576, 0x00000003);
-       if (nv_device(priv)->chipset == 0xc1 ||
-           nv_device(priv)->chipset >= 0xd0)
+       switch (nv_device(priv)->chipset) {
+       case 0xd9:
+       case 0xd7:
                nv_icmd(priv, 0x0000057b, 0x00000059);
+               break;
+       default:
+               break;
+       }
        nv_icmd(priv, 0x00000586, 0x00000040);
        nv_icmd(priv, 0x00000582, 0x00000080);
        nv_icmd(priv, 0x00000583, 0x00000080);
@@ -2890,8 +3089,14 @@ nvc0_grctx_generate(struct nvc0_graph_priv *priv)
        nv_icmd(priv, 0x00000957, 0x00000003);
        nv_icmd(priv, 0x0000095e, 0x20164010);
        nv_icmd(priv, 0x0000095f, 0x00000020);
-       if (nv_device(priv)->chipset >= 0xd0)
+       switch (nv_device(priv)->chipset) {
+       case 0xd9:
+       case 0xd7:
                nv_icmd(priv, 0x0000097d, 0x00000020);
+               break;
+       default:
+               break;
+       }
        nv_icmd(priv, 0x00000683, 0x00000006);
        nv_icmd(priv, 0x00000685, 0x003fffff);
        nv_icmd(priv, 0x00000687, 0x00000c48);
@@ -3020,6 +3225,8 @@ nvc0_grctx_generate(struct nvc0_graph_priv *priv)
        nv_icmd(priv, 0x00000825, 0x00000100);
        nv_icmd(priv, 0x00000826, 0x00000001);
        nv_icmd(priv, 0x0001e100, 0x00000001);
+
+
        nv_wr32(priv, 0x400208, 0x00000000);
        nv_wr32(priv, 0x404154, 0x00000400);
 
@@ -3032,6 +3239,15 @@ nvc0_grctx_generate(struct nvc0_graph_priv *priv)
        nvc0_grctx_generate_9039(priv);
        nvc0_grctx_generate_90c0(priv);
 
+       switch (nv_device(priv)->chipset) {
+       case 0xd9:
+       case 0xd7:
+               nv_mthd(priv, 0x902d, 0x3410, 0x80002006);
+               break;
+       default:
+               break;
+       }
+
        nv_wr32(priv, 0x000260, r000260);
 
        return nvc0_grctx_fini(&info);

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 f7055af0f2a6f21fa68445213bc32da51eb50f65..a9f499c6729b0ec7898c73556de1b767d6528618 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnvc0.fuc
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/fuc/gpcnvc0.fuc
@@ -208,7 +208,7 @@ mmctx_data(0x000604, 4)
 mmctx_data(0x000644, 20)
 mmctx_data(0x000698, 1)
 mmctx_data(0x0006e0, 1)
-mmctx_data(0x000750, 3)
+mmctx_data(0x000730, 11)
 nvd9_tpc_mmio_tail:
 
 .section #nvc0_grgpc_code

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 a9711712de57811748f4e99a13b65e2882a4d929..b8c9fc3b32bd820bcca61eab880084a433ca38a9 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
@@ -170,7 +170,7 @@ uint32_t nvc0_grgpc_data[] = {
        0x4c000644,
        0x00000698,
        0x000006e0,
-       0x08000750,
+       0x28000730,
 };
 
 uint32_t nvc0_grgpc_code[] = {

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 7fbdebb2bafb0e0e1d82ed1b283351397b8fd5cf..56735d0654bff28e3493870e3bae3e3f7c3daa18 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnvc0.fuc
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/fuc/hubnvc0.fuc
@@ -149,7 +149,7 @@ mmctx_data(0x4078bc, 1)
 mmctx_data(0x408000, 7)
 mmctx_data(0x408064, 1)
 mmctx_data(0x408800, 3)
-mmctx_data(0x408900, 4)
+mmctx_data(0x408900, 3)
 mmctx_data(0x408980, 1)
 nvd9_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 b655117e8dac7a88e2253d50444499ccf7cab5c1..eb59892bc4889754cbb88449a0f29c1dc875344a 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
@@ -129,7 +129,7 @@ uint32_t nvc0_grhub_data[] = {
        0x18408000,
        0x00408064,
        0x08408800,
-       0x0c408900,
+       0x08408900,
        0x00408980,
 /* 0x01e4: nvd9_hub_mmio_tail */
        0x00000000,

diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c b/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c
index af40e654ac89f94ee1839d28e4b13feebd839fb4..766870c4a27ca80257e6fdd4d8a1728f75a6c336 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c
@@ -716,6 +716,180 @@ nvc0_graph_init_regs(struct nvc0_graph_priv *priv)
        nv_wr32(priv, 0x400124, 0x00000002);
 }
 
+static void
+nvc0_graph_init_unk40xx(struct nvc0_graph_priv *priv)
+{
+       nv_wr32(priv, 0x40415c, 0x00000000);
+       nv_wr32(priv, 0x404170, 0x00000000);
+}
+
+static void
+nvc0_graph_init_unk44xx(struct nvc0_graph_priv *priv)
+{
+       nv_wr32(priv, 0x404488, 0x00000000);
+       nv_wr32(priv, 0x40448c, 0x00000000);
+}
+
+static void
+nvc0_graph_init_unk78xx(struct nvc0_graph_priv *priv)
+{
+       nv_wr32(priv, 0x407808, 0x00000000);
+}
+
+static void
+nvc0_graph_init_unk60xx(struct nvc0_graph_priv *priv)
+{
+       nv_wr32(priv, 0x406024, 0x00000000);
+}
+
+static void
+nvc0_graph_init_unk64xx(struct nvc0_graph_priv *priv)
+{
+       nv_wr32(priv, 0x4064f0, 0x00000000);
+       nv_wr32(priv, 0x4064f4, 0x00000000);
+       nv_wr32(priv, 0x4064f8, 0x00000000);
+}
+
+static void
+nvc0_graph_init_unk58xx(struct nvc0_graph_priv *priv)
+{
+       nv_wr32(priv, 0x405844, 0x00ffffff);
+       nv_wr32(priv, 0x405850, 0x00000000);
+       nv_wr32(priv, 0x405900, 0x00002834);
+       nv_wr32(priv, 0x405908, 0x00000000);
+       nv_wr32(priv, 0x405928, 0x00000000);
+       nv_wr32(priv, 0x40592c, 0x00000000);
+}
+
+static void
+nvc0_graph_init_unk80xx(struct nvc0_graph_priv *priv)
+{
+       nv_wr32(priv, 0x40803c, 0x00000000);
+}
+
+static void
+nvc0_graph_init_gpc(struct nvc0_graph_priv *priv)
+{
+       nv_wr32(priv, 0x418408, 0x00000000);
+       nv_wr32(priv, 0x4184a0, 0x00000000);
+       nv_wr32(priv, 0x4184a4, 0x00000000);
+       nv_wr32(priv, 0x4184a8, 0x00000000);
+       nv_wr32(priv, 0x418604, 0x00000000);
+       nv_wr32(priv, 0x418680, 0x00000000);
+       nv_wr32(priv, 0x418714, 0x00000000);
+       nv_wr32(priv, 0x418384, 0x00000000);
+       nv_wr32(priv, 0x418814, 0x00000000);
+       nv_wr32(priv, 0x418818, 0x00000000);
+       nv_wr32(priv, 0x41881c, 0x00000000);
+       nv_wr32(priv, 0x418b04, 0x00000000);
+       nv_wr32(priv, 0x4188c8, 0x00000000);
+       nv_wr32(priv, 0x4188cc, 0x00000000);
+       nv_wr32(priv, 0x4188d0, 0x00010000);
+       nv_wr32(priv, 0x4188d4, 0x00000001);
+       nv_wr32(priv, 0x418910, 0x00010001);
+       nv_wr32(priv, 0x418914, 0x00000301);
+       nv_wr32(priv, 0x418918, 0x00800000);
+       nv_wr32(priv, 0x418980, 0x77777770);
+       nv_wr32(priv, 0x418984, 0x77777777);
+       nv_wr32(priv, 0x418988, 0x77777777);
+       nv_wr32(priv, 0x41898c, 0x77777777);
+       nv_wr32(priv, 0x418c04, 0x00000000);
+       nv_wr32(priv, 0x418c64, 0x00000000);
+       nv_wr32(priv, 0x418c68, 0x00000000);
+       nv_wr32(priv, 0x418c88, 0x00000000);
+       nv_wr32(priv, 0x418cb4, 0x00000000);
+       nv_wr32(priv, 0x418cb8, 0x00000000);
+       nv_wr32(priv, 0x418d00, 0x00000000);
+       nv_wr32(priv, 0x418d28, 0x00000000);
+       nv_wr32(priv, 0x418d2c, 0x00000000);
+       nv_wr32(priv, 0x418f00, 0x00000000);
+       nv_wr32(priv, 0x418f08, 0x00000000);
+       nv_wr32(priv, 0x418f20, 0x00000000);
+       nv_wr32(priv, 0x418f24, 0x00000000);
+       nv_wr32(priv, 0x418e00, 0x00000003);
+       nv_wr32(priv, 0x418e08, 0x00000000);
+       nv_wr32(priv, 0x418e1c, 0x00000000);
+       nv_wr32(priv, 0x418e20, 0x00000000);
+       nv_wr32(priv, 0x41900c, 0x00000000);
+       nv_wr32(priv, 0x419018, 0x00000000);
+}
+
+static void
+nvc0_graph_init_tpc(struct nvc0_graph_priv *priv)
+{
+       nv_wr32(priv, 0x419d08, 0x00000000);
+       nv_wr32(priv, 0x419d0c, 0x00000000);
+       nv_wr32(priv, 0x419d10, 0x00000014);
+       nv_wr32(priv, 0x419ab0, 0x00000000);
+       nv_wr32(priv, 0x419ac8, 0x00000000);
+       nv_wr32(priv, 0x419ab8, 0x000000e7);
+       nv_wr32(priv, 0x419abc, 0x00000000);
+       nv_wr32(priv, 0x419ac0, 0x00000000);
+       nv_wr32(priv, 0x419ab4, 0x00000000);
+       nv_wr32(priv, 0x41980c, 0x00000010);
+       nv_wr32(priv, 0x419810, 0x00000000);
+       nv_wr32(priv, 0x419814, 0x00000004);
+       nv_wr32(priv, 0x419844, 0x00000000);
+       nv_wr32(priv, 0x41984c, 0x0000a918);
+       nv_wr32(priv, 0x419850, 0x00000000);
+       nv_wr32(priv, 0x419854, 0x00000000);
+       nv_wr32(priv, 0x419858, 0x00000000);
+       nv_wr32(priv, 0x41985c, 0x00000000);
+       nv_wr32(priv, 0x419880, 0x00000002);
+       nv_wr32(priv, 0x419c98, 0x00000000);
+       nv_wr32(priv, 0x419ca8, 0x80000000);
+       nv_wr32(priv, 0x419cb4, 0x00000000);
+       nv_wr32(priv, 0x419cb8, 0x00008bf4);
+       nv_wr32(priv, 0x419cbc, 0x28137606);
+       nv_wr32(priv, 0x419cc0, 0x00000000);
+       nv_wr32(priv, 0x419cc4, 0x00000000);
+       nv_wr32(priv, 0x419bd4, 0x00800000);
+       nv_wr32(priv, 0x419bdc, 0x00000000);
+       nv_wr32(priv, 0x419bf8, 0x00000000);
+       nv_wr32(priv, 0x419bfc, 0x00000000);
+       nv_wr32(priv, 0x419d2c, 0x00000000);
+       nv_wr32(priv, 0x419d48, 0x00000000);
+       nv_wr32(priv, 0x419d4c, 0x00000000);
+       nv_wr32(priv, 0x419c0c, 0x00000000);
+       nv_wr32(priv, 0x419e00, 0x00000000);
+       nv_wr32(priv, 0x419ea0, 0x00000000);
+       nv_wr32(priv, 0x419ea4, 0x00000100);
+       nv_wr32(priv, 0x419ea8, 0x02001100);
+       nv_wr32(priv, 0x419eac, 0x11100702);
+       nv_wr32(priv, 0x419eb0, 0x00000003);
+       nv_wr32(priv, 0x419eb4, 0x00000000);
+       nv_wr32(priv, 0x419eb8, 0x00000000);
+       nv_wr32(priv, 0x419ebc, 0x00000000);
+       nv_wr32(priv, 0x419ec0, 0x00000000);
+       nv_wr32(priv, 0x419ec8, 0x0e063818);
+       nv_wr32(priv, 0x419ecc, 0x0e060e06);
+       nv_wr32(priv, 0x419ed0, 0x00003818);
+       nv_wr32(priv, 0x419ed4, 0x011104f1);
+       nv_wr32(priv, 0x419edc, 0x00000000);
+       nv_wr32(priv, 0x419f00, 0x00000000);
+       nv_wr32(priv, 0x419f2c, 0x00000000);
+}
+
+static void
+nvc0_graph_init_unk88xx(struct nvc0_graph_priv *priv)
+{
+       nv_wr32(priv, 0x40880c, 0x00000000);
+       nv_wr32(priv, 0x408910, 0x00000000);
+       nv_wr32(priv, 0x408914, 0x00000000);
+       nv_wr32(priv, 0x408918, 0x00000000);
+       nv_wr32(priv, 0x40891c, 0x00000000);
+       nv_wr32(priv, 0x408920, 0x00000000);
+       nv_wr32(priv, 0x408924, 0x00000000);
+       nv_wr32(priv, 0x408928, 0x00000000);
+       nv_wr32(priv, 0x40892c, 0x00000000);
+       nv_wr32(priv, 0x408930, 0x00000000);
+       nv_wr32(priv, 0x408950, 0x00000000);
+       nv_wr32(priv, 0x408954, 0x0000ffff);
+       nv_wr32(priv, 0x408984, 0x00000000);
+       nv_wr32(priv, 0x408988, 0x08040201);
+       nv_wr32(priv, 0x40898c, 0x80402010);
+}
+
 static void
 nvc0_graph_init_gpc_0(struct nvc0_graph_priv *priv)
 {
@@ -957,7 +1131,25 @@ nvc0_graph_init(struct nouveau_object *object)
 
        nvc0_graph_init_obj418880(priv);
        nvc0_graph_init_regs(priv);
-       /*nvc0_graph_init_unitplemented_magics(priv);*/
+
+       switch (nv_device(priv)->chipset) {
+       case 0xd9:
+       case 0xd7:
+               nvc0_graph_init_unk40xx(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_unitplemented_c242(priv);*/