fbdev/tdfxfb: 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-41-tzimmermann@suse.de

diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig
index f5e87f6885c1ec66662ef320c83dfc78ccae1b5d..fed8298c79ca3e4174348438761463f8a51eecaa 100644 (file)
--- a/drivers/video/fbdev/Kconfig
+++ b/drivers/video/fbdev/Kconfig
@@ -1305,9 +1305,10 @@ config FB_KYRO
 config FB_3DFX
        tristate "3Dfx Banshee/Voodoo3/Voodoo5 display support"
        depends on FB && PCI
-       select FB_CFB_IMAGEBLIT
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
+       select FB_CFB_IMAGEBLIT
+       select FB_IOMEM_FOPS
        select FB_MODE_HELPERS
        select VIDEO_NOMODESET
        help

diff --git a/drivers/video/fbdev/tdfxfb.c b/drivers/video/fbdev/tdfxfb.c
index 68e2a82220f3fbfa2be15fbe6cc5bb2d3f05298a..22aa953138b0f339f0c4f077c02276d0f86dea29 100644 (file)
--- a/drivers/video/fbdev/tdfxfb.c
+++ b/drivers/video/fbdev/tdfxfb.c
@@ -1142,6 +1142,7 @@ static int tdfxfb_cursor(struct fb_info *info, struct fb_cursor *cursor)
 
 static const struct fb_ops tdfxfb_ops = {
        .owner          = THIS_MODULE,
+       __FB_DEFAULT_IOMEM_OPS_RDWR,
        .fb_check_var   = tdfxfb_check_var,
        .fb_set_par     = tdfxfb_set_par,
        .fb_setcolreg   = tdfxfb_setcolreg,
@@ -1154,10 +1155,9 @@ static const struct fb_ops tdfxfb_ops = {
        .fb_copyarea    = tdfxfb_copyarea,
        .fb_imageblit   = tdfxfb_imageblit,
 #else
-       .fb_fillrect    = cfb_fillrect,
-       .fb_copyarea    = cfb_copyarea,
-       .fb_imageblit   = cfb_imageblit,
+       __FB_DEFAULT_IOMEM_OPS_DRAW,
 #endif
+       __FB_DEFAULT_IOMEM_OPS_MMAP,
 };
 
 #ifdef CONFIG_FB_3DFX_I2C