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

media/vivid: Use fbdev I/O helpers 



Set struct fb_ops and with FB_DEFAULT_IOMEM_OPS, fbdev's initializer
for I/O memory. Sets the callbacks to the cfb_ and fb_io_ functions.
Select the correct modules with Kconfig's FB_IOMEM_HELPERS token.

The macro and token set the currently selected values, so there is
no functional change.

v3:
	* use _IOMEM_ in commit message
v2:
	* updated to use _IOMEM_ tokens

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Reviewed-by: default avatarSam Ravnborg <sam@ravnborg.org>
Acked-by: default avatarHelge Deller <deller@gmx.de>
Cc: Hans Verkuil <hverkuil@xs4all.nl>
Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20230803184034.6456-2-tzimmermann@suse.de
parent 0fbbe96b

drivers/media/test-drivers/vivid/Kconfig

+1 −3
Original line number Original line Diff line number Diff line
@@ -3,11 +3,9 @@ config VIDEO_VIVID 
	tristate "Virtual Video Test Driver"

	tristate "Virtual Video Test Driver"

	depends on VIDEO_DEV && !SPARC32 && !SPARC64 && FB

	depends on VIDEO_DEV && !SPARC32 && !SPARC64 && FB

	depends on HAS_DMA

	depends on HAS_DMA

	select FB_IOMEM_HELPERS

	select FONT_SUPPORT

	select FONT_SUPPORT

	select FONT_8x16

	select FONT_8x16

	select FB_CFB_FILLRECT

	select FB_CFB_COPYAREA

	select FB_CFB_IMAGEBLIT

	select VIDEOBUF2_VMALLOC

	select VIDEOBUF2_VMALLOC

	select VIDEOBUF2_DMA_CONTIG

	select VIDEOBUF2_DMA_CONTIG

	select VIDEO_V4L2_TPG

	select VIDEO_V4L2_TPG

drivers/media/test-drivers/vivid/vivid-osd.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -246,12 +246,10 @@ static int vivid_fb_blank(int blank_mode, struct fb_info *info) 




static const struct fb_ops vivid_fb_ops = {

static const struct fb_ops vivid_fb_ops = {

	.owner = THIS_MODULE,

	.owner = THIS_MODULE,

	FB_DEFAULT_IOMEM_OPS,

	.fb_check_var   = vivid_fb_check_var,

	.fb_check_var   = vivid_fb_check_var,

	.fb_set_par     = vivid_fb_set_par,

	.fb_set_par     = vivid_fb_set_par,

	.fb_setcolreg   = vivid_fb_setcolreg,

	.fb_setcolreg   = vivid_fb_setcolreg,

	.fb_fillrect    = cfb_fillrect,

	.fb_copyarea    = cfb_copyarea,

	.fb_imageblit   = cfb_imageblit,

	.fb_cursor      = NULL,

	.fb_cursor      = NULL,

	.fb_ioctl       = vivid_fb_ioctl,

	.fb_ioctl       = vivid_fb_ioctl,

	.fb_pan_display = vivid_fb_pan_display,

	.fb_pan_display = vivid_fb_pan_display,