Skip to content

Commit c77f985

Browse files
smirasmira
committed
fix: disable legacy framebuffer drivers
Disable deprecated `FB_*` drivers, replace with `SIMPLEDRM` which should handle UEFI and legacy VGA/VESA consoles. Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com>
1 parent 8f3ef77 commit c77f985

2 files changed

Lines changed: 10 additions & 115 deletions

File tree

‎kernel/build/config-amd64‎

Lines changed: 5 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -2162,7 +2162,7 @@ CONFIG_ISCSI_IBFT_FIND=y
21622162
CONFIG_ISCSI_IBFT=y
21632163
# CONFIG_FW_CFG_SYSFS is not set
21642164
CONFIG_SYSFB=y
2165-
# CONFIG_SYSFB_SIMPLEFB is not set
2165+
CONFIG_SYSFB_SIMPLEFB=y
21662166
# CONFIG_GOOGLE_FIRMWARE is not set
21672167

21682168
#
@@ -4938,7 +4938,6 @@ CONFIG_AGP_INTEL=y
49384938
# CONFIG_AGP_SIS is not set
49394939
# CONFIG_AGP_VIA is not set
49404940
CONFIG_INTEL_GTT=y
4941-
# CONFIG_VGA_SWITCHEROO is not set
49424941
CONFIG_DRM=y
49434942

49444943
#
@@ -4992,9 +4991,8 @@ CONFIG_DRM_SCHED=m
49924991
#
49934992
# Drivers for system framebuffers
49944993
#
4995-
# CONFIG_DRM_EFIDRM is not set
4996-
# CONFIG_DRM_SIMPLEDRM is not set
4997-
# CONFIG_DRM_VESADRM is not set
4994+
CONFIG_DRM_SYSFB_HELPER=y
4995+
CONFIG_DRM_SIMPLEDRM=y
49984996
# end of Drivers for system framebuffers
49994997

50004998
#
@@ -5147,71 +5145,21 @@ CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
51475145
#
51485146
# Frame buffer Devices
51495147
#
5150-
CONFIG_FB=y
5151-
# CONFIG_FB_CIRRUS is not set
5152-
# CONFIG_FB_PM2 is not set
5153-
# CONFIG_FB_CYBER2000 is not set
5154-
# CONFIG_FB_ARC is not set
5155-
# CONFIG_FB_ASILIANT is not set
5156-
# CONFIG_FB_IMSTT is not set
5157-
CONFIG_FB_VGA16=y
5158-
# CONFIG_FB_UVESA is not set
5159-
CONFIG_FB_VESA=y
5160-
CONFIG_FB_EFI=y
5161-
# CONFIG_FB_N411 is not set
5162-
# CONFIG_FB_HGA is not set
5163-
# CONFIG_FB_OPENCORES is not set
5164-
# CONFIG_FB_S1D13XXX is not set
5165-
# CONFIG_FB_NVIDIA is not set
5166-
# CONFIG_FB_RIVA is not set
5167-
# CONFIG_FB_I740 is not set
5168-
# CONFIG_FB_MATROX is not set
5169-
# CONFIG_FB_RADEON is not set
5170-
# CONFIG_FB_ATY128 is not set
5171-
# CONFIG_FB_ATY is not set
5172-
# CONFIG_FB_S3 is not set
5173-
# CONFIG_FB_SAVAGE is not set
5174-
# CONFIG_FB_SIS is not set
5175-
# CONFIG_FB_VIA is not set
5176-
# CONFIG_FB_NEOMAGIC is not set
5177-
# CONFIG_FB_KYRO is not set
5178-
# CONFIG_FB_3DFX is not set
5179-
# CONFIG_FB_VOODOO1 is not set
5180-
# CONFIG_FB_VT8623 is not set
5181-
# CONFIG_FB_TRIDENT is not set
5182-
# CONFIG_FB_ARK is not set
5183-
# CONFIG_FB_PM3 is not set
5184-
# CONFIG_FB_CARMINE is not set
5185-
# CONFIG_FB_SMSCUFX is not set
5186-
# CONFIG_FB_UDL is not set
5187-
# CONFIG_FB_IBM_GXT4500 is not set
5188-
# CONFIG_FB_VIRTUAL is not set
5189-
CONFIG_XEN_FBDEV_FRONTEND=y
5190-
# CONFIG_FB_METRONOME is not set
5191-
# CONFIG_FB_MB862XX is not set
5192-
CONFIG_FB_HYPERV=y
5193-
# CONFIG_FB_SIMPLE is not set
5194-
# CONFIG_FB_SSD1307 is not set
5195-
# CONFIG_FB_SM712 is not set
5148+
# CONFIG_FB is not set
51965149
CONFIG_FB_CORE=y
5197-
CONFIG_FB_NOTIFY=y
5198-
CONFIG_FB_DEVICE=y
5150+
# CONFIG_FB_DEVICE is not set
51995151
CONFIG_FB_CFB_FILLRECT=y
52005152
CONFIG_FB_CFB_COPYAREA=y
52015153
CONFIG_FB_CFB_IMAGEBLIT=y
52025154
CONFIG_FB_SYS_FILLRECT=y
52035155
CONFIG_FB_SYS_COPYAREA=y
52045156
CONFIG_FB_SYS_IMAGEBLIT=y
5205-
# CONFIG_FB_FOREIGN_ENDIAN is not set
52065157
CONFIG_FB_SYSMEM_FOPS=y
52075158
CONFIG_FB_DEFERRED_IO=y
52085159
CONFIG_FB_IOMEM_FOPS=y
52095160
CONFIG_FB_IOMEM_HELPERS=y
5210-
CONFIG_FB_IOMEM_HELPERS_DEFERRED=y
52115161
CONFIG_FB_SYSMEM_HELPERS=y
52125162
CONFIG_FB_SYSMEM_HELPERS_DEFERRED=y
5213-
CONFIG_FB_MODE_HELPERS=y
5214-
CONFIG_FB_TILEBLITTING=y
52155163
# end of Frame buffer Devices
52165164

