---

yaml --- r: 228849 b: refs/heads/master c: eeb9cc0 h: refs/heads/master i: 228847: 02d954c v: v3
git-mirror · Jan 6, 2011 · ed12571 · ed12571
1 parent e2b4d3b
commit ed12571
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 47a44d27ca246b815de2b4223daf86070315fb8d
+refs/heads/master: eeb9cc015f91ff08453040dd5b2fde0dbaac90d3
diff --git a/trunk/drivers/gpu/drm/nouveau/nvc0_graph.c b/trunk/drivers/gpu/drm/nouveau/nvc0_graph.c
@@ -584,7 +584,7 @@ nvc0_graph_init_ctxctl(struct drm_device *dev)
 	r000260 = nv_mask(dev, 0x000260, 0x00000001, 0x00000000);
 	ret = nvc0_fuc_load_fw(dev, 0x409000, "fuc409c", "fuc409d");
 	if (ret == 0)
-		nvc0_fuc_load_fw(dev, 0x41a000, "fuc41ac", "fuc41ad");
+		ret = nvc0_fuc_load_fw(dev, 0x41a000, "fuc41ac", "fuc41ad");
 	nv_wr32(dev, 0x000260, r000260);
 
 	if (ret)
@@ -686,10 +686,8 @@ nvc0_graph_init(struct drm_device *dev)
 	nv_wr32(dev, 0x400054, 0x34ce3464);
 
 	ret = nvc0_graph_init_ctxctl(dev);
-	if (ret)
-		return ret;
-
-	dev_priv->engine.graph.accel_blocked = false;
+	if (ret == 0)
+		dev_priv->engine.graph.accel_blocked = false;
 	return 0;
 }