Adapt to recent VM busy changes.

Author: jwroberson

drivers/gpu/drm/i915/intel_freebsd.c

@@ -189,21 +189,13 @@ remap_io_mapping(struct vm_area_struct *vma, unsigned long addr,
 	for (pidx = pidx_start; pidx < pidx_start + count;
 	    pidx++, pa += PAGE_SIZE) {
 retry:
-		m = vm_page_lookup(vm_obj, pidx);
-		if (m != NULL) {
-			/* XXX need to unpin object first */
-			if (vm_page_sleep_if_busy(m, "i915flt"))
-				goto retry;
-		} else {
+		m = vm_page_grab(vm_obj, pidx, VM_ALLOC_NOCREAT);
+		if (m == NULL) {
 			m = PHYS_TO_VM_PAGE(pa);
-			if (vm_page_busied(m)) {
-				vm_page_lock(m);
-				VM_OBJECT_WUNLOCK(vm_obj);
-				vm_page_busy_sleep(m, "i915flt", false);
-				VM_OBJECT_WLOCK(vm_obj);
+			if (!vm_page_busy_acquire(m, VM_ALLOC_WAITFAIL))
 				goto retry;
-			}
 			if (vm_page_insert(m, vm_obj, pidx)) {
+				vm_page_xunbusy(m);
 				VM_OBJECT_WUNLOCK(vm_obj);
 #ifdef VM_WAIT
 				VM_WAIT;
@@ -213,9 +205,8 @@ remap_io_mapping(struct vm_area_struct *vma, unsigned long addr,
 				VM_OBJECT_WLOCK(vm_obj);
 				goto retry;
 			}
-			m->valid = VM_PAGE_BITS_ALL;
+			vm_page_valid(m);
 		}
-		vm_page_xbusy(m);
 		pmap_page_set_memattr(m, attr);
 		vma->vm_pfn_count++;
 	}

drivers/gpu/drm/ttm/ttm_bo_vm.c

@@ -312,11 +312,8 @@ static int ttm_bo_vm_fault(struct vm_area_struct *dummy, struct vm_fault *vmf)
 	for (i = 0; i < TTM_BO_VM_NUM_PREFAULT && page_offset < page_last;
 	    i++, page_offset++, pidx++) {
 retry:
-		page = vm_page_lookup(obj, pidx);
-		if (page != NULL) {
-			if (vm_page_sleep_if_busy(page, "ttmflt"))
-				goto retry;
-		} else {
+		page = vm_page_grab(obj, pidx, VM_ALLOC_NOCREAT);
+		if (page == NULL) {
 			if (bo->mem.bus.is_iomem) {
 				pfn = ttm_bo_io_mem_pfn(bo, page_offset);
 				page = PHYS_TO_VM_PAGE(IDX_TO_OFF(pfn));
@@ -326,15 +323,16 @@ static int ttm_bo_vm_fault(struct vm_area_struct *dummy, struct vm_fault *vmf)
 					goto fail;
 				page->oflags &= ~VPO_UNMANAGED;
 			}
-			if (vm_page_busied(page))
-				goto fail;
-			if (vm_page_insert(page, obj, pidx))
+			if (!vm_page_busy_acquire(page, VM_ALLOC_WAITFAIL))
+				goto retry;
+			if (vm_page_insert(page, obj, pidx)) {
+				vm_page_xunbusy(page);
 				goto fail;
-			page->valid = VM_PAGE_BITS_ALL;
+			}
+			vm_page_valid(page);
 		}
 		pmap_page_set_memattr(page,
 		    pgprot2cachemode(cvma.vm_page_prot));
-		vm_page_xbusy(page);
 		vma->vm_pfn_count++;
 		continue;
 fail: