Commit 2bebc3cd authored by Helge Deller's avatar Helge Deller

Revert "firmware/sysfb: Clear screen_info state after consuming it"

This reverts commit df67699c.

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: default avatarHelge Deller <deller@gmx.de>
Cc: Thomas Zimmermann <tzimmermann@suse.de>
Cc: Jens Axboe <axboe@kernel.dk>
parent 556e2d17
...@@ -71,7 +71,7 @@ EXPORT_SYMBOL_GPL(sysfb_disable); ...@@ -71,7 +71,7 @@ EXPORT_SYMBOL_GPL(sysfb_disable);
static __init int sysfb_init(void) static __init int sysfb_init(void)
{ {
const struct screen_info *si = &screen_info; struct screen_info *si = &screen_info;
struct simplefb_platform_data mode; struct simplefb_platform_data mode;
const char *name; const char *name;
bool compatible; bool compatible;
...@@ -119,18 +119,6 @@ static __init int sysfb_init(void) ...@@ -119,18 +119,6 @@ static __init int sysfb_init(void)
if (ret) if (ret)
goto err; 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; goto unlock_mutex;
err: err:
platform_device_put(pd); platform_device_put(pd);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment