drm/nvc0-/gr: remove reset-after-grctx-construction hack

[karo-tx-linux.git] / drivers / gpu / drm / nouveau / core / engine / graph / nvc0.c

diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c b/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c
index db8aefc3cf3e413a106ea92085fc01496a6d1659..e2f1bea53540271ad885fc9f1253dd4470b38ba7 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c
@@ -707,8 +707,6 @@ nvc0_graph_init_ctxctl(struct nvc0_graph_priv *priv)
                        nv_error(priv, "failed to construct context\n");
                        return ret;
                }
-
-               return 1;
        }
 
        return 0;
@@ -720,7 +718,6 @@ nvc0_graph_init(struct nouveau_object *object)
        struct nvc0_graph_priv *priv = (void *)object;
        int ret;
 
-reset:
        ret = nouveau_graph_init(&priv->base);
        if (ret)
                return ret;
@@ -748,11 +745,8 @@ reset:
        nv_wr32(priv, 0x400054, 0x34ce3464);
 
        ret = nvc0_graph_init_ctxctl(priv);
-       if (ret) {
-               if (ret == 1)
-                       goto reset;
+       if (ret)
                return ret;
-       }
 
        return 0;
 }