diff options
| author |   jsg <jsg@openbsd.org> | 2019-09-09 01:35:43 +0000 |
|---|---|---|
| committer | jsg <jsg@openbsd.org> | 2019-09-09 01:35:43 +0000 |
| commit | 78cd60329a9b42e2a8e91bb88c3d556b4e420e89 (patch) | |
| tree | 30c675b2771e9a7de97654d340b8c3ef36dbcc20 /sys/dev/pci | |
| parent | sbrk(2) already existed in Version 4 AT&T UNIX; (diff) | |
| download | wireguard-openbsd-78cd60329a9b42e2a8e91bb88c3d556b4e420e89.tar.xz wireguard-openbsd-78cd60329a9b42e2a8e91bb88c3d556b4e420e89.zip | |
When no display outputs are connected on boot linux 4.19 drm relies on
deferred setup to handle the console framebuffer where as linux 4.4 drm
created a 1024x768 console framebuffer in this situation.
As we only handle setting up rasops and wsdisplay on attach go back to
the old behaviour for now so a display can be connected after booting
with none attached to interact with the console.
This partly reverts linux commit
drm/fb-helper: Support deferred setup
ca91a2758fcef6635626993557dd51cfbb6dd134
Reported and tested by Marcus MERIGHI.
Tested by and ok kettenis@
Diffstat (limited to 'sys/dev/pci')
| -rw-r--r-- | sys/dev/pci/drm/drm_fb_helper.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/sys/dev/pci/drm/drm_fb_helper.c b/sys/dev/pci/drm/drm_fb_helper.c index 8e134187f6c..d95b8acbebd 100644 --- a/sys/dev/pci/drm/drm_fb_helper.c +++ b/sys/dev/pci/drm/drm_fb_helper.c @@ -2002,15 +2002,23 @@ static int drm_fb_helper_single_fb_probe(struct drm_fb_helper *fb_helper, } if (crtc_count == 0 || sizes.fb_width == -1 || sizes.fb_height == -1) { +#ifdef __linux__ DRM_INFO("Cannot find any crtc or sizes\n"); /* First time: disable all crtc's.. */ -#ifdef notyet /* XXX calling this hangs boot with no connected outputs */ if (!fb_helper->deferred_setup /* && SPLAY_EMPTY(fb_helper->dev->files) */) restore_fbdev_mode(fb_helper); -#endif return -EAGAIN; +#else + /* + * hmm everyone went away - assume VGA cable just fell out + * and will come back later. + */ + DRM_INFO("Cannot find any crtc or sizes - going 1024x768\n"); + sizes.fb_width = sizes.surface_width = 1024; + sizes.fb_height = sizes.surface_height = 768; +#endif } /* Handle our overallocation */ |