Skip to content

Commit

Permalink
Revert "firmware/sysfb: Clear screen_info state after consuming it"
Browse files Browse the repository at this point in the history
This reverts commit df67699.

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 <[email protected]>
Cc: Thomas Zimmermann <[email protected]>
Cc: Jens Axboe <[email protected]>
  • Loading branch information
hdeller committed Jan 19, 2024
1 parent 556e2d1 commit 2bebc3c
Showing 1 changed file with 1 addition and 13 deletions.
14 changes: 1 addition & 13 deletions drivers/firmware/sysfb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 2bebc3c

Please sign in to comment.