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

Commit f1cd6594 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'ttm-fixes-3.13' of git://people.freedesktop.org/~thomash/linux into drm-next 

A single ttm vm fix.

* 'ttm-fixes-3.13' of git://people.freedesktop.org/~thomash/linux:
  drm/ttm: Fix accesses through vmas with only partial coverage
parents b25b4427 d3867355

drivers/gpu/drm/ttm/ttm_bo_vm.c

+3 −3
Original line number Diff line number Diff line
@@ -169,9 +169,9 @@ static int ttm_bo_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf) 
	}



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

	    drm_vma_node_start(&bo->vma_node) - vma->vm_pgoff;

	page_last = vma_pages(vma) +

	    drm_vma_node_start(&bo->vma_node) - vma->vm_pgoff;

		vma->vm_pgoff - drm_vma_node_start(&bo->vma_node);

	page_last = vma_pages(vma) + vma->vm_pgoff -

		drm_vma_node_start(&bo->vma_node);



	if (unlikely(page_offset >= bo->num_pages)) {

		retval = VM_FAULT_SIGBUS;