summaryrefslogtreecommitdiff
path: root/linux-core/drm_vm.c
diff options
context:
space:
mode:
authorThomas Hellstrom <thomas-at-tungstengraphics-dot-com>2007-02-06 16:59:45 +0100
committerThomas Hellstrom <thomas-at-tungstengraphics-dot-com>2007-02-06 16:59:45 +0100
commit71b9e876f99db219fcbf4e3ab977b64b068cc2b4 (patch)
treed55a70612ab8d75abc0146a8c6ebddaea4ce0d05 /linux-core/drm_vm.c
parent40ce53dfde11f84d7bf8db5db93fb73715b2e96e (diff)
Simplify pci map vs no pci map choice.
Diffstat (limited to 'linux-core/drm_vm.c')
-rw-r--r--linux-core/drm_vm.c4
1 files changed, 3 insertions, 1 deletions
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();