52175165
#
@@ -5239,7 +5187,6 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y
52395187
# CONFIG_BACKLIGHT_ARCXCNN is not set
52405188
# end of Backlight & LCD device support
52415189

5242-
CONFIG_VGASTATE=y
52435190
CONFIG_HDMI=y
52445191
# CONFIG_FIRMWARE_EDID is not set
52455192

@@ -5254,7 +5201,6 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
52545201
# CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set
52555202
CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
52565203
# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
5257-
# CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
52585204
# end of Console display driver support
52595205

52605206
CONFIG_LOGO=y

‎kernel/build/config-arm64‎

Lines changed: 5 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -2254,7 +2254,7 @@ CONFIG_RASPBERRYPI_FIRMWARE=y
22542254
CONFIG_FW_CFG_SYSFS=y
22552255
# CONFIG_FW_CFG_SYSFS_CMDLINE is not set
22562256
CONFIG_SYSFB=y
2257-
# CONFIG_SYSFB_SIMPLEFB is not set
2257+
CONFIG_SYSFB_SIMPLEFB=y
22582258
CONFIG_TI_SCI_PROTOCOL=y
22592259
CONFIG_TURRIS_MOX_RWTM=y
22602260
CONFIG_TURRIS_MOX_RWTM_KEYCTL=y
@@ -5584,8 +5584,8 @@ CONFIG_DRM_SCHED=m
55845584
#
55855585
# Drivers for system framebuffers
55865586
#
5587-
# CONFIG_DRM_EFIDRM is not set
5588-
# CONFIG_DRM_SIMPLEDRM is not set
5587+
CONFIG_DRM_SYSFB_HELPER=y
5588+
CONFIG_DRM_SIMPLEDRM=y
55895589
# end of Drivers for system framebuffers
55905590

