From 71b9e876f99db219fcbf4e3ab977b64b068cc2b4 Mon Sep 17 00:00:00 2001
From: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Date: Tue, 6 Feb 2007 16:59:45 +0100
Subject: Simplify pci map vs no pci map choice.

---
 linux-core/drm_vm.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'linux-core/drm_vm.c')

diff --git a/linux-core/drm_vm.c b/linux-core/drm_vm.c
index a4a9b09d..843fc362 100644
--- a/linux-core/drm_vm.c
+++ b/linux-core/drm_vm.c
@@ -754,7 +754,8 @@ struct page *drm_bo_vm_fault(struct vm_area_struct *vma,
 	}
 
 	dev = bo->dev;
-	err = drm_bo_pci_offset(bo, &bus_base, &bus_offset, &bus_size);
+	err = drm_bo_pci_offset(dev, &bo->mem, &bus_base, &bus_offset, 
+				&bus_size);
 
 	if (err) {
 		data->type = VM_FAULT_SIGBUS;
@@ -770,6 +771,7 @@ struct page *drm_bo_vm_fault(struct vm_area_struct *vma,
 		bm = &dev->bm;
 		ttm = bo->ttm;
 
+		drm_ttm_fixup_caching(ttm);
 		page = ttm->pages[page_offset];
 		if (!page) {
 			page = drm_ttm_alloc_page();
-- 
cgit v1.2.3