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

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

diff --git a/drivers/gpu/drm/nouveau/core/engine/graph/nve0.c b/drivers/gpu/drm/nouveau/core/engine/graph/nve0.c
index c79748a6fa2bd573829c9c621c164eabd247ac61..7ef692b92e83530af31351b26b50cf9c48c99217 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/graph/nve0.c
+++ b/drivers/gpu/drm/nouveau/core/engine/graph/nve0.c
@@ -457,8 +457,6 @@ nve0_graph_init_ctxctl(struct nvc0_graph_priv *priv)
                        nv_error(priv, "failed to construct context\n");
                        return ret;
                }
-
-               return 1;
        }
 
        return 0;
@@ -470,7 +468,6 @@ nve0_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;
@@ -496,11 +493,8 @@ reset:
        nv_wr32(priv, 0x400054, 0x34ce3464);
 
        ret = nve0_graph_init_ctxctl(priv);
-       if (ret) {
-               if (ret == 1)
-                       goto reset;
+       if (ret)
                return ret;
-       }
 
        return 0;
 }