Changes for 14.0-CURRENT

Author: jsm222

core/drm_syncobj.c

@@ -512,7 +512,7 @@ static int drm_syncobj_file_close(struct file *file, struct thread *td)
 }
 static __inline int
 drm_syncobj_file_stat(struct file *fp, struct stat *sb,
-    struct ucred *active_cred, struct thread *td)
+    struct ucred *active_cred)
 {
 
 	return (0);

drmkpi/drmkpi_dma_buf.c

@@ -67,8 +67,7 @@ static fo_poll_t dmabuf_fop_poll;
 static fo_seek_t dmabuf_fop_seek;
 
 static int
-dmabuf_fop_stat(struct file *fp, struct stat *sb, struct ucred *cred,
-    struct thread *td)
+dmabuf_fop_stat(struct file *fp, struct stat *sb, struct ucred *cred)
 {
 
 	return (0);

freebsd/drm_gem_cma_helper.c

@@ -73,6 +73,7 @@ drm_gem_cma_destruct(struct drm_gem_cma_object *bo)
 		vm_page_unwire_noq(m);
 		vm_page_free(m);
 		vm_page_unlock(m);
+
 	}
 }
 
@@ -87,11 +88,10 @@ drm_gem_cma_alloc_contig(size_t npages, u_long alignment, vm_memattr_t memattr,
 	low = 0;
 	high = -1UL;
 	boundary = 0;
-	pflags = VM_ALLOC_NORMAL  | VM_ALLOC_NOOBJ | VM_ALLOC_NOBUSY |
-	    VM_ALLOC_WIRED | VM_ALLOC_ZERO;
+	pflags = VM_ALLOC_WIRED | VM_ALLOC_ZERO;
 	tries = 0;
 retry:
-	m = vm_page_alloc_contig(NULL, 0, pflags, npages, low, high, alignment,
+	m = vm_page_alloc_noobj_contig(pflags, npages, low, high, alignment,
 	    boundary, memattr);
 	if (m == NULL) {
 		if (tries < 3) {
@@ -187,7 +187,7 @@ drm_gem_cma_fault(struct vm_area_struct *dummy, struct vm_fault *vmf)
 			goto fail_unlock;
 		if (vm_page_insert(page, obj, i))
 			goto fail_unlock;
-		vm_page_xbusy(page);
+		vm_page_tryxbusy(page);
 		page->valid = VM_PAGE_BITS_ALL;
 	}
 	VM_OBJECT_WUNLOCK(obj);

freebsd/drm_os_freebsd.c

@@ -182,11 +182,10 @@ drm_fstub_kqfilter(struct file *file, struct knote *kn)
 }
 
 static int
-drm_fstub_stat(struct file *fp, struct stat *sb, struct ucred *cred,
-    struct thread *td)
+drm_fstub_stat(struct file *fp, struct stat *sb, struct ucred *cred)
 {
 
-	return (vnops.fo_stat(fp, sb, cred, td));
+	return (vnops.fo_stat(fp, sb, cred));
 }
 
 static int