drm/ttm: cleanup BO size handling v3

[linux-2.6-microblaze.git] / drivers / gpu / drm / ttm / ttm_bo_vm.c

diff --git a/drivers/gpu/drm/ttm/ttm_bo_vm.c b/drivers/gpu/drm/ttm/ttm_bo_vm.c
index 144a494..6dc96cf 100644 (file)
--- a/drivers/gpu/drm/ttm/ttm_bo_vm.c
+++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c
@@ -198,7 +198,7 @@ static vm_fault_t ttm_bo_vm_insert_huge(struct vm_fault *vmf,
 
        /* Fault should not cross bo boundary. */
        page_offset &= ~(fault_page_size - 1);
-       if (page_offset + fault_page_size > bo->num_pages)
+       if (page_offset + fault_page_size > bo->mem.num_pages)
                goto out_fallback;
 
        if (bo->mem.bus.is_iomem)
@@ -306,7 +306,7 @@ vm_fault_t ttm_bo_vm_fault_reserved(struct vm_fault *vmf,
        page_last = vma_pages(vma) + vma->vm_pgoff -
                drm_vma_node_start(&bo->base.vma_node);
 
-       if (unlikely(page_offset >= bo->num_pages))
+       if (unlikely(page_offset >= bo->mem.num_pages))
                return VM_FAULT_SIGBUS;
 
        prot = ttm_io_prot(bo, &bo->mem, prot);
@@ -469,7 +469,7 @@ int ttm_bo_vm_access(struct vm_area_struct *vma, unsigned long addr,
                 << PAGE_SHIFT);
        int ret;
 
-       if (len < 1 || (offset + len) >> PAGE_SHIFT > bo->num_pages)
+       if (len < 1 || (offset + len) >> PAGE_SHIFT > bo->mem.num_pages)
                return -EIO;
 
        ret = ttm_bo_reserve(bo, true, false, NULL);