diff options
| author | Helge Deller <deller@gmx.de> | 2024-01-19 21:47:15 +0100 |
|---|---|---|
| committer | Helge Deller <deller@gmx.de> | 2024-01-19 22:22:26 +0100 |
| commit | 2bebc3cd48701607e38e8258ab9692de9b1a718b (patch) | |
| tree | 2d8e5ab4a407c439df0c89029bb3c157935d9673 /drivers/firmware | |
| parent | Merge tag 'ceph-for-6.8-rc1' of https://github.com/ceph/ceph-client (diff) | |
| download | linux-2bebc3cd48701607e38e8258ab9692de9b1a718b.tar.xz linux-2bebc3cd48701607e38e8258ab9692de9b1a718b.zip | |
Revert "firmware/sysfb: Clear screen_info state after consuming it"
This reverts commit df67699c9cb0ceb70f6cc60630ca938c06773eda.
Jens Axboe reported a regression that his machine is failing to show a
console, or in fact anything, on current -git. There's no output and no
console after:
Loading Linux 6.7.0+ ...
Loading initial ramdisk ...
Signed-off-by: Helge Deller <deller@gmx.de>
Cc: Thomas Zimmermann <tzimmermann@suse.de>
Cc: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/firmware')
| -rw-r--r-- | drivers/firmware/sysfb.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/drivers/firmware/sysfb.c b/drivers/firmware/sysfb.c index 19706bd2642a..82fcfd29bc4d 100644 --- a/drivers/firmware/sysfb.c +++ b/drivers/firmware/sysfb.c @@ -71,7 +71,7 @@ EXPORT_SYMBOL_GPL(sysfb_disable); static __init int sysfb_init(void) { - const struct screen_info *si = &screen_info; + struct screen_info *si = &screen_info; struct simplefb_platform_data mode; const char *name; bool compatible; @@ -119,18 +119,6 @@ static __init int sysfb_init(void) if (ret) goto err; - /* - * The firmware framebuffer is now maintained by the created - * device. Disable screen_info after we've consumed it. Prevents - * invalid access during kexec reboots. - * - * TODO: Vgacon still relies on the global screen_info. Make - * vgacon work with the platform device, so we can clear - * the screen_info unconditionally. - */ - if (strcmp(name, "platform-framebuffer")) - screen_info.orig_video_isVGA = 0; - goto unlock_mutex; err: platform_device_put(pd); |