Merge "disp: msm: replace vma->vm_flags direct modifications with modifier calls" into display-kernel.lnx.1.0

msm/msm_gem.c

@@ -224,8 +224,12 @@ int msm_gem_mmap_obj(struct drm_gem_object *obj,
 {
 	struct msm_gem_object *msm_obj = to_msm_bo(obj);
 
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 1, 25))
 	vma->vm_flags &= ~VM_PFNMAP;
 	vma->vm_flags |= VM_MIXEDMAP;
+#else
+	vm_flags_mod(vma, VM_MIXEDMAP, VM_PFNMAP);
+#endif
 
 	if (msm_obj->flags & MSM_BO_WC) {
 		vma->vm_page_prot = pgprot_writecombine(vm_get_page_prot(vma->vm_flags));
@@ -1382,4 +1386,4 @@ exit:
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 0))
 MODULE_IMPORT_NS(DMA_BUF);
-#endif
+#endif