fbdev/pm2fb: Initialize fb_ops to fbdev I/O-memory helpers

Initialize the instance of struct fb_ops with fbdev initializer
macros for framebuffers in I/O address space. Set the read/write,
draw and mmap callbacks to the correct implementation and avoid
implicit defaults. Also select the necessary I/O helpers in Kconfig.

Fbdev drivers sometimes rely on the callbacks being NULL for a
default implementation to be invoked; hence requiring the I/O
helpers to be built in any case. Setting all callbacks in all
drivers explicitly will allow to make the I/O helpers optional.
This benefits systems that do not use these functions.

No functional changes.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Acked-by: Javier Martinez Canillas <javierm@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230927074722.6197-27-tzimmermann@suse.de

diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig
index d0a217c2e4d5e6327c917ddaf161ba7c37f65d03..12a86a04ce36040b38dfa44ba49e6349a743b6b2 100644 (file)
--- a/drivers/video/fbdev/Kconfig
+++ b/drivers/video/fbdev/Kconfig
@@ -94,6 +94,7 @@ config FB_PM2
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
+       select FB_IOMEM_FOPS
        select VIDEO_NOMODESET
        help
          This is the frame buffer device driver for cards based on

diff --git a/drivers/video/fbdev/pm2fb.c b/drivers/video/fbdev/pm2fb.c
index 5a79a12efd8e30b578722525982659c02c6d3fe6..f34429829b7d79d1abd371aff0dc9f01cec658ba 100644 (file)
--- a/drivers/video/fbdev/pm2fb.c
+++ b/drivers/video/fbdev/pm2fb.c
@@ -1492,6 +1492,7 @@ static int pm2fb_cursor(struct fb_info *info, struct fb_cursor *cursor)
 
 static const struct fb_ops pm2fb_ops = {
        .owner          = THIS_MODULE,
+       __FB_DEFAULT_IOMEM_OPS_RDWR,
        .fb_check_var   = pm2fb_check_var,
        .fb_set_par     = pm2fb_set_par,
        .fb_setcolreg   = pm2fb_setcolreg,
@@ -1502,6 +1503,7 @@ static const struct fb_ops pm2fb_ops = {
        .fb_imageblit   = pm2fb_imageblit,
        .fb_sync        = pm2fb_sync,
        .fb_cursor      = pm2fb_cursor,
+       __FB_DEFAULT_IOMEM_OPS_MMAP,
 };
 
 /*