55915591
#
@@ -5899,68 +5899,18 @@ CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
58995899
#
59005900
# Frame buffer Devices
59015901
#
5902-
CONFIG_FB=y
5903-
# CONFIG_FB_CIRRUS is not set
5904-
# CONFIG_FB_PM2 is not set
5905-
# CONFIG_FB_CYBER2000 is not set
5906-
# CONFIG_FB_ASILIANT is not set
5907-
# CONFIG_FB_IMSTT is not set
5908-
# CONFIG_FB_UVESA is not set
5909-
CONFIG_FB_EFI=y
5910-
# CONFIG_FB_OPENCORES is not set
5911-
# CONFIG_FB_S1D13XXX is not set
5912-
# CONFIG_FB_NVIDIA is not set
5913-
# CONFIG_FB_RIVA is not set
5914-
# CONFIG_FB_I740 is not set
5915-
# CONFIG_FB_MATROX is not set
5916-
# CONFIG_FB_RADEON is not set
5917-
# CONFIG_FB_ATY128 is not set
5918-
# CONFIG_FB_ATY is not set
5919-
# CONFIG_FB_S3 is not set
5920-
# CONFIG_FB_SAVAGE is not set
5921-
# CONFIG_FB_SIS is not set
5922-
# CONFIG_FB_NEOMAGIC is not set
5923-
# CONFIG_FB_KYRO is not set
5924-
# CONFIG_FB_3DFX is not set
5925-
# CONFIG_FB_VOODOO1 is not set
5926-
# CONFIG_FB_VT8623 is not set
5927-
# CONFIG_FB_TRIDENT is not set
5928-
# CONFIG_FB_ARK is not set
5929-
# CONFIG_FB_PM3 is not set
5930-
# CONFIG_FB_CARMINE is not set
5931-
# CONFIG_FB_SMSCUFX is not set
5932-
# CONFIG_FB_UDL is not set
5933-
# CONFIG_FB_IBM_GXT4500 is not set
5934-
# CONFIG_FB_XILINX is not set
5935-
# CONFIG_FB_VIRTUAL is not set
5936-
CONFIG_XEN_FBDEV_FRONTEND=y
5937-
# CONFIG_FB_METRONOME is not set
5938-
# CONFIG_FB_MB862XX is not set
5939-
CONFIG_FB_HYPERV=y
5940-
CONFIG_FB_SIMPLE=y
5941-
# CONFIG_FB_SSD1307 is not set
5942-
# CONFIG_FB_SM712 is not set
5902+
# CONFIG_FB is not set
59435903
CONFIG_FB_CORE=y
5944-
CONFIG_FB_NOTIFY=y
5945-
CONFIG_FB_DEVICE=y
5946-
CONFIG_FB_CFB_FILLRECT=y
5947-
CONFIG_FB_CFB_COPYAREA=y
5948-
CONFIG_FB_CFB_IMAGEBLIT=y
5904+
# CONFIG_FB_DEVICE is not set
59495905
CONFIG_FB_SYS_FILLRECT=y
59505906
CONFIG_FB_SYS_COPYAREA=y
59515907
CONFIG_FB_SYS_IMAGEBLIT=y
5952-
# CONFIG_FB_FOREIGN_ENDIAN is not set
59535908
CONFIG_FB_SYSMEM_FOPS=y
59545909
CONFIG_FB_DEFERRED_IO=y
59555910
CONFIG_FB_DMAMEM_HELPERS=y
59565911
CONFIG_FB_DMAMEM_HELPERS_DEFERRED=y
5957-
CONFIG_FB_IOMEM_FOPS=y
5958-
CONFIG_FB_IOMEM_HELPERS=y
5959-
CONFIG_FB_IOMEM_HELPERS_DEFERRED=y
59605912
CONFIG_FB_SYSMEM_HELPERS=y
59615913
CONFIG_FB_SYSMEM_HELPERS_DEFERRED=y
5962-
CONFIG_FB_MODE_HELPERS=y
5963-
CONFIG_FB_TILEBLITTING=y
59645914
# end of Frame buffer Devices
59655915

59665916
#
@@ -6000,7 +5950,6 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
60005950
# CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set
60015951
CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
60025952
# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
6003-
# CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
60045953
# end of Console display driver support
60055954

60065955
CONFIG_LOGO=y

0 commit comments

Comments
 (0)