tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

video/nomodeset: Select nomodeset= parameter with CONFIG_VIDEO

Enable support for nomodeset= parameter via CONFIG_VIDEO. Both,
DRM and fbdev, already select this option. Remove the existing
option CONFIG_VIDEO_NOMODESET. Simplifies the Kconfig rules.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20240118090721.7995-4-tzimmermann@suse.de

Thomas Zimmermann 71fc3249 55ea87a4

+1 -57
-1
drivers/gpu/drm/Kconfig
··· 20 20 # device and dmabuf fd. Let's make sure that is available for our userspace. 21 21 select KCMP 22 22 select VIDEO 23 - select VIDEO_NOMODESET 24 23 help 25 24 Kernel-level support for the Direct Rendering Infrastructure (DRI) 26 25 introduced in XFree86 4.0. If you say Y here, you need to select
-1
drivers/staging/sm750fb/Kconfig
··· 6 6 select FB_CFB_FILLRECT 7 7 select FB_CFB_COPYAREA 8 8 select FB_CFB_IMAGEBLIT 9 - select VIDEO_NOMODESET 10 9 help 11 10 Frame buffer driver for the Silicon Motion SM750 chip 12 11 with 2D acceleration and dual head support.
-4
drivers/video/Kconfig
··· 22 22 bool 23 23 default n 24 24 25 - config VIDEO_NOMODESET 26 - bool 27 - default n 28 - 29 25 source "drivers/auxdisplay/Kconfig" 30 26 31 27 if HAS_IOMEM
+1 -2
drivers/video/Makefile
··· 3 3 obj-$(CONFIG_APERTURE_HELPERS) += aperture.o 4 4 obj-$(CONFIG_STI_CORE) += sticore.o 5 5 obj-$(CONFIG_VGASTATE) += vgastate.o 6 - obj-$(CONFIG_VIDEO) += cmdline.o 7 - obj-$(CONFIG_VIDEO_NOMODESET) += nomodeset.o 6 + obj-$(CONFIG_VIDEO) += cmdline.o nomodeset.o 8 7 obj-$(CONFIG_HDMI) += hdmi.o 9 8 10 9 obj-$(CONFIG_VT) += console/
-37
drivers/video/fbdev/Kconfig
··· 75 75 select FB_CFB_COPYAREA 76 76 select FB_CFB_IMAGEBLIT 77 77 select FB_IOMEM_FOPS 78 - select VIDEO_NOMODESET 79 78 help 80 79 This enables support for Cirrus Logic GD542x/543x based boards on 81 80 Amiga: SD64, Piccolo, Picasso II/II+, Picasso IV, or EGS Spectrum. ··· 94 95 select FB_CFB_COPYAREA 95 96 select FB_CFB_IMAGEBLIT 96 97 select FB_IOMEM_FOPS 97 - select VIDEO_NOMODESET 98 98 help 99 99 This is the frame buffer device driver for cards based on 100 100 the 3D Labs Permedia, Permedia 2 and Permedia 2V chips. ··· 177 179 tristate "CyberPro 2000/2010/5000 support" 178 180 depends on FB && PCI && (BROKEN || !SPARC64) 179 181 select FB_IOMEM_HELPERS 180 - select VIDEO_NOMODESET 181 182 help 182 183 This enables support for the Integraphics CyberPro 20x0 and 5000 183 184 VGA chips used in the Rebel.com Netwinder and other machines. ··· 327 330 bool "Chips 65550 display support" 328 331 depends on (FB = y) && PPC32 && PCI 329 332 select FB_IOMEM_HELPERS 330 - select VIDEO_NOMODESET 331 333 help 332 334 This is the frame buffer device driver for the Chips & Technologies 333 335 65550 graphics chip in PowerBooks. ··· 335 339 bool "Asiliant (Chips) 69000 display support" 336 340 depends on (FB = y) && PCI 337 341 select FB_IOMEM_HELPERS 338 - select VIDEO_NOMODESET 339 342 help 340 343 This is the frame buffer device driver for the Asiliant 69030 chipset 341 344 ··· 344 349 select FB_CFB_IMAGEBLIT 345 350 select FB_IOMEM_FOPS 346 351 select FB_MACMODES if PPC_PMAC 347 - select VIDEO_NOMODESET 348 352 help 349 353 The IMS Twin Turbo is a PCI-based frame buffer card bundled with 350 354 many Macintosh and compatible computers. ··· 408 414 select FB_CFB_COPYAREA 409 415 select FB_CFB_IMAGEBLIT 410 416 select FB_IOMEM_FOPS 411 - select VIDEO_NOMODESET 412 417 help 413 418 This is the frame buffer device driver for generic TGA and SFB+ 414 419 graphic cards. These include DEC ZLXp-E1, -E2 and -E3 PCI cards, ··· 584 591 select FB_CFB_COPYAREA 585 592 select FB_CFB_IMAGEBLIT 586 593 select FB_IOMEM_FOPS 587 - select VIDEO_NOMODESET 588 594 help 589 595 This is the framebuffer device for the Sun XVR-500 and similar 590 596 graphics cards based upon the 3DLABS Wildcat chipset. The driver ··· 595 603 bool "Sun XVR-2500 3DLABS Wildcat support" 596 604 depends on (FB = y) && PCI && SPARC64 597 605 select FB_IOMEM_HELPERS 598 - select VIDEO_NOMODESET 599 606 help 600 607 This is the framebuffer device for the Sun XVR-2500 and similar 601 608 graphics cards based upon the 3DLABS Wildcat chipset. The driver ··· 620 629 select FB_CFB_COPYAREA 621 630 select FB_CFB_IMAGEBLIT 622 631 select FB_IOMEM_FOPS 623 - select VIDEO_NOMODESET 624 632 help 625 633 Say Y here if you have a PowerVR 2 card in your box. If you plan to 626 634 run linux on your Dreamcast, you will have to say Y here. ··· 682 692 select FB_IOMEM_FOPS 683 693 select BITREVERSE 684 694 select VGASTATE 685 - select VIDEO_NOMODESET 686 695 help 687 696 This driver supports graphics boards with the nVidia chips, TNT 688 697 and newer. For very old chipsets, such as the RIVA128, then use ··· 730 741 select FB_MODE_HELPERS 731 742 select BITREVERSE 732 743 select VGASTATE 733 - select VIDEO_NOMODESET 734 744 help 735 745 This driver supports graphics boards with the nVidia Riva/Geforce 736 746 chips. ··· 772 784 select FB_IOMEM_HELPERS 773 785 select FB_MODE_HELPERS 774 786 select VGASTATE 775 - select VIDEO_NOMODESET 776 787 select FB_DDC 777 788 help 778 789 This driver supports graphics cards based on Intel740 chip. ··· 782 795 select FB_IOMEM_FOPS 783 796 select FB_MODE_HELPERS 784 797 select VGASTATE 785 - select VIDEO_NOMODESET 786 798 help 787 799 This driver supports the on-board graphics built in to the Intel 810 788 800 and 815 chipsets. Say Y if you have and plan to use such a board. ··· 830 844 depends on FB && PCI && X86 831 845 select FB_IOMEM_HELPERS 832 846 select FB_MODE_HELPERS 833 - select VIDEO_NOMODESET 834 847 help 835 848 This driver supports the LE80578 (Vermilion Range) chipset 836 849 ··· 848 863 select FB_IOMEM_FOPS 849 864 select FB_MODE_HELPERS 850 865 select BOOT_VESA_SUPPORT if FB_INTEL = y 851 - select VIDEO_NOMODESET 852 866 depends on !DRM_I915 853 867 help 854 868 This driver supports the on-board graphics built in to the Intel ··· 886 902 select FB_IOMEM_FOPS 887 903 select FB_TILEBLITTING 888 904 select FB_MACMODES if PPC_PMAC 889 - select VIDEO_NOMODESET 890 905 help 891 906 Say Y here if you have a Matrox Millennium, Matrox Millennium II, 892 907 Matrox Mystique, Matrox Mystique 220, Matrox Productiva G100, Matrox ··· 1008 1025 select FB_IOMEM_FOPS 1009 1026 select FB_MACMODES if PPC 1010 1027 select FB_MODE_HELPERS 1011 - select VIDEO_NOMODESET 1012 1028 help 1013 1029 Choose this option if you want to use an ATI Radeon graphics card as 1014 1030 a framebuffer device. There are both PCI and AGP versions. You ··· 1045 1063 select FB_BACKLIGHT if FB_ATY128_BACKLIGHT 1046 1064 select FB_IOMEM_HELPERS 1047 1065 select FB_MACMODES if PPC_PMAC 1048 - select VIDEO_NOMODESET 1049 1066 help 1050 1067 This driver supports graphics boards with the ATI Rage128 chips. 1051 1068 Say Y if you have such a graphics board and read ··· 1070 1089 select FB_IOMEM_FOPS 1071 1090 select FB_MACMODES if PPC 1072 1091 select FB_ATY_CT if SPARC64 && PCI 1073 - select VIDEO_NOMODESET 1074 1092 help 1075 1093 This driver supports graphics boards with the ATI Mach64 chips. 1076 1094 Say Y if you have such a graphics board. ··· 1121 1141 select FB_TILEBLITTING 1122 1142 select FB_SVGALIB 1123 1143 select VGASTATE 1124 - select VIDEO_NOMODESET 1125 1144 select FONT_8x16 if FRAMEBUFFER_CONSOLE 1126 1145 help 1127 1146 Driver for graphics boards with S3 Trio / S3 Virge chip. ··· 1142 1163 select FB_IOMEM_FOPS 1143 1164 select FB_MODE_HELPERS 1144 1165 select VGASTATE 1145 - select VIDEO_NOMODESET 1146 1166 help 1147 1167 This driver supports notebooks and computers with S3 Savage PCI/AGP 1148 1168 chips. ··· 1181 1203 select FB_CFB_IMAGEBLIT 1182 1204 select FB_IOMEM_FOPS 1183 1205 select FB_SIS_300 if !FB_SIS_315 1184 - select VIDEO_NOMODESET 1185 1206 help 1186 1207 This is the frame buffer device driver for the SiS 300, 315, 330 1187 1208 and 340 series as well as XGI V3XT, V5, V8, Z7 graphics chipsets. ··· 1211 1234 select FB_CFB_IMAGEBLIT 1212 1235 select FB_IOMEM_FOPS 1213 1236 select I2C_ALGOBIT 1214 - select VIDEO_NOMODESET 1215 1237 help 1216 1238 This is the frame buffer device driver for Graphics chips of VIA 1217 1239 UniChrome (Pro) Family (CLE266,PM800/CN400,P4M800CE/P4M800Pro/ ··· 1251 1275 select FB_IOMEM_FOPS 1252 1276 select FB_MODE_HELPERS 1253 1277 select VGASTATE 1254 - select VIDEO_NOMODESET 1255 1278 help 1256 1279 This driver supports notebooks with NeoMagic PCI chips. 1257 1280 Say Y if you have such a graphics card. ··· 1262 1287 tristate "IMG Kyro support" 1263 1288 depends on FB && PCI 1264 1289 select FB_IOMEM_HELPERS 1265 - select VIDEO_NOMODESET 1266 1290 help 1267 1291 Say Y here if you have a STG4000 / Kyro / PowerVR 3 based 1268 1292 graphics board. ··· 1277 1303 select FB_CFB_IMAGEBLIT 1278 1304 select FB_IOMEM_FOPS 1279 1305 select FB_MODE_HELPERS 1280 - select VIDEO_NOMODESET 1281 1306 help 1282 1307 This driver supports graphics boards with the 3Dfx Banshee, 1283 1308 Voodoo3 or VSA-100 (aka Voodoo4/5) chips. Say Y if you have ··· 1305 1332 depends on FB && PCI 1306 1333 depends on FB_DEVICE 1307 1334 select FB_IOMEM_HELPERS 1308 - select VIDEO_NOMODESET 1309 1335 help 1310 1336 Say Y here if you have a 3Dfx Voodoo Graphics (Voodoo1/sst1) or 1311 1337 Voodoo2 (cvg) based graphics card. ··· 1327 1355 select FB_TILEBLITTING 1328 1356 select FB_SVGALIB 1329 1357 select VGASTATE 1330 - select VIDEO_NOMODESET 1331 1358 select FONT_8x16 if FRAMEBUFFER_CONSOLE 1332 1359 help 1333 1360 Driver for CastleRock integrated graphics core in the ··· 1341 1370 select FB_DDC 1342 1371 select FB_IOMEM_FOPS 1343 1372 select FB_MODE_HELPERS 1344 - select VIDEO_NOMODESET 1345 1373 help 1346 1374 This is the frame buffer device driver for Trident PCI/AGP chipsets. 1347 1375 Supported chipset families are TGUI 9440/96XX, 3DImage, Blade3D ··· 1365 1395 select FB_TILEBLITTING 1366 1396 select FB_SVGALIB 1367 1397 select VGASTATE 1368 - select VIDEO_NOMODESET 1369 1398 select FONT_8x16 if FRAMEBUFFER_CONSOLE 1370 1399 help 1371 1400 Driver for PCI graphics boards with ARK 2000PV chip ··· 1377 1408 select FB_CFB_COPYAREA 1378 1409 select FB_CFB_IMAGEBLIT 1379 1410 select FB_IOMEM_FOPS 1380 - select VIDEO_NOMODESET 1381 1411 help 1382 1412 This is the frame buffer device driver for the 3DLabs Permedia3 1383 1413 chipset, used in Formac ProFormance III, 3DLabs Oxygen VX1 & ··· 1387 1419 tristate "Fujitsu carmine frame buffer support" 1388 1420 depends on FB && PCI 1389 1421 select FB_IOMEM_HELPERS 1390 - select VIDEO_NOMODESET 1391 1422 help 1392 1423 This is the frame buffer device driver for the Fujitsu Carmine chip. 1393 1424 The driver provides two independent frame buffer devices. ··· 1668 1701 tristate "Framebuffer support for IBM GXT4000P/4500P/6000P/6500P adaptors" 1669 1702 depends on FB 1670 1703 select FB_IOMEM_HELPERS 1671 - select VIDEO_NOMODESET 1672 1704 help 1673 1705 Say Y here to enable support for the IBM GXT4000P/6000P and 1674 1706 GXT4500P/6500P display adaptor based on Raster Engine RC1000, ··· 1785 1819 depends on FB 1786 1820 depends on PCI || (OF && PPC) 1787 1821 select FB_IOMEM_HELPERS 1788 - select VIDEO_NOMODESET 1789 1822 help 1790 1823 Frame buffer driver for Fujitsu Carmine/Coral-P(A)/Lime controllers. 1791 1824 ··· 1850 1885 depends on FB && HYPERV 1851 1886 select DMA_CMA if HAVE_DMA_CONTIGUOUS && CMA 1852 1887 select FB_IOMEM_HELPERS_DEFERRED 1853 - select VIDEO_NOMODESET 1854 1888 help 1855 1889 This framebuffer driver supports Microsoft Hyper-V Synthetic Video. 1856 1890 ··· 1883 1919 tristate "Silicon Motion SM712 framebuffer support" 1884 1920 depends on FB && PCI 1885 1921 select FB_IOMEM_HELPERS 1886 - select VIDEO_NOMODESET 1887 1922 help 1888 1923 Frame buffer driver for the Silicon Motion SM710, SM712, SM721 1889 1924 and SM722 chips.
-2
drivers/video/fbdev/core/fbmem.c
··· 645 645 return 0; 646 646 } 647 647 648 - #if defined(CONFIG_VIDEO_NOMODESET) 649 648 bool fb_modesetting_disabled(const char *drvname) 650 649 { 651 650 bool fwonly = video_firmware_drivers_only(); ··· 656 657 return fwonly; 657 658 } 658 659 EXPORT_SYMBOL(fb_modesetting_disabled); 659 - #endif 660 660 661 661 MODULE_LICENSE("GPL");
-3
drivers/video/fbdev/geode/Kconfig
··· 14 14 tristate "AMD Geode LX framebuffer support" 15 15 depends on FB && FB_GEODE 16 16 select FB_IOMEM_HELPERS 17 - select VIDEO_NOMODESET 18 17 help 19 18 Framebuffer driver for the display controller integrated into the 20 19 AMD Geode LX processors. ··· 27 28 tristate "AMD Geode GX framebuffer support" 28 29 depends on FB && FB_GEODE 29 30 select FB_IOMEM_HELPERS 30 - select VIDEO_NOMODESET 31 31 help 32 32 Framebuffer driver for the display controller integrated into the 33 33 AMD Geode GX processors. ··· 40 42 tristate "AMD Geode GX1 framebuffer support" 41 43 depends on FB && FB_GEODE 42 44 select FB_IOMEM_HELPERS 43 - select VIDEO_NOMODESET 44 45 help 45 46 Framebuffer driver for the display controller integrated into the 46 47 AMD Geode GX1 processor.
-7
include/linux/fb.h
··· 840 840 const struct fb_videomode *default_mode, 841 841 unsigned int default_bpp); 842 842 843 - #if defined(CONFIG_VIDEO_NOMODESET) 844 843 bool fb_modesetting_disabled(const char *drvname); 845 - #else 846 - static inline bool fb_modesetting_disabled(const char *drvname) 847 - { 848 - return false; 849 - } 850 - #endif 851 844 852 845 /* 853 846 * Convenience logging macros