NothingOSS/android_kernel_msm-6.1_nothing_sm7635
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ANDROID: fix atomisp driver missing in 6.4 kernel

Browse source 
atomisp driver which is missing in 6.4 kernel fails when building
allmodconfig configuration because if modifies vma->vm_flags directly.
Fix by replacing direct modifications with modifier functions.

Bug: 161210518
Change-Id: I91c233a276ce4bfba3decfaaa58cfe12b423d24d
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
This commit is contained in:
Suren Baghdasaryan 2023-05-23 15:25:24 -07:00 • committed by Carlos Llamas
parent a264d8efcb
commit ed10529c6d
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
drivers/staging/media/atomisp/pci/atomisp_fops.c
View file

@ -951,7 +951,7 @@ int atomisp_videobuf_mmap_mapper(struct videobuf_queue *q,
buf->boff == offset) {
vm_mem = buf->priv;
ret = frame_mmap(isp, vm_mem->vaddr, vma);
vma->vm_flags |= VM_IO | VM_DONTEXPAND | VM_DONTDUMP;
vm_flags_set(vma, VM_IO | VM_DONTEXPAND | VM_DONTDUMP);
break;
}
}
@ -1027,7 +1027,7 @@ static int atomisp_mmap(struct file *file, struct vm_area_struct *vma)
* Without VM_SHARED, remap_pfn_range() treats
* this kind of mapping as invalid.
*/
vma->vm_flags |= VM_SHARED;
vm_flags_set(vma, VM_SHARED);
ret = hmm_mmap(vma, vma->vm_pgoff << PAGE_SHIFT);
mutex_unlock(&isp->mutex);
return ret;
@ -1071,7 +1071,7 @@ static int atomisp_mmap(struct file *file, struct vm_area_struct *vma)
goto error;
}
raw_virt_addr->data_bytes = origin_size;
vma->vm_flags |= VM_IO | VM_DONTEXPAND | VM_DONTDUMP;
vm_flags_set(vma, VM_IO | VM_DONTEXPAND | VM_DONTDUMP);
mutex_unlock(&isp->mutex);
return 0;
}