video/fbdev: Support 'nomodeset' in PCI drivers
Subsystems (20)
Thomas Zimmermann
maintainerv2 cover video/fbdev: Support 'nomodeset' in PCI drivers
Add support for the kernel's 'nomodeset' parameter to PCI-based fbdev drivers. The option prevents DRM drivers from loading if they could possibly displace a hardware-agnostic driver that runs on the firmware framebuffer. It is a fallback for systems on which the hardware's native driver does not work correctly.
After the work on the aperture helpers and their integration with fbdev, it can happen that an fbdev driver replaces a hardware- agnostic DRM driver. Supporting the nomodeset parameter unifies the behavior among the graphics drivers and subsystems. An fbdev driver will not replace any hardware-agnostic driver with nomodeset given.
v2:
* print warning for disabled drivers (Helge)
* improve nomodeset docs (Javier)
* use fbdev-internal helper
Thomas Zimmermann (2):
drm: Move nomodeset kernel parameter to drivers/video
fbdev: Add support for the nomodeset kernel parameter
.../admin-guide/kernel-parameters.txt | 15 +++++---
MAINTAINERS | 2 +
drivers/gpu/drm/Kconfig | 7 +---
drivers/gpu/drm/Makefile | 1 -
drivers/staging/sm750fb/Kconfig | 1 +
drivers/staging/sm750fb/sm750.c | 3 ++
drivers/video/Kconfig | 4 ++
drivers/video/Makefile | 1 +
drivers/video/fbdev/Kconfig | 37 +++++++++++++++++++
drivers/video/fbdev/arkfb.c | 5 +++
drivers/video/fbdev/asiliantfb.c | 3 ++
drivers/video/fbdev/aty/aty128fb.c | 5 +++
drivers/video/fbdev/aty/atyfb_base.c | 5 +++
drivers/video/fbdev/aty/radeon_base.c | 5 +++
drivers/video/fbdev/carminefb.c | 3 ++
drivers/video/fbdev/chipsfb.c | 3 ++
drivers/video/fbdev/cirrusfb.c | 5 +++
drivers/video/fbdev/core/fbmem.c | 15 ++++++++
drivers/video/fbdev/cyber2000fb.c | 6 ++-
drivers/video/fbdev/geode/Kconfig | 3 ++
drivers/video/fbdev/geode/gx1fb_core.c | 5 +++
drivers/video/fbdev/geode/gxfb_core.c | 5 +++
drivers/video/fbdev/geode/lxfb_core.c | 5 +++
drivers/video/fbdev/gxt4500.c | 3 ++
drivers/video/fbdev/hyperv_fb.c | 4 +-
drivers/video/fbdev/i740fb.c | 5 +++
drivers/video/fbdev/i810/i810_main.c | 6 +++
drivers/video/fbdev/imsttfb.c | 5 +++
drivers/video/fbdev/intelfb/intelfbdrv.c | 3 ++
drivers/video/fbdev/kyro/fbdev.c | 5 +++
drivers/video/fbdev/matrox/matroxfb_base.c | 3 ++
drivers/video/fbdev/mb862xx/mb862xxfbdrv.c | 3 ++
drivers/video/fbdev/neofb.c | 5 +++
drivers/video/fbdev/nvidia/nvidia.c | 5 +++
drivers/video/fbdev/pm2fb.c | 5 +++
drivers/video/fbdev/pm3fb.c | 5 +++
drivers/video/fbdev/pvr2fb.c | 5 +++
drivers/video/fbdev/riva/fbdev.c | 5 +++
drivers/video/fbdev/s3fb.c | 5 +++
drivers/video/fbdev/savage/savagefb_driver.c | 3 ++
drivers/video/fbdev/sis/sis_main.c | 5 +++
drivers/video/fbdev/skeletonfb.c | 5 +++
drivers/video/fbdev/sm712fb.c | 3 ++
drivers/video/fbdev/sstfb.c | 3 ++
drivers/video/fbdev/sunxvr2500.c | 3 ++
drivers/video/fbdev/sunxvr500.c | 3 ++
drivers/video/fbdev/tdfxfb.c | 5 +++
drivers/video/fbdev/tgafb.c | 5 +++
drivers/video/fbdev/tridentfb.c | 5 +++
drivers/video/fbdev/vermilion/vermilion.c | 5 +++
drivers/video/fbdev/via/via-core.c | 3 ++
drivers/video/fbdev/vt8623fb.c | 5 +++
.../drm/drm_nomodeset.c => video/nomodeset.c} | 12 +++---
include/drm/drm_drv.h | 8 +++-
include/linux/fb.h | 9 +++++
include/video/nomodeset.h | 8 ++++
56 files changed, 285 insertions(+), 21 deletions(-)
rename drivers/{gpu/drm/drm_nomodeset.c => video/nomodeset.c} (63%)
create mode 100644 include/video/nomodeset.hbase-commit: 3aa97a74d622aa26fe79cf4bd819b6a4fd176e90
prerequisite-patch-id: c2b2f08f0eccc9f5df0c0da49fa1d36267deb11d
prerequisite-patch-id: c67e5d886a47b7d0266d81100837557fda34cb24
prerequisite-patch-id: 3f204510fcbf9530d6540bd8e6128cce598988b6
prerequisite-patch-id: a0b503ec2c15fdf17e3c93ff0357fd3c27a791f6
prerequisite-patch-id: 2a2d490c863c0e2cb1b25052049b2f1c63f7c443
prerequisite-patch-id: bfad12b053cc616edbc07b5ea3e8f5793b647a5a
prerequisite-patch-id: a1abb89fd8c741f377444432278ea13f142b497d
prerequisite-patch-id: 63b3e0f79bfe4e3e19f389e21c8e0ee010801075
Signature · 1 line
2.38.0
Thomas Zimmermann
maintainerPATCH v2 1/2 drm: Move nomodeset kernel parameter to drivers/video
Move the nomodeset kernel parameter to drivers/video to make it available to non-DRM drivers. Adapt the interface, but keep the DRM interface drm_firmware_drivers_only() to avoid churn within DRM. The function should later be inlined into callers.
The parameter disables any DRM graphics driver that would replace a driver for firmware-provided scanout buffers. It is an option to easily fallback to basic graphics output if the hardware's native driver is broken. Moving it to a more prominent location wil make it available to fbdev as well.
v2:
* clarify the meaning of the nomodeset parameter (Javier)
---
Documentation/admin-guide/kernel-parameters.txt | 15 +++++++++------
MAINTAINERS | 2 ++
drivers/gpu/drm/Kconfig | 7 +------
drivers/gpu/drm/Makefile | 1 -
drivers/video/Kconfig | 4 ++++
drivers/video/Makefile | 1 +
.../drm/drm_nomodeset.c => video/nomodeset.c} | 12 +++++++-----
include/drm/drm_drv.h | 8 +++++++-
include/video/nomodeset.h | 8 ++++++++
9 files changed, 39 insertions(+), 19 deletions(-)
rename drivers/{gpu/drm/drm_nomodeset.c => video/nomodeset.c} (63%)
create mode 100644 include/video/nomodeset.hDocumentation/admin-guide/kernel-parameters.txt +9 -6
@@ -3777,12 +3777,15 @@ shutdown the other cpus. Instead use the REBOOT_VECTOR irq. - nomodeset Disable kernel modesetting. DRM drivers will not perform - display-mode changes or accelerated rendering. Only the - system framebuffer will be available for use if this was - set-up by the firmware or boot loader. - - Useful as fallback, or for testing and debugging. + nomodeset Disable kernel modesetting. Most systems' firmware + sets up a display mode and provides framebuffer memory + for output. With nomodeset, DRM and fbdev drivers will + not load if they could possibly displace the pre- + initialized output. Only the system framebuffer will + be available for use. The respective drivers will not + perform display-mode changes or accelerated rendering. + + Useful as error fallback, or for testing and debugging. nomodule Disable module load
MAINTAINERS +2 -0
@@ -6698,8 +6698,10 @@ F: drivers/gpu/drm/drm_aperture.c F: drivers/gpu/drm/tiny/ofdrm.c F: drivers/gpu/drm/tiny/simpledrm.c F: drivers/video/aperture.c +F: drivers/video/nomodeset.c F: include/drm/drm_aperture.h F: include/linux/aperture.h +F: include/video/nomodeset.h DRM DRIVER FOR SIS VIDEO CARDS S: Orphan / Obsolete
drivers/gpu/drm/Kconfig +1 -6
@@ -8,7 +8,6 @@ menuconfig DRM tristate "Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)" depends on (AGP || AGP=n) && !EMULATED_CMPXCHG && HAS_DMA - select DRM_NOMODESET select DRM_PANEL_ORIENTATION_QUIRKS select HDMI select FB_CMDLINE
@@ -19,6 +18,7 @@ menuconfig DRM # gallium uses SYS_kcmp for os_same_file_description() to de-duplicate # device and dmabuf fd. Let's make sure that is available for our userspace. select KCMP + select VIDEO_NOMODESET help Kernel-level support for the Direct Rendering Infrastructure (DRI) introduced in XFree86 4.0. If you say Y here, you need to select
@@ -515,11 +515,6 @@ config DRM_EXPORT_FOR_TESTS config DRM_PANEL_ORIENTATION_QUIRKS tristate -# Separate option because nomodeset parameter is global and expected built-in -config DRM_NOMODESET - bool - default n - config DRM_LIB_RANDOM bool default n
drivers/gpu/drm/Makefile +0 -1
@@ -72,7 +72,6 @@ drm-$(CONFIG_DRM_PRIVACY_SCREEN) += \ drm_privacy_screen_x86.o obj-$(CONFIG_DRM) += drm.o -obj-$(CONFIG_DRM_NOMODESET) += drm_nomodeset.o obj-$(CONFIG_DRM_PANEL_ORIENTATION_QUIRKS) += drm_panel_orientation_quirks.o #
drivers/video/Kconfig +4 -0
@@ -11,6 +11,10 @@ config APERTURE_HELPERS Support tracking and hand-over of aperture ownership. Required by graphics drivers for firmware-provided framebuffers. +config VIDEO_NOMODESET + bool + default n + if HAS_IOMEM config HAVE_FB_ATMEL
drivers/video/Makefile +1 -0
@@ -2,6 +2,7 @@ obj-$(CONFIG_APERTURE_HELPERS) += aperture.o obj-$(CONFIG_VGASTATE) += vgastate.o +obj-$(CONFIG_VIDEO_NOMODESET) += nomodeset.o obj-$(CONFIG_HDMI) += hdmi.o obj-$(CONFIG_VT) += console/
drivers/video/nomodeset.c renamed from drivers/gpu/drm/drm_nomodeset.c +7 -5
@@ -3,17 +3,19 @@#include <linux/module.h> #include <linux/types.h> -static bool drm_nomodeset; +#include <video/nomodeset.h> -bool drm_firmware_drivers_only (void ) +static bool video_nomodeset; + +bool video_firmware_drivers_only (void ) { -return drm_nomodeset; +return video_nomodeset; } -EXPORT_SYMBOL (drm_firmware_drivers_only); +EXPORT_SYMBOL (video_firmware_drivers_only);static int __init disable_modeset (char *str) { - drm_nomodeset = true; + video_nomodeset = true;pr_warn ("Booted with the nomodeset parameter. Only the system framebuffer will be available\n" );
include/drm/drm_drv.h +7 -1
@@ -30,6 +30,8 @@#include <linux/list.h> #include <linux/irqreturn.h> +#include <video/nomodeset.h> +#include <drm/drm_device.h> struct drm_file ;
@@ -602,6 +604,10 @@ static inline bool drm_drv_uses_atomic_modeset(struct drm_device *dev)int drm_dev_set_unique (struct drm_device *dev,const char *name); -extern bool drm_firmware_drivers_only (void ); +/* TODO: Inline drm_firmware_drivers_only() in all its callers. */ +static inline bool drm_firmware_drivers_only (void ) +{ +return video_firmware_drivers_only (); +}#endif
include/video/nomodeset.h new file +8 -0
@@ -0,0 +1,8 @@ +/* SPDX-License-Identifier: MIT */ + +#ifndef VIDEO_NOMODESET_H +#define VIDEO_NOMODESET_H + +bool video_firmware_drivers_only (void ); + +#endif
Signature · 1 line
2.38.0
Thomas Zimmermann
maintainerPATCH v2 2/2 fbdev: Add support for the nomodeset kernel parameter
In reply to Thomas ZimmermannSupport the kernel's nomodeset parameter for all PCI-based fbdev drivers that use aperture helpers to remove other, hardware-agnostic graphics drivers.
The parameter is a simple way of using the firmware-provided scanout buffer if the hardware's native driver is broken. The same effect could be achieved with per-driver options, but the importance of the graphics output for many users makes a single, unified approach worthwhile.
With nomodeset specified, the fbdev driver module will not load. This unifies behavior with similar DRM drivers. In DRM helpers, modules first check the nomodeset parameter before registering the PCI driver. As fbdev has no such module helpers, we have to modify each driver individually.
The name 'nomodeset' is slightly misleading, but has been chosen for historical reasons. Several drivers implemented it before it became a general option for DRM. So keeping the existing name was preferred over introducing a new one.
v2:
* print a warning if a driver does not init (Helge)
* wrap video_firmware_drivers_only() in helper
--- drivers/staging/sm750fb/Kconfig | 1 + drivers/staging/sm750fb/sm750.c | 3 ++ drivers/video/fbdev/Kconfig | 37 ++++++++++++++++++++ drivers/video/fbdev/arkfb.c | 5 +++ drivers/video/fbdev/asiliantfb.c | 3 ++ drivers/video/fbdev/aty/aty128fb.c | 5 +++ drivers/video/fbdev/aty/atyfb_base.c | 5 +++ drivers/video/fbdev/aty/radeon_base.c | 5 +++ drivers/video/fbdev/carminefb.c | 3 ++ drivers/video/fbdev/chipsfb.c | 3 ++ drivers/video/fbdev/cirrusfb.c | 5 +++ drivers/video/fbdev/core/fbmem.c | 15 ++++++++ drivers/video/fbdev/cyber2000fb.c | 6 +++- drivers/video/fbdev/geode/Kconfig | 3 ++ drivers/video/fbdev/geode/gx1fb_core.c | 5 +++ drivers/video/fbdev/geode/gxfb_core.c | 5 +++ drivers/video/fbdev/geode/lxfb_core.c | 5 +++ drivers/video/fbdev/gxt4500.c | 3 ++ drivers/video/fbdev/hyperv_fb.c | 4 ++- drivers/video/fbdev/i740fb.c | 5 +++ drivers/video/fbdev/i810/i810_main.c | 6 ++++ drivers/video/fbdev/imsttfb.c | 5 +++ drivers/video/fbdev/intelfb/intelfbdrv.c | 3 ++ drivers/video/fbdev/kyro/fbdev.c | 5 +++ drivers/video/fbdev/matrox/matroxfb_base.c | 3 ++ drivers/video/fbdev/mb862xx/mb862xxfbdrv.c | 3 ++ drivers/video/fbdev/neofb.c | 5 +++ drivers/video/fbdev/nvidia/nvidia.c | 5 +++ drivers/video/fbdev/pm2fb.c | 5 +++ drivers/video/fbdev/pm3fb.c | 5 +++ drivers/video/fbdev/pvr2fb.c | 5 +++ drivers/video/fbdev/riva/fbdev.c | 5 +++ drivers/video/fbdev/s3fb.c | 5 +++ drivers/video/fbdev/savage/savagefb_driver.c | 3 ++ drivers/video/fbdev/sis/sis_main.c | 5 +++ drivers/video/fbdev/skeletonfb.c | 5 +++ drivers/video/fbdev/sm712fb.c | 3 ++ drivers/video/fbdev/sstfb.c | 3 ++ drivers/video/fbdev/sunxvr2500.c | 3 ++ drivers/video/fbdev/sunxvr500.c | 3 ++ drivers/video/fbdev/tdfxfb.c | 5 +++ drivers/video/fbdev/tgafb.c | 5 +++ drivers/video/fbdev/tridentfb.c | 5 +++ drivers/video/fbdev/vermilion/vermilion.c | 5 +++ drivers/video/fbdev/via/via-core.c | 3 ++ drivers/video/fbdev/vt8623fb.c | 5 +++ include/linux/fb.h | 9 +++++ 47 files changed, 246 insertions(+), 2 deletions(-)
drivers/staging/sm750fb/Kconfig +1 -0
@@ -6,6 +6,7 @@ config FB_SM750 select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT + select VIDEO_NOMODESET help Frame buffer driver for the Silicon Motion SM750 chip with 2D accelearion and dual head support.
drivers/staging/sm750fb/sm750.c +3 -0
@@ -1168,6 +1168,9 @@ static int __init lynxfb_init(void) {char *option; +if (fb_modesetting_disabled ("sm750fb" )) +return -ENODEV ; +#ifdef MODULE option = g_option;#else
drivers/video/fbdev/Kconfig +37 -0
@@ -227,6 +227,7 @@ config FB_CIRRUS select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT + select VIDEO_NOMODESET help This enables support for Cirrus Logic GD542x/543x based boards on Amiga: SD64, Piccolo, Picasso II/II+, Picasso IV, or EGS Spectrum.
@@ -245,6 +246,7 @@ config FB_PM2 select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT + select VIDEO_NOMODESET help This is the frame buffer device driver for cards based on the 3D Labs Permedia, Permedia 2 and Permedia 2V chips.
@@ -340,6 +342,7 @@ config FB_CYBER2000 select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT + select VIDEO_NOMODESET help This enables support for the Integraphics CyberPro 20x0 and 5000 VGA chips used in the Rebel.com Netwinder and other machines.
@@ -504,6 +507,7 @@ config FB_CT65550 select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT + select VIDEO_NOMODESET help This is the frame buffer device driver for the Chips & Technologies 65550 graphics chip in PowerBooks.
@@ -514,6 +518,7 @@ config FB_ASILIANT select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT + select VIDEO_NOMODESET help This is the frame buffer device driver for the Asiliant 69030 chipset
@@ -522,6 +527,7 @@ config FB_IMSTT depends on (FB = y) && PCI select FB_CFB_IMAGEBLIT select FB_MACMODES if PPC_PMAC + select VIDEO_NOMODESET help The IMS Twin Turbo is a PCI-based frame buffer card bundled with many Macintosh and compatible computers.
@@ -585,6 +591,7 @@ config FB_TGA select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT select BITREVERSE + select VIDEO_NOMODESET help This is the frame buffer device driver for generic TGA and SFB+ graphic cards. These include DEC ZLXp-E1, -E2 and -E3 PCI cards,
@@ -777,6 +784,7 @@ config FB_XVR500 select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT + select VIDEO_NOMODESET help This is the framebuffer device for the Sun XVR-500 and similar graphics cards based upon the 3DLABS Wildcat chipset. The driver
@@ -790,6 +798,7 @@ config FB_XVR2500 select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT + select VIDEO_NOMODESET help This is the framebuffer device for the Sun XVR-2500 and similar graphics cards based upon the 3DLABS Wildcat chipset. The driver
@@ -816,6 +825,7 @@ config FB_PVR2 select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT + select VIDEO_NOMODESET help Say Y here if you have a PowerVR 2 card in your box. If you plan to run linux on your Dreamcast, you will have to say Y here.
@@ -881,6 +891,7 @@ config FB_NVIDIA select FB_CFB_IMAGEBLIT select BITREVERSE select VGASTATE + select VIDEO_NOMODESET help This driver supports graphics boards with the nVidia chips, TNT and newer. For very old chipsets, such as the RIVA128, then use
@@ -928,6 +939,7 @@ config FB_RIVA select FB_CFB_IMAGEBLIT select BITREVERSE select VGASTATE + select VIDEO_NOMODESET help This driver supports graphics boards with the nVidia Riva/Geforce chips.
@@ -972,6 +984,7 @@ config FB_I740 select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT select VGASTATE + select VIDEO_NOMODESET select FB_DDC help This driver supports graphics cards based on Intel740 chip.
@@ -984,6 +997,7 @@ config FB_I810 select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT select VGASTATE + select VIDEO_NOMODESET help This driver supports the on-board graphics built in to the Intel 810 and 815 chipsets. Say Y if you have and plan to use such a board.
@@ -1034,6 +1048,7 @@ config FB_LE80578 select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT + select VIDEO_NOMODESET help This driver supports the LE80578 (Vermilion Range) chipset
@@ -1051,6 +1066,7 @@ config FB_INTEL select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT select BOOT_VESA_SUPPORT if FB_INTEL = y + select VIDEO_NOMODESET depends on !DRM_I915 help This driver supports the on-board graphics built in to the Intel
@@ -1088,6 +1104,7 @@ config FB_MATROX select FB_CFB_IMAGEBLIT select FB_TILEBLITTING select FB_MACMODES if PPC_PMAC + select VIDEO_NOMODESET help Say Y here if you have a Matrox Millennium, Matrox Millennium II, Matrox Mystique, Matrox Mystique 220, Matrox Productiva G100, Matrox
@@ -1208,6 +1225,7 @@ config FB_RADEON select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT select FB_MACMODES if PPC + select VIDEO_NOMODESET help Choose this option if you want to use an ATI Radeon graphics card as a framebuffer device. There are both PCI and AGP versions. You
@@ -1247,6 +1265,7 @@ config FB_ATY128 select FB_CFB_IMAGEBLIT select FB_BACKLIGHT if FB_ATY128_BACKLIGHT select FB_MACMODES if PPC_PMAC + select VIDEO_NOMODESET help This driver supports graphics boards with the ATI Rage128 chips. Say Y if you have such a graphics board and read
@@ -1271,6 +1290,7 @@ config FB_ATY select FB_BACKLIGHT if FB_ATY_BACKLIGHT select FB_MACMODES if PPC select FB_ATY_CT if SPARC64 && PCI + select VIDEO_NOMODESET help This driver supports graphics boards with the ATI Mach64 chips. Say Y if you have such a graphics board.
@@ -1321,6 +1341,7 @@ config FB_S3 select FB_TILEBLITTING select FB_SVGALIB select VGASTATE + select VIDEO_NOMODESET select FONT_8x16 if FRAMEBUFFER_CONSOLE help Driver for graphics boards with S3 Trio / S3 Virge chip.
@@ -1341,6 +1362,7 @@ config FB_SAVAGE select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT select VGASTATE + select VIDEO_NOMODESET help This driver supports notebooks and computers with S3 Savage PCI/AGP chips.
@@ -1379,6 +1401,7 @@ config FB_SIS select FB_CFB_IMAGEBLIT select BOOT_VESA_SUPPORT if FB_SIS = y select FB_SIS_300 if !FB_SIS_315 + select VIDEO_NOMODESET help This is the frame buffer device driver for the SiS 300, 315, 330 and 340 series as well as XGI V3XT, V5, V8, Z7 graphics chipsets.
@@ -1408,6 +1431,7 @@ config FB_VIA select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT select I2C_ALGOBIT + select VIDEO_NOMODESET help This is the frame buffer device driver for Graphics chips of VIA UniChrome (Pro) Family (CLE266,PM800/CN400,P4M800CE/P4M800Pro/
@@ -1447,6 +1471,7 @@ config FB_NEOMAGIC select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT select VGASTATE + select VIDEO_NOMODESET help This driver supports notebooks with NeoMagic PCI chips. Say Y if you have such a graphics card.
@@ -1460,6 +1485,7 @@ config FB_KYRO select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT + select VIDEO_NOMODESET help Say Y here if you have a STG4000 / Kyro / PowerVR 3 based graphics board.
@@ -1474,6 +1500,7 @@ config FB_3DFX select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_MODE_HELPERS + select VIDEO_NOMODESET help This driver supports graphics boards with the 3Dfx Banshee, Voodoo3 or VSA-100 (aka Voodoo4/5) chips. Say Y if you have
@@ -1503,6 +1530,7 @@ config FB_VOODOO1 select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT + select VIDEO_NOMODESET help Say Y here if you have a 3Dfx Voodoo Graphics (Voodoo1/sst1) or Voodoo2 (cvg) based graphics card.
@@ -1524,6 +1552,7 @@ config FB_VT8623 select FB_TILEBLITTING select FB_SVGALIB select VGASTATE + select VIDEO_NOMODESET select FONT_8x16 if FRAMEBUFFER_CONSOLE help Driver for CastleRock integrated graphics core in the
@@ -1537,6 +1566,7 @@ config FB_TRIDENT select FB_CFB_IMAGEBLIT select FB_DDC select FB_MODE_HELPERS + select VIDEO_NOMODESET help This is the frame buffer device driver for Trident PCI/AGP chipsets. Supported chipset families are TGUI 9440/96XX, 3DImage, Blade3D
@@ -1560,6 +1590,7 @@ config FB_ARK select FB_TILEBLITTING select FB_SVGALIB select VGASTATE + select VIDEO_NOMODESET select FONT_8x16 if FRAMEBUFFER_CONSOLE help Driver for PCI graphics boards with ARK 2000PV chip
@@ -1571,6 +1602,7 @@ config FB_PM3 select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT + select VIDEO_NOMODESET help This is the frame buffer device driver for the 3DLabs Permedia3 chipset, used in Formac ProFormance III, 3DLabs Oxygen VX1 &
@@ -1583,6 +1615,7 @@ config FB_CARMINE select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT + select VIDEO_NOMODESET help This is the frame buffer device driver for the Fujitsu Carmine chip. The driver provides two independent frame buffer devices.
@@ -1961,6 +1994,7 @@ config FB_IBM_GXT4500 select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT + select VIDEO_NOMODESET help Say Y here to enable support for the IBM GXT4000P/6000P and GXT4500P/6500P display adaptor based on Raster Engine RC1000,
@@ -2101,6 +2135,7 @@ config FB_MB862XX select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT + select VIDEO_NOMODESET help Frame buffer driver for Fujitsu Carmine/Coral-P(A)/Lime controllers.
@@ -2188,6 +2223,7 @@ config FB_HYPERV select FB_CFB_IMAGEBLIT select FB_DEFERRED_IO select DMA_CMA if HAVE_DMA_CONTIGUOUS && CMA + select VIDEO_NOMODESET help This framebuffer driver supports Microsoft Hyper-V Synthetic Video.
@@ -2230,6 +2266,7 @@ config FB_SM712 select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT + select VIDEO_NOMODESET help Frame buffer driver for the Silicon Motion SM710, SM712, SM721 and SM722 chips.
drivers/video/fbdev/arkfb.c +5 -0
@@ -1187,7 +1187,12 @@ static int __init arkfb_init(void)#ifndef MODULE char *option =NULL ; +#endif + +if (fb_modesetting_disabled ("arkfb" )) +return -ENODEV ; +#ifndef MODULE if (fb_get_options ("arkfb" , &option))return -ENODEV ;
drivers/video/fbdev/asiliantfb.c +3 -0
@@ -616,6 +616,9 @@ static struct pci_driver asiliantfb_driver = {static int __init asiliantfb_init (void ) { +if (fb_modesetting_disabled ("asiliantfb" )) +return -ENODEV ; +if (fb_get_options ("asiliantfb" ,NULL ))return -ENODEV ;
drivers/video/fbdev/aty/aty128fb.c +5 -0
@@ -2503,7 +2503,12 @@ static int aty128fb_init(void) {#ifndef MODULE char *option =NULL ; +#endif + +if (fb_modesetting_disabled ("aty128fb" )) +return -ENODEV ; +#ifndef MODULE if (fb_get_options ("aty128fb" , &option))return -ENODEV ;aty128fb_setup (option);
drivers/video/fbdev/aty/atyfb_base.c +5 -0
@@ -3965,7 +3965,12 @@ static int __init atyfb_init(void)int err1 =1 , err2 =1 ;#ifndef MODULE char *option =NULL ; +#endif + +if (fb_modesetting_disabled ("atyfb" )) +return -ENODEV ; +#ifndef MODULE if (fb_get_options ("atyfb" , &option))return -ENODEV ;atyfb_setup (option);
drivers/video/fbdev/aty/radeon_base.c +5 -0
@@ -2607,7 +2607,12 @@ static int __init radeonfb_init (void) {#ifndef MODULE char *option =NULL ; +#endif + +if (fb_modesetting_disabled ("radeonfb" )) +return -ENODEV ; +#ifndef MODULE if (fb_get_options ("radeonfb" , &option))return -ENODEV ;radeonfb_setup (option);
drivers/video/fbdev/carminefb.c +3 -0
@@ -773,6 +773,9 @@ static struct pci_driver carmine_pci_driver = {static int __init carminefb_init (void ) { +if (fb_modesetting_disabled ("carminefb" )) +return -ENODEV ; +if (!(fb_displays & (CARMINE_USE_DISPLAY0 |CARMINE_USE_DISPLAY1 ))) { printk(KERN_ERR "If you disable both displays than you don't "
drivers/video/fbdev/chipsfb.c +3 -0
@@ -506,6 +506,9 @@ static struct pci_driver chipsfb_driver = {int __init chips_init (void ) { +if (fb_modesetting_disabled ("chipsfb" )) +return -ENODEV ; +if (fb_get_options ("chipsfb" ,NULL ))return -ENODEV ;
drivers/video/fbdev/cirrusfb.c +5 -0
@@ -2359,7 +2359,12 @@ static int __init cirrusfb_init(void)#ifndef MODULE char *option =NULL ; +#endif + +if (fb_modesetting_disabled ("cirrusfb" )) +return -ENODEV ; +#ifndef MODULE if (fb_get_options ("cirrusfb" , &option))return -ENODEV ;cirrusfb_setup (option);
drivers/video/fbdev/core/fbmem.c +15 -0
@@ -40,6 +40,7 @@#include <asm/fb.h> +#include <video/nomodeset.h> #include <video/vga.h> /*
@@ -1844,4 +1845,18 @@ int fb_new_modelist(struct fb_info *info)return 0 ; } +#if defined(CONFIG_VIDEO_NOMODESET ) +bool fb_modesetting_disabled (const char *drvname) +{ +bool fwonly =video_firmware_drivers_only (); + +if (fwonly) +pr_warn ("Driver %s not loading because of nomodeset parameter\n" , + drvname); + +return fwonly; +} +EXPORT_SYMBOL (fb_modesetting_disabled); +#endif +MODULE_LICENSE ("GPL" );
drivers/video/fbdev/cyber2000fb.c +5 -1
@@ -48,7 +48,6 @@#include <linux/i2c.h> #include <linux/i2c-algo-bit.h> -#ifdef __arm__#include <asm/mach-types.h> #endif
@@ -1878,7 +1877,12 @@ static int __init cyber2000fb_init(void)#ifndef MODULE char *option =NULL ; +#endif +if (fb_modesetting_disabled ("CyberPro" )) +return -ENODEV ; + +#ifndef MODULE if (fb_get_options ("cyber2000fb" , &option))return -ENODEV ;cyber2000fb_setup (option);
drivers/video/fbdev/geode/Kconfig +3 -0
@@ -15,6 +15,7 @@ config FB_GEODE_LX select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT + select VIDEO_NOMODESET help Framebuffer driver for the display controller integrated into the AMD Geode LX processors.
@@ -30,6 +31,7 @@ config FB_GEODE_GX select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT + select VIDEO_NOMODESET help Framebuffer driver for the display controller integrated into the AMD Geode GX processors.
@@ -45,6 +47,7 @@ config FB_GEODE_GX1 select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT + select VIDEO_NOMODESET help Framebuffer driver for the display controller integrated into the AMD Geode GX1 processor.
drivers/video/fbdev/geode/gx1fb_core.c +5 -0
@@ -446,7 +446,12 @@ static int __init gx1fb_init(void) {#ifndef MODULE char *option =NULL ; +#endif + +if (fb_modesetting_disabled ("gx1fb" )) +return -ENODEV ; +#ifndef MODULE if (fb_get_options ("gx1fb" , &option))return -ENODEV ;gx1fb_setup (option);
drivers/video/fbdev/geode/gxfb_core.c +5 -0
@@ -511,7 +511,12 @@ static int __init gxfb_init(void) {#ifndef MODULE char *option =NULL ; +#endif + +if (fb_modesetting_disabled ("gxfb" )) +return -ENODEV ; +#ifndef MODULE if (fb_get_options ("gxfb" , &option))return -ENODEV ;
drivers/video/fbdev/geode/lxfb_core.c +5 -0
@@ -647,7 +647,12 @@ static int __init lxfb_init(void) {#ifndef MODULE char *option =NULL ; +#endif + +if (fb_modesetting_disabled ("lxfb" )) +return -ENODEV ; +#ifndef MODULE if (fb_get_options ("lxfb" , &option))return -ENODEV ;
drivers/video/fbdev/gxt4500.c +3 -0
@@ -779,6 +779,9 @@ static struct pci_driver gxt4500_driver = {static int gxt4500_init (void ) { +if (fb_modesetting_disabled ("gxt4500" )) +return -ENODEV ; +#ifndef MODULE if (fb_get_options ("gxt4500" , &mode_option))return -ENODEV ;
drivers/video/fbdev/hyperv_fb.c +3 -1
@@ -59,7 +59,6 @@#include <linux/hyperv.h> -/* Hyper-V Synthetic Video Protocol definitions and structures */ #define MAX_VMBUS_PKT_SIZE 0x4000
@@ -1363,6 +1362,9 @@ static int __init hvfb_drv_init(void) {int ret; +if (fb_modesetting_disabled ("hyper_fb" )) +return -ENODEV ; + ret =vmbus_driver_register (&hvfb_drv);if (ret !=0 )return ret;
drivers/video/fbdev/i740fb.c +5 -0
@@ -1285,7 +1285,12 @@ static int __init i740fb_init(void) {#ifndef MODULE char *option =NULL ; +#endif + +if (fb_modesetting_disabled ("i740fb" )) +return -ENODEV ; +#ifndef MODULE if (fb_get_options ("i740fb" , &option))return -ENODEV ;i740fb_setup (option);
drivers/video/fbdev/i810/i810_main.c +6 -0
@@ -2143,6 +2143,9 @@ static int i810fb_init(void) {char *option =NULL ; +if (fb_modesetting_disabled ("i810fb" )) +return -ENODEV ; +if (fb_get_options ("i810fb" , &option))return -ENODEV ;i810fb_setup (option);
@@ -2159,6 +2162,9 @@ static int i810fb_init(void)static int i810fb_init (void ) { +if (fb_modesetting_disabled ("i810fb" )) +return -ENODEV ; + hsync1 *=1000 ; hsync2 *=1000 ;
drivers/video/fbdev/imsttfb.c +5 -0
@@ -1617,7 +1617,12 @@ static int __init imsttfb_init(void) {#ifndef MODULE char *option =NULL ; +#endif + +if (fb_modesetting_disabled ("imsttfb" )) +return -ENODEV ; +#ifndef MODULE if (fb_get_options ("imsttfb" , &option))return -ENODEV ;
drivers/video/fbdev/intelfb/intelfbdrv.c +3 -0
@@ -389,6 +389,9 @@ static int __init intelfb_init(void)if (idonly)return -ENODEV ; +if (fb_modesetting_disabled ("intelfb" )) +return -ENODEV ; +#ifndef MODULE if (fb_get_options ("intelfb" , &option))return -ENODEV ;
drivers/video/fbdev/kyro/fbdev.c +5 -0
@@ -789,7 +789,12 @@ static int __init kyrofb_init(void) {#ifndef MODULE char *option =NULL ; +#endif + +if (fb_modesetting_disabled ("kyrofb" )) +return -ENODEV ; +#ifndef MODULE if (fb_get_options ("kyrofb" , &option))return -ENODEV ;kyrofb_setup (option);
drivers/video/fbdev/matrox/matroxfb_base.c +3 -0
@@ -2314,6 +2314,9 @@ static void __init matroxfb_init_params(void) {static int __init matrox_init (void ) {int err; +if (fb_modesetting_disabled ("matroxfb" )) +return -ENODEV ; +matroxfb_init_params (); err =pci_register_driver (&matroxfb_driver); dev =-1 ;/* accept all new devices... */
drivers/video/fbdev/mb862xx/mb862xxfbdrv.c +3 -0
@@ -1181,6 +1181,9 @@ static int mb862xxfb_init(void) {int ret = -ENODEV ; +if (fb_modesetting_disabled (DRV_NAME )) +return -ENODEV ; +#if defined(CONFIG_FB_MB862XX_LIME ) ret =platform_driver_register (&of_platform_mb862xxfb_driver);#endif
drivers/video/fbdev/neofb.c +5 -0
@@ -2209,7 +2209,12 @@ static int __init neofb_init(void) {#ifndef MODULE char *option =NULL ; +#endif + +if (fb_modesetting_disabled ("neofb" )) +return -ENODEV ; +#ifndef MODULE if (fb_get_options ("neofb" , &option))return -ENODEV ;neofb_setup (option);
drivers/video/fbdev/nvidia/nvidia.c +5 -0
@@ -1521,7 +1521,12 @@ static int nvidiafb_init(void) {#ifndef MODULE char *option =NULL ; +#endif + +if (fb_modesetting_disabled ("nvidiafb" )) +return -ENODEV ; +#ifndef MODULE if (fb_get_options ("nvidiafb" , &option))return -ENODEV ;nvidiafb_setup (option);
drivers/video/fbdev/pm2fb.c +5 -0
@@ -1799,7 +1799,12 @@ static int __init pm2fb_init(void) {#ifndef MODULE char *option =NULL ; +#endif + +if (fb_modesetting_disabled ("pm2fb" )) +return -ENODEV ; +#ifndef MODULE if (fb_get_options ("pm2fb" , &option))return -ENODEV ;pm2fb_setup (option);
drivers/video/fbdev/pm3fb.c +5 -0
@@ -1540,7 +1540,12 @@ static int __init pm3fb_init(void)*/ #ifndef MODULE char *option =NULL ; +#endif + +if (fb_modesetting_disabled ("pm3fb" )) +return -ENODEV ; +#ifndef MODULE if (fb_get_options ("pm3fb" , &option))return -ENODEV ;pm3fb_setup (option);
drivers/video/fbdev/pvr2fb.c +5 -0
@@ -1082,7 +1082,12 @@ static int __init pvr2fb_init(void)#ifndef MODULE char *option =NULL ; +#endif + +if (fb_modesetting_disabled ("pvr2fb" )) +return -ENODEV ; +#ifndef MODULE if (fb_get_options ("pvr2fb" , &option))return -ENODEV ;pvr2fb_setup (option);
drivers/video/fbdev/riva/fbdev.c +5 -0
@@ -2165,7 +2165,12 @@ static int rivafb_init(void) {#ifndef MODULE char *option =NULL ; +#endif + +if (fb_modesetting_disabled ("rivafb" )) +return -ENODEV ; +#ifndef MODULE if (fb_get_options ("rivafb" , &option))return -ENODEV ;rivafb_setup (option);
drivers/video/fbdev/s3fb.c +5 -0
@@ -1558,7 +1558,12 @@ static int __init s3fb_init(void)#ifndef MODULE char *option =NULL ; +#endif + +if (fb_modesetting_disabled ("s3fb" )) +return -ENODEV ; +#ifndef MODULE if (fb_get_options ("s3fb" , &option))return -ENODEV ;s3fb_setup (option);
drivers/video/fbdev/savage/savagefb_driver.c +3 -0
@@ -2556,6 +2556,9 @@ static int __init savagefb_init(void)DBG ("savagefb_init" ); +if (fb_modesetting_disabled ("savagefb" )) +return -ENODEV ; +if (fb_get_options ("savagefb" , &option))return -ENODEV ;
drivers/video/fbdev/sis/sis_main.c +5 -0
@@ -6588,7 +6588,12 @@ static int __init sisfb_init(void) {#ifndef MODULE char *options =NULL ; +#endif + +if (fb_modesetting_disabled ("sisfb" )) +return -ENODEV ; +#ifndef MODULE if (fb_get_options ("sisfb" , &options))return -ENODEV ;
drivers/video/fbdev/skeletonfb.c +5 -0
@@ -987,7 +987,12 @@ static int __init xxxfb_init(void)*/ #ifndef MODULE char *option =NULL ; +#endif + +if (fb_modesetting_disabled ("xxxfb" )) +return -ENODEV ; +#ifndef MODULE if (fb_get_options ("xxxfb" , &option))return -ENODEV ;xxxfb_setup (option);
drivers/video/fbdev/sm712fb.c +3 -0
@@ -1756,6 +1756,9 @@ static int __init sm712fb_init(void) {char *option =NULL ; +if (fb_modesetting_disabled ("sm712fb" )) +return -ENODEV ; +if (fb_get_options ("sm712fb" , &option))return -ENODEV ;if (option && *option)
drivers/video/fbdev/sstfb.c +3 -0
@@ -1503,6 +1503,9 @@ static int sstfb_init(void) {char *option =NULL ; +if (fb_modesetting_disabled ("sstfb" )) +return -ENODEV ; +if (fb_get_options ("sstfb" , &option))return -ENODEV ;sstfb_setup (option);
drivers/video/fbdev/sunxvr2500.c +3 -0
@@ -247,6 +247,9 @@ static struct pci_driver s3d_driver = {static int __init s3d_init (void ) { +if (fb_modesetting_disabled ("s3d" )) +return -ENODEV ; +if (fb_get_options ("s3d" ,NULL ))return -ENODEV ;
drivers/video/fbdev/sunxvr500.c +3 -0
@@ -430,6 +430,9 @@ static struct pci_driver e3d_driver = {static int __init e3d_init (void ) { +if (fb_modesetting_disabled ("e3d" )) +return -ENODEV ; +if (fb_get_options ("e3d" ,NULL ))return -ENODEV ;
drivers/video/fbdev/tdfxfb.c +5 -0
@@ -1632,7 +1632,12 @@ static int __init tdfxfb_init(void) {#ifndef MODULE char *option =NULL ; +#endif + +if (fb_modesetting_disabled ("tdfxfb" )) +return -ENODEV ; +#ifndef MODULE if (fb_get_options ("tdfxfb" , &option))return -ENODEV ;
drivers/video/fbdev/tgafb.c +5 -0
@@ -1597,7 +1597,12 @@ static int tgafb_init(void)int status;#ifndef MODULE char *option =NULL ; +#endif + +if (fb_modesetting_disabled ("tgafb" )) +return -ENODEV ; +#ifndef MODULE if (fb_get_options ("tgafb" , &option))return -ENODEV ;tgafb_setup (option);
drivers/video/fbdev/tridentfb.c +5 -0
@@ -1811,7 +1811,12 @@ static int __init tridentfb_init(void) {#ifndef MODULE char *option =NULL ; +#endif + +if (fb_modesetting_disabled ("tridentfb" )) +return -ENODEV ; +#ifndef MODULE if (fb_get_options ("tridentfb" , &option))return -ENODEV ;tridentfb_setup (option);
drivers/video/fbdev/vermilion/vermilion.c +5 -0
@@ -1057,7 +1057,12 @@ static int __init vmlfb_init(void)#ifndef MODULE char *option =NULL ; +#endif + +if (fb_modesetting_disabled ("vmlfb" )) +return -ENODEV ; +#ifndef MODULE if (fb_get_options (MODULE_NAME , &option))return -ENODEV ;#endif
drivers/video/fbdev/via/via-core.c +3 -0
@@ -725,6 +725,9 @@ static int __init via_core_init(void) {int ret; +if (fb_modesetting_disabled ("viafb" )) +return -ENODEV ; + ret =viafb_init ();if (ret)return ret;
drivers/video/fbdev/vt8623fb.c +5 -0
@@ -920,7 +920,12 @@ static int __init vt8623fb_init(void)#ifndef MODULE char *option =NULL ; +#endif + +if (fb_modesetting_disabled ("vt8623fb" )) +return -ENODEV ; +#ifndef MODULE if (fb_get_options ("vt8623fb" , &option))return -ENODEV ;
include/linux/fb.h +9 -0
@@ -803,6 +803,15 @@ extern int fb_find_mode(struct fb_var_screeninfo *var,const struct fb_videomode *default_mode, unsigned int default_bpp); +#if defined(CONFIG_VIDEO_NOMODESET ) +bool fb_modesetting_disabled (const char *drvname); +#else +bool fb_modesetting_disabled (const char *drvname) +{ +return false; +} +#endif +/* Convenience logging macros */ #define fb_err (fb_info, fmt, ...) \ pr_err("fb%d: " fmt, (fb_info)->node, ##__VA_ARGS__)
Signature · 1 line
2.38.0