Browse Source

disp: msm: replace vma->vm_flags direct modifications with modifier
calls

Replace direct modifications to vma->vm_flags with calls to modifier
functions to be able to track flag changes and to keep vma locking
correctness.

Change-Id: I4ad265028dc138912210eb907a7b0656c72b1464
Signed-off-by: jianzhou <[email protected]>

jianzhou 2 years ago
parent
commit
6923767e4a
1 changed files with 5 additions and 1 deletions
  1. 5 1
      msm/msm_gem.c

+ 5 - 1
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);
 	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_PFNMAP;
 	vma->vm_flags |= VM_MIXEDMAP;
 	vma->vm_flags |= VM_MIXEDMAP;
+#else
+	vm_flags_mod(vma, VM_MIXEDMAP, VM_PFNMAP);
+#endif
 
 
 	if (msm_obj->flags & MSM_BO_WC) {
 	if (msm_obj->flags & MSM_BO_WC) {
 		vma->vm_page_prot = pgprot_writecombine(vm_get_page_prot(vma->vm_flags));
 		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))
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 0))
 MODULE_IMPORT_NS(DMA_BUF);
 MODULE_IMPORT_NS(DMA_BUF);
-#endif
+#endif