drm/nv04/dmaobj: fixup vm target handling in preparation for nv4x pcie

We don't need to pull the page address out of the page tables on nv4x chips that have a real GART. Signed-off-by: Ben Skeggs <[email protected]>
chewitt · Oct 3, 2012 · 8a57d27 · 8a57d27
1 parent dc73b45
commit 8a57d27
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/drivers/gpu/drm/nouveau/core/engine/dmaobj/nv04.c b/drivers/gpu/drm/nouveau/core/engine/dmaobj/nv04.c
@@ -44,21 +44,24 @@ nv04_dmaobj_bind(struct nouveau_dmaeng *dmaeng,
 		 struct nouveau_dmaobj *dmaobj,
 		 struct nouveau_gpuobj **pgpuobj)
 {
+	struct nv04_vmmgr_priv *vmm = nv04_vmmgr(dmaeng);
 	struct nouveau_gpuobj *gpuobj;
 	u32 flags0 = nv_mclass(dmaobj);
 	u32 flags2 = 0x00000000;
-	u32 offset = (dmaobj->start & 0xfffff000);
-	u32 adjust = (dmaobj->start & 0x00000fff);
+	u64 offset = dmaobj->start & 0xfffff000;
+	u64 adjust = dmaobj->start & 0x00000fff;
 	u32 length = dmaobj->limit - dmaobj->start;
 	int ret;
 
 	if (dmaobj->target == NV_MEM_TARGET_VM) {
-		gpuobj = nv04_vmmgr(dmaeng)->vm->pgt[0].obj[0];
-		if (dmaobj->start == 0)
-			return nouveau_gpuobj_dup(parent, gpuobj, pgpuobj);
+		if (nv_object(vmm)->oclass == &nv04_vmmgr_oclass) {
+			struct nouveau_gpuobj *pgt = vmm->vm->pgt[0].obj[0];
+			if (!dmaobj->start)
+				return nouveau_gpuobj_dup(parent, pgt, pgpuobj);
+			offset  = nv_ro32(pgt, 8 + (offset >> 10));
+			offset &= 0xfffff000;
+		}
 
-		offset  = nv_ro32(gpuobj, 8 + (offset >> 10));
-		offset &= 0xfffff000;
 		dmaobj->target = NV_MEM_TARGET_PCI;
 		dmaobj->access = NV_MEM_ACCESS_RW;
 	}