---

yaml --- r: 228606 b: refs/heads/master c: c45aada h: refs/heads/master v: v3
git-mirror · Dec 16, 2010 · e7a591b · e7a591b
1 parent 5489cb5
commit e7a591b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fd70b6cd780742b97f525415bf5e4fb24a4bb6d8
+refs/heads/master: c45aadabb961501b3e64bc92d0bf12fdce26d37d
diff --git a/trunk/drivers/gpu/drm/nouveau/nv50_instmem.c b/trunk/drivers/gpu/drm/nouveau/nv50_instmem.c
@@ -182,16 +182,17 @@ nv50_instmem_init(struct drm_device *dev)
 	nv_wr32(dev, 0x001704, 0x40000000 | (chan->ramin->vinst >> 12));
 	nv_wr32(dev, 0x00170c, 0x80000000 | (priv->bar3_dmaobj->cinst >> 4));
 
-	tmp = nv_ri32(dev, 0);
-	nv_wi32(dev, 0, ~tmp);
-	if (nv_ri32(dev, 0) != ~tmp) {
+	dev_priv->engine.instmem.flush(dev);
+	dev_priv->ramin_available = true;
+
+	tmp = nv_ro32(chan->ramin, 0);
+	nv_wo32(chan->ramin, 0, ~tmp);
+	if (nv_ro32(chan->ramin, 0) != ~tmp) {
 		NV_ERROR(dev, "PRAMIN readback failed\n");
 		ret = -EIO;
 		goto error;
 	}
-	nv_wi32(dev, 0, tmp);
-
-	dev_priv->ramin_available = true;
+	nv_wo32(chan->ramin, 0, tmp);
 
 	/* BAR1 */
 	ret = nouveau_vm_new(dev, BAR1_VM_BASE, BAR1_VM_SIZE, BAR1_VM_BASE,