Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 025df775 authored by Libin's avatar Libin Committed by Dave Airlie
Browse files

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: default avatarLibin <huawei.libin@huawei.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 87d24fc3

drivers/gpu/drm/ttm/ttm_bo_vm.c

+2 −2
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ static int ttm_bo_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf) 


	page_offset = ((address - vma->vm_start) >> PAGE_SHIFT) +

	    bo->vm_node->start - vma->vm_pgoff;

	page_last = ((vma->vm_end - vma->vm_start) >> PAGE_SHIFT) +

	page_last = vma_pages(vma) +

	    bo->vm_node->start - vma->vm_pgoff;



	if (unlikely(page_offset >= bo->num_pages)) {
@@ -258,7 +258,7 @@ int ttm_bo_mmap(struct file *filp, struct vm_area_struct *vma, 


	read_lock(&bdev->vm_lock);

	bo = ttm_bo_vm_lookup_rb(bdev, vma->vm_pgoff,

				 (vma->vm_end - vma->vm_start) >> PAGE_SHIFT);

				 vma_pages(vma));

	if (likely(bo != NULL) && !kref_get_unless_zero(&bo->kref))

		bo = NULL;

	read_unlock(&bdev->vm_lock);