summaryrefslogtreecommitdiff
path: root/linux-core/drm_vm.c
diff options
context:
space:
mode:
authorThomas Hellstrom <thomas-at-tungstengraphics-dot-com>2007-02-14 12:39:02 +0100
committerThomas Hellstrom <thomas-at-tungstengraphics-dot-com>2007-02-14 12:39:02 +0100
commit04760563b88c8e94f3ae448710d1ab8b350c2e5f (patch)
treed3f24155c6084b67322b6481d321bc2f0e82d4d6 /linux-core/drm_vm.c
parent7bcb62b45d18ab7b48ad3cb5d13aec3bc577678e (diff)
Set the drm bus map type for each buffer object memory type.
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 4a340b57..f3b1088f 100644
--- a/linux-core/drm_vm.c
+++ b/linux-core/drm_vm.c
@@ -816,8 +816,10 @@ struct page *drm_bo_vm_fault(struct vm_area_struct *vma,
page_offset = (address - vma->vm_start) >> PAGE_SHIFT;
if (bus_size) {
+ drm_mem_type_manager_t *man = &dev->bm.man[bo->mem.mem_type];
+
pfn = ((bus_base + bus_offset) >> PAGE_SHIFT) + page_offset;
- vma->vm_page_prot = drm_io_prot(_DRM_AGP, vma);
+ vma->vm_page_prot = drm_io_prot(man->drm_bus_maptype, vma);
} else {
ttm = bo->ttm;