History

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>

Daniel Vetter committed 4 years ago

Commit c8a04cb2 parents c305ae9 69d846129 files · +344 −285Browse files

Showing the changes to include (2 of 29 files). Show all

Unified · Split

2 files
  1. include/drm/drm_drv.h +1 −0
  2. include/linux/console.h +0 −6
include/drm/drm_drv.h+1−0
@@ -601,5 +601,6 @@ static inline bool drm_drv_uses_atomic_modeset(struct drm_device *dev) · 600 unmodified lines
601 601
602int drm_dev_set_unique(struct drm_device *dev, const char *name);602int drm_dev_set_unique(struct drm_device *dev, const char *name);
603 603
604extern bool drm_firmware_drivers_only(void);
604 605
605#endif606#endif
include/linux/console.h+0−6
@@ -219,12 +219,6 @@ extern atomic_t ignore_console_lock_warning; · 218 unmodified lines
219#define VESA_HSYNC_SUSPEND 2219#define VESA_HSYNC_SUSPEND 2
220#define VESA_POWERDOWN 3220#define VESA_POWERDOWN 3
221 221
222#ifdef CONFIG_VGA_CONSOLE
223extern bool vgacon_text_force(void);
224#else
225static inline bool vgacon_text_force(void) { return false; }
226#endif
227
228extern void console_init(void);222extern void console_init(void);
229 223
230/* For deferred console takeover */224/* For deferred console takeover */

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t