drm/nouveau/graph: enable when using external fw

nvc0_graph_ctor() would only let the graphics engine be enabled if its
oclass has a proper microcode linked to it. This prevents GR from being
enabled at all on chips that rely exclusively on external firmware, even
though such a use-case is valid.

Relax the conditions enabling the GR engine to also include the case
where an external firmware has also been loaded.

Also switch to external firmware if the graph class has no microcode
linked to it.

Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c b/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c
index f3c7329da0a04c8870ccba95a9b525c2ebc3ddca..83dca0700ae504a1a2cf4d53c68a0eb8981acdb4 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c
@@ -1259,10 +1259,14 @@ nvc0_graph_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
        struct nvc0_graph_oclass *oclass = (void *)bclass;
        struct nouveau_device *device = nv_device(parent);
        struct nvc0_graph_priv *priv;
+       bool use_ext_fw, enable;
        int ret, i;
 
-       ret = nouveau_graph_create(parent, engine, bclass,
-                                  (oclass->fecs.ucode != NULL), &priv);
+       use_ext_fw = nouveau_boolopt(device->cfgopt, "NvGrUseFW",
+                                    oclass->fecs.ucode == NULL);
+       enable = use_ext_fw || oclass->fecs.ucode != NULL;
+
+       ret = nouveau_graph_create(parent, engine, bclass, enable, &priv);
        *pobject = nv_object(priv);
        if (ret)
                return ret;
@@ -1272,7 +1276,7 @@ nvc0_graph_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
 
        priv->base.units = nvc0_graph_units;
 
-       if (nouveau_boolopt(device->cfgopt, "NvGrUseFW", false)) {
+       if (use_ext_fw) {
                nv_info(priv, "using external firmware\n");
                if (nvc0_graph_ctor_fw(priv, "fuc409c", &priv->fuc409c) ||
                    nvc0_graph_ctor_fw(priv, "fuc409d", &priv->fuc409d) ||