Commit e0f05e64 authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

fbdev/cyber2000fb: Initialize fb_ops with fbdev macros 



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 helpers in Kconfig.

Fbdev drivers sometimes rely on the callbacks being NULL for a
default I/O-memory-based 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.

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Cc: Russell King <linux@armlinux.org.uk>
Cc: linux-arm-kernel@lists.infradead.org
Reviewed-by: default avatarJavier Martinez Canillas <javierm@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20231127131655.4020-25-tzimmermann@suse.de
parent 11754a50

drivers/video/fbdev/Kconfig

+1 −4
Original line number Diff line number Diff line
@@ -178,10 +178,7 @@ config FB_IMX 
config FB_CYBER2000

	tristate "CyberPro 2000/2010/5000 support"

	depends on FB && PCI && (BROKEN || !SPARC64)

	select FB_CFB_FILLRECT

	select FB_CFB_COPYAREA

	select FB_CFB_IMAGEBLIT

	select FB_IOMEM_FOPS

	select FB_IOMEM_HELPERS

	select VIDEO_NOMODESET

	help

	  This enables support for the Integraphics CyberPro 20x0 and 5000

drivers/video/fbdev/cyber2000fb.c

+1 −8
Original line number Diff line number Diff line
@@ -227,13 +227,6 @@ cyber2000fb_copyarea(struct fb_info *info, const struct fb_copyarea *region) 
			   CO_REG_CMD_H, cfb);

}



static void

cyber2000fb_imageblit(struct fb_info *info, const struct fb_image *image)

{

	cfb_imageblit(info, image);

	return;

}



static int cyber2000fb_sync(struct fb_info *info)

{

	struct cfb_info *cfb = container_of(info, struct cfb_info, fb);
@@ -1069,7 +1062,7 @@ static const struct fb_ops cyber2000fb_ops = { 
	.fb_pan_display	= cyber2000fb_pan_display,

	.fb_fillrect	= cyber2000fb_fillrect,

	.fb_copyarea	= cyber2000fb_copyarea,

	.fb_imageblit	= cyber2000fb_imageblit,

	.fb_imageblit	= cfb_imageblit,

	.fb_sync	= cyber2000fb_sync,

	__FB_DEFAULT_IOMEM_OPS_MMAP,

};