diff options
| author |   Daniel Vetter <daniel.vetter@ffwll.ch> | 2021-12-09 09:31:44 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2021-12-09 09:31:45 +0100 |
| commit | c8a04cbeedbc9f71c475141baa656f14f4879792 (patch) | |
| tree | 224133e37b3a9a8c11001e3b5ee29ffd1e41f8c7 /include | |
| parent | Merge tag 'drm-intel-next-2021-11-30' of git://anongit.freedesktop.org/drm/drm-intel into drm-next (diff) | |
| parent | drm: Fix build error caused by missing drm_nomodeset.o (diff) | |
| download | linux-dev-c8a04cbeedbc9f71c475141baa656f14f4879792.tar.xz linux-dev-c8a04cbeedbc9f71c475141baa656f14f4879792.zip | |
Merge tag 'drm-misc-next-2021-11-29' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
drm-misc-next for 5.17:
UAPI Changes:
Cross-subsystem Changes:
* Move 'nomodeset' kernel boot option into DRM subsystem
Core Changes:
* Replace several DRM_*() logging macros with drm_*() equivalents
* panel: Add quirk for Lenovo Yoga Book X91F/L
* ttm: Documentation fixes
Driver Changes:
* Cleanup nomodeset handling in drivers
* Fixes
* bridge/anx7625: Fix reading EDID; Fix error code
* bridge/megachips: Probe both bridges before registering
* vboxvideo: Fix ERR_PTR usage
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/YaSVz15Q7dAlEevU@linux-uq9g.fritz.box
Diffstat (limited to 'include')
| -rw-r--r-- | include/drm/drm_drv.h | 1 | ||||
| -rw-r--r-- | include/linux/console.h | 6 |
2 files changed, 1 insertions, 6 deletions
diff --git a/include/drm/drm_drv.h b/include/drm/drm_drv.h index a84eb4028e5b..da0c836fe8e1 100644 --- a/include/drm/drm_drv.h +++ b/include/drm/drm_drv.h @@ -601,5 +601,6 @@ 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); #endif diff --git a/include/linux/console.h b/include/linux/console.h index a97f277cfdfa..7cd758a4f44e 100644 --- a/include/linux/console.h +++ b/include/linux/console.h @@ -219,12 +219,6 @@ extern atomic_t ignore_console_lock_warning; #define VESA_HSYNC_SUSPEND 2 #define VESA_POWERDOWN 3 -#ifdef CONFIG_VGA_CONSOLE -extern bool vgacon_text_force(void); -#else -static inline bool vgacon_text_force(void) { return false; } -#endif - extern void console_init(void); /* For deferred console takeover */ |