Commit c9155a3e authored by Thomas Zimmermann's avatar Thomas Zimmermann Committed by Ma Wupeng
Browse files

fbdev: Provide I/O-memory helpers as module 

stable inclusion
from stable-v6.6.33
commit c00e8fd749502c02085534c60b1edca4fc479c91
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IAD6H2

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=c00e8fd749502c02085534c60b1edca4fc479c91



--------------------------------

[ Upstream commit 6b180f66c0dd6266eeb2f74b59ee79a9f14fe430 ]

Provide helpers for accessing I/O memory in a helper module. The fbdev
core uses these helpers, so select the module unconditionally for fbdev.
Drivers will later be able to select the module individually and the
helpers will become optional.

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarJavier Martinez Canillas <javierm@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230927074722.6197-2-tzimmermann@suse.de


Stable-dep-of: 01c0cce88c54 ("drm/omapdrm: Fix console with deferred ops")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarWang Hai <wanghai38@huawei.com>
parent 9bdefeb4

drivers/video/fbdev/core/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#



config FB_CORE

	select FB_IOMEM_FOPS

	select VIDEO_CMDLINE

	tristate
@@ -144,12 +145,17 @@ config FB_DMAMEM_HELPERS 
	select FB_SYS_FOPS

	select FB_SYS_IMAGEBLIT



config FB_IOMEM_FOPS

	tristate

	depends on FB_CORE



config FB_IOMEM_HELPERS

	bool

	depends on FB_CORE

	select FB_CFB_COPYAREA

	select FB_CFB_FILLRECT

	select FB_CFB_IMAGEBLIT

	select FB_IOMEM_FOPS



config FB_SYSMEM_HELPERS

	bool

drivers/video/fbdev/core/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ obj-$(CONFIG_FB_NOTIFY) += fb_notify.o 
obj-$(CONFIG_FB_CORE)             += fb.o

fb-y                              := fb_info.o \

                                     fbmem.o fbcmap.o \

                                     modedb.o fbcvt.o fb_cmdline.o fb_io_fops.o

                                     modedb.o fbcvt.o fb_cmdline.o

ifdef CONFIG_FB

fb-y                              += fb_backlight.o fbmon.o

endif
@@ -26,6 +26,7 @@ endif 
obj-$(CONFIG_FB_CFB_FILLRECT)  += cfbfillrect.o

obj-$(CONFIG_FB_CFB_COPYAREA)  += cfbcopyarea.o

obj-$(CONFIG_FB_CFB_IMAGEBLIT) += cfbimgblt.o

obj-$(CONFIG_FB_IOMEM_FOPS)    += fb_io_fops.o

obj-$(CONFIG_FB_SYS_FILLRECT)  += sysfillrect.o

obj-$(CONFIG_FB_SYS_COPYAREA)  += syscopyarea.o

obj-$(CONFIG_FB_SYS_IMAGEBLIT) += sysimgblt.o

drivers/video/fbdev/core/fb_io_fops.c

+3 −0
Original line number Diff line number Diff line
@@ -131,3 +131,6 @@ ssize_t fb_io_write(struct fb_info *info, const char __user *buf, size_t count, 
	return (cnt) ? cnt : err;

}

EXPORT_SYMBOL(fb_io_write);



MODULE_DESCRIPTION("Fbdev helpers for framebuffers in I/O memory");

MODULE_LICENSE("GPL");