Hi Am 01.07.23 um 23:44 schrieb Javier Martinez Canillas:
Currently the CONFIG_FB option has to be enabled even if no legacy fbdev drivers are needed (e.g: only to have support for framebuffer consoles). The DRM subsystem has a fbdev emulation layer, but depends on CONFIG_FB and so it can only be enabled if that dependency is enabled as well. That means fbdev drivers have to be explicitly disabled if users want to enable CONFIG_FB, only to use fbcon and/or the DRM fbdev emulation layer. This patch introduces a non-visible CONFIG_FB_CORE symbol that could be enabled just to have core support needed for CONFIG_DRM_FBDEV_EMULATION, allowing CONFIG_FB to be disabled (and automatically disabling all the fbdev drivers). Signed-off-by: Javier Martinez Canillas <javierm@xxxxxxxxxx> --- Changes in v2: - Keep "depends on FB" for FB_DDC, FB_HECUBA, FB_SVGALIB, FB_MACMODES, FB_BACKLIGHT, FB_MODE_HELPERS and FB_TILEBLITTING (Arnd Bergmann). - Don't change the fb.o object name (Arnd Bergmann). - Make FB_CORE a non-visible Kconfig symbol instead (Thomas Zimmermann). arch/x86/Makefile | 2 +- arch/x86/video/Makefile | 2 +- drivers/video/console/Kconfig | 2 +- drivers/video/fbdev/Kconfig | 40 +++++++++++++++++++------------ drivers/video/fbdev/core/Makefile | 2 +- 5 files changed, 29 insertions(+), 19 deletions(-) diff --git a/arch/x86/Makefile b/arch/x86/Makefile index b39975977c03..89a02e69be5f 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile @@ -259,7 +259,7 @@ drivers-$(CONFIG_PCI) += arch/x86/pci/ # suspend and hibernation support drivers-$(CONFIG_PM) += arch/x86/power/-drivers-$(CONFIG_FB) += arch/x86/video/+drivers-$(CONFIG_FB_CORE) += arch/x86/video/##### boot loader support. Several targets are kept for legacy purposes diff --git a/arch/x86/video/Makefile b/arch/x86/video/Makefile index 11640c116115..5ebe48752ffc 100644 --- a/arch/x86/video/Makefile +++ b/arch/x86/video/Makefile @@ -1,2 +1,2 @@ # SPDX-License-Identifier: GPL-2.0-only -obj-$(CONFIG_FB) += fbdev.o +obj-$(CONFIG_FB_CORE) += fbdev.o diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig index a2a88d42edf0..1b5a319971ed 100644 --- a/drivers/video/console/Kconfig +++ b/drivers/video/console/Kconfig @@ -72,7 +72,7 @@ config DUMMY_CONSOLE_ROWSconfig FRAMEBUFFER_CONSOLEbool "Framebuffer Console support" - depends on FB && !UML + depends on FB_CORE && !UML select VT_HW_CONSOLE_BINDING select CRC32 select FONT_SUPPORT diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig index cecf15418632..da6f7d588f17 100644 --- a/drivers/video/fbdev/Kconfig +++ b/drivers/video/fbdev/Kconfig @@ -6,8 +6,12 @@ config FB_NOTIFY bool+menuconfig FB_CORE+ tristate "Core support for frame buffer devices"
With the text, this is visible; as others noted.
+ menuconfig FB - tristate "Support for frame buffer devices" + tristate "Support for frame buffer device drivers"
Just keep the text as-is.
+ select FB_CORE select FB_NOTIFY select VIDEO_CMDLINE help @@ -33,6 +37,12 @@ menuconfig FB <http://www.munted.org.uk/programming/Framebuffer-HOWTO-1.3.html> for more information.+ This enables support for native frame buffer device (fbdev) drivers.+ + The DRM subsystem provides support for emulated frame buffer devices + on top of KMS drivers, but this option allows legacy fbdev drivers to + be enabled as well. + Say Y here and to the driver for your graphics board below if you are compiling a kernel for a non-x86 architecture.@@ -44,7 +54,7 @@ menuconfig FB config FIRMWARE_EDIDbool "Enable firmware EDID" - depends on FB + depends on FB_CORE help This enables access to the EDID transferred from the firmware. On the i386, this is from the Video BIOS. Enable this if DDC/I2C @@ -59,7 +69,7 @@ config FIRMWARE_EDIDconfig FB_DEVICEbool "Provide legacy /dev/fb* device" - depends on FB + select FB_CORE
This should depend on FB_CORE. Best regards Thomas
default y help Say Y here if you want the legacy /dev/fb* device file and @@ -75,7 +85,7 @@ config FB_DDCconfig FB_CFB_FILLRECTtristate - depends on FB + depends on FB_CORE help Include the cfb_fillrect function for generic software rectangle filling. This is used by drivers that don't provide their own @@ -83,7 +93,7 @@ config FB_CFB_FILLRECTconfig FB_CFB_COPYAREAtristate - depends on FB + depends on FB_CORE help Include the cfb_copyarea function for generic software area copying. This is used by drivers that don't provide their own (accelerated) @@ -91,7 +101,7 @@ config FB_CFB_COPYAREAconfig FB_CFB_IMAGEBLITtristate - depends on FB + depends on FB_CORE help Include the cfb_imageblit function for generic software image blitting. This is used by drivers that don't provide their own @@ -99,7 +109,7 @@ config FB_CFB_IMAGEBLITconfig FB_CFB_REV_PIXELS_IN_BYTEbool - depends on FB + depends on FB_CORE help Allow generic frame-buffer functions to work on displays with 1, 2 and 4 bits per pixel depths which has opposite order of pixels in @@ -107,7 +117,7 @@ config FB_CFB_REV_PIXELS_IN_BYTEconfig FB_SYS_FILLRECTtristate - depends on FB + depends on FB_CORE help Include the sys_fillrect function for generic software rectangle filling. This is used by drivers that don't provide their own @@ -115,7 +125,7 @@ config FB_SYS_FILLRECTconfig FB_SYS_COPYAREAtristate - depends on FB + depends on FB_CORE help Include the sys_copyarea function for generic software area copying. This is used by drivers that don't provide their own (accelerated) @@ -123,7 +133,7 @@ config FB_SYS_COPYAREAconfig FB_SYS_IMAGEBLITtristate - depends on FB + depends on FB_CORE help Include the sys_imageblit function for generic software image blitting. This is used by drivers that don't provide their own @@ -162,22 +172,22 @@ endchoiceconfig FB_SYS_FOPStristate - depends on FB + depends on FB_COREconfig FB_DEFERRED_IObool - depends on FB + depends on FB_COREconfig FB_IO_HELPERSbool - depends on FB + depends on FB_CORE select FB_CFB_COPYAREA select FB_CFB_FILLRECT select FB_CFB_IMAGEBLITconfig FB_SYS_HELPERSbool - depends on FB + depends on FB_CORE select FB_SYS_COPYAREA select FB_SYS_FILLRECT select FB_SYS_FOPS @@ -185,7 +195,7 @@ config FB_SYS_HELPERSconfig FB_SYS_HELPERS_DEFERREDbool - depends on FB + depends on FB_CORE select FB_DEFERRED_IO select FB_SYS_HELPERSdiff --git a/drivers/video/fbdev/core/Makefile b/drivers/video/fbdev/core/Makefileindex 9150bafd9e89..4c2e4a026d12 100644 --- a/drivers/video/fbdev/core/Makefile +++ b/drivers/video/fbdev/core/Makefile @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 obj-$(CONFIG_FB_NOTIFY) += fb_notify.o -obj-$(CONFIG_FB) += fb.o +obj-$(CONFIG_FB_CORE) += fb.o fb-y := fb_backlight.o \ fb_info.o \ fbmem.o fbmon.o fbcmap.o \
-- Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Frankenstrasse 146, 90461 Nuernberg, Germany GF: Ivo Totev, Andrew Myers, Andrew McDonald, Boudien Moerman HRB 36809 (AG Nuernberg)
Attachment:
OpenPGP_signature
Description: OpenPGP digital signature
