aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/ttm
diff options
context:
space:
mode:
authorLibin <huawei.libin@huawei.com>2013-04-15 08:48:57 -0400
committerDave Airlie <airlied@redhat.com>2013-04-15 23:14:00 -0400
commit025df7755472dc5ee9ebc5aa7023eba4b4ef3e3b (patch)
tree5174bb512dde0009be5b4e9567da281bea2c38cd /drivers/gpu/drm/ttm
parent87d24fc3abb0666b23b6136d81dc29014b3c76dd (diff)
drm: use vma_pages() to replace (vm_end - vm_start) >> PAGE_SHIFT
(*->vm_end - *->vm_start) >> PAGE_SHIFT operation is implemented as a inline funcion vma_pages() in linux/mm.h, so using it. Signed-off-by: Libin <huawei.libin@huawei.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/ttm')
-rw-r--r--drivers/gpu/drm/ttm/ttm_bo_vm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_bo_vm.c b/drivers/gpu/drm/ttm/ttm_bo_vm.c
index 74705f329d99..3df9f16b041c 100644
--- a/drivers/gpu/drm/ttm/ttm_bo_vm.c
+++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c
@@ -147,7 +147,7 @@ static int ttm_bo_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
147 147
148 page_offset = ((address - vma->vm_start) >> PAGE_SHIFT) + 148 page_offset = ((address - vma->vm_start) >> PAGE_SHIFT) +
149 bo->vm_node->start - vma->vm_pgoff; 149 bo->vm_node->start - vma->vm_pgoff;
150 page_last = ((vma->vm_end - vma->vm_start) >> PAGE_SHIFT) + 150 page_last = vma_pages(vma) +
151 bo->vm_node->start - vma->vm_pgoff; 151 bo->vm_node->start - vma->vm_pgoff;
152 152
153 if (unlikely(page_offset >= bo->num_pages)) { 153 if (unlikely(page_offset >= bo->num_pages)) {
@@ -258,7 +258,7 @@ int ttm_bo_mmap(struct file *filp, struct vm_area_struct *vma,
258 258
259 read_lock(&bdev->vm_lock); 259 read_lock(&bdev->vm_lock);
260 bo = ttm_bo_vm_lookup_rb(bdev, vma->vm_pgoff, 260 bo = ttm_bo_vm_lookup_rb(bdev, vma->vm_pgoff,
261 (vma->vm_end - vma->vm_start) >> PAGE_SHIFT); 261 vma_pages(vma));
262 if (likely(bo != NULL) && !kref_get_unless_zero(&bo->kref)) 262 if (likely(bo != NULL) && !kref_get_unless_zero(&bo->kref))
263 bo = NULL; 263 bo = NULL;
264 read_unlock(&bdev->vm_lock); 264 read_unlock(&bdev->vm_lock);