drm/nvc0/gr: macro to determine fermi class, will use it in a few places

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

diff --git a/drivers/gpu/drm/nouveau/nvc0_graph.c b/drivers/gpu/drm/nouveau/nvc0_graph.c
index ca6db204d644711dafcaa8e9eaf2c88deada27ae..a57fba3da9417d2b0488b28be285cf551de8cd8e 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvc0_graph.c
+++ b/drivers/gpu/drm/nouveau/nvc0_graph.c
@@ -675,13 +675,10 @@ nvc0_graph_create(struct drm_device *dev)
        struct drm_nouveau_private *dev_priv = dev->dev_private;
        struct nvc0_graph_priv *priv;
        int ret, gpc, i;
+       u32 fermi;
 
-       switch (dev_priv->chipset) {
-       case 0xc0:
-       case 0xc3:
-       case 0xc4:
-               break;
-       default:
+       fermi = nvc0_graph_class(dev);
+       if (!fermi) {
                NV_ERROR(dev, "PGRAPH: unsupported chipset, please report!\n");
                return 0;
        }
@@ -770,6 +767,10 @@ nvc0_graph_create(struct drm_device *dev)
        NVOBJ_CLASS(dev, 0x9039, GR); /* M2MF */
        NVOBJ_MTHD (dev, 0x9039, 0x0500, nvc0_graph_mthd_page_flip);
        NVOBJ_CLASS(dev, 0x9097, GR); /* 3D */
+       if (fermi >= 0x9197)
+               NVOBJ_CLASS(dev, 0x9197, GR); /* 3D (NVC1-) */
+       if (fermi >= 0x9297)
+               NVOBJ_CLASS(dev, 0x9297, GR); /* 3D (NVC8-) */
        NVOBJ_CLASS(dev, 0x90c0, GR); /* COMPUTE */
        return 0;
 

diff --git a/drivers/gpu/drm/nouveau/nvc0_graph.h b/drivers/gpu/drm/nouveau/nvc0_graph.h
index f5d184e0689df4bad0f99ce792167c1c8ea960f9..2b667d4e88ca137067b382ede2a1ec13f0c1cbc7 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvc0_graph.h
+++ b/drivers/gpu/drm/nouveau/nvc0_graph.h
@@ -72,4 +72,26 @@ struct nvc0_graph_chan {
 
 int nvc0_grctx_generate(struct nouveau_channel *);
 
+/* nvc0_graph.c uses this also to determine supported chipsets */
+static inline u32
+nvc0_graph_class(struct drm_device *dev)
+{
+       struct drm_nouveau_private *dev_priv = dev->dev_private;
+
+       switch (dev_priv->chipset) {
+       case 0xc0:
+       case 0xc3:
+       case 0xc4:
+               return 0x9097;
+#if 0
+       case 0xc1:
+               return 0x9197;
+       case 0xc8:
+               return 0x9297;
+#endif
+       default:
+               return 0;
+       }
+}
+
 #endif