summaryrefslogtreecommitdiffstats
path: root/drivers/video/fbdev/core/fb_chrdev.c
diff options
context:
space:
mode:
authorThomas Zimmermann <tzimmermann@suse.de>2023-09-22 10:04:56 +0200
committerThomas Zimmermann <tzimmermann@suse.de>2023-10-12 09:20:46 +0200
commit052ddf7b86d2d9443bce77ef5b5b1ef61a3b79fc (patch)
treecba604afadc8aca42d2f5ce253c7dff4168e0da0 /drivers/video/fbdev/core/fb_chrdev.c
parentc205a67d28766ffaae3d02cdffc9c86d52ed6c2e (diff)
downloadlinux-stable-052ddf7b86d2d9443bce77ef5b5b1ef61a3b79fc.tar.gz
linux-stable-052ddf7b86d2d9443bce77ef5b5b1ef61a3b79fc.tar.bz2
linux-stable-052ddf7b86d2d9443bce77ef5b5b1ef61a3b79fc.zip
fbdev: Replace fb_pgprotect() with pgprot_framebuffer()
Rename the fbdev mmap helper fb_pgprotect() to pgprot_framebuffer(). The helper sets VMA page-access flags for framebuffers in device I/O memory. Also clean up the helper's parameters and return value. Instead of the VMA instance, pass the individial parameters separately: existing page-access flags, the VMAs start and end addresses and the offset in the underlying device memory rsp file. Return the new page-access flags. These changes align pgprot_framebuffer() with other pgprot_() functions. v4: * fix commit message (Christophe) v3: * rename fb_pgprotect() to pgprot_framebuffer() (Arnd) Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> Reviewed-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> # m68k Reviewed-by: Javier Martinez Canillas <javierm@redhat.com> Link: https://patchwork.freedesktop.org/patch/msgid/20230922080636.26762-3-tzimmermann@suse.de
Diffstat (limited to 'drivers/video/fbdev/core/fb_chrdev.c')
-rw-r--r--drivers/video/fbdev/core/fb_chrdev.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/fbdev/core/fb_chrdev.c b/drivers/video/fbdev/core/fb_chrdev.c
index eadb81f53a82..32a7315b4b6d 100644
--- a/drivers/video/fbdev/core/fb_chrdev.c
+++ b/drivers/video/fbdev/core/fb_chrdev.c
@@ -365,7 +365,8 @@ static int fb_mmap(struct file *file, struct vm_area_struct *vma)
mutex_unlock(&info->mm_lock);
vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
- fb_pgprotect(file, vma, start);
+ vma->vm_page_prot = pgprot_framebuffer(vma->vm_page_prot, vma->vm_start,
+ vma->vm_end, start);
return vm_iomap_memory(vma, start, len);
}