drm/nvc0/gr: enable 0xc8/0xce support, no idea if it works or not..

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

diff --git a/drivers/gpu/drm/nouveau/nvc0_graph.h b/drivers/gpu/drm/nouveau/nvc0_graph.h
index 2b667d4e88ca137067b382ede2a1ec13f0c1cbc7..f067ed232f975ee32f0fd07b8c82d25afa9e9959 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvc0_graph.h
+++ b/drivers/gpu/drm/nouveau/nvc0_graph.h
@@ -82,13 +82,14 @@ nvc0_graph_class(struct drm_device *dev)
        case 0xc0:
        case 0xc3:
        case 0xc4:
+       case 0xce: /* guess, mmio trace shows only 0x9097 state */
                return 0x9097;
 #if 0
        case 0xc1:
                return 0x9197;
+#endif
        case 0xc8:
                return 0x9297;
-#endif
        default:
                return 0;
        }

diff --git a/drivers/gpu/drm/nouveau/nvc0_grctx.c b/drivers/gpu/drm/nouveau/nvc0_grctx.c
index 3ac376235d2915713914cc0beaab72665e37f204..562a0cd950ee56a0124922414110bd7580178035 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvc0_grctx.c
+++ b/drivers/gpu/drm/nouveau/nvc0_grctx.c
@@ -1642,8 +1642,8 @@ nvc0_grctx_generate_tp(struct drm_device *dev)
        nv_wr32(dev, 0x419a14, 0x00000200);
        nv_wr32(dev, 0x419a1c, 0x00000000);
        nv_wr32(dev, 0x419a20, 0x00000800);
-       if (dev_priv->chipset != 0xc0)
-               nv_wr32(dev, 0x00419ac4, 0x0007f440); /* 0xc3 */
+       if (dev_priv->chipset != 0xc0 && dev_priv->chipset != 0xc8)
+               nv_wr32(dev, 0x00419ac4, 0x0007f440);
        nv_wr32(dev, 0x419b00, 0x0a418820);
        nv_wr32(dev, 0x419b04, 0x062080e6);
        nv_wr32(dev, 0x419b08, 0x020398a4);
@@ -1657,7 +1657,7 @@ nvc0_grctx_generate_tp(struct drm_device *dev)
        nv_wr32(dev, 0x419c04, 0x00000006);
        nv_wr32(dev, 0x419c08, 0x00000002);
        nv_wr32(dev, 0x419c20, 0x00000000);
-       nv_wr32(dev, 0x419cb0, 0x00060048);
+       nv_wr32(dev, 0x419cb0, 0x00060048); //XXX: 0xce 0x00020048
        nv_wr32(dev, 0x419ce8, 0x00000000);
        nv_wr32(dev, 0x419cf4, 0x00000183);
        nv_wr32(dev, 0x419d20, 0x02180000);
@@ -1687,11 +1687,11 @@ nvc0_grctx_generate_tp(struct drm_device *dev)
        nv_wr32(dev, 0x419e8c, 0x00000000);
        nv_wr32(dev, 0x419e90, 0x00000000);
        nv_wr32(dev, 0x419e98, 0x00000000);
-       if (dev_priv->chipset != 0xc0)
+       if (dev_priv->chipset != 0xc0 && dev_priv->chipset != 0xc8)
                nv_wr32(dev, 0x419ee0, 0x00011110);
        nv_wr32(dev, 0x419f50, 0x00000000);
        nv_wr32(dev, 0x419f54, 0x00000000);
-       if (dev_priv->chipset != 0xc0)
+       if (dev_priv->chipset != 0xc0 && dev_priv->chipset != 0xc8)
                nv_wr32(dev, 0x419f58, 0x00000000);
 }