Skip to content

Commit 2bebc3c

Browse files
committed
Revert "firmware/sysfb: Clear screen_info state after consuming it"
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 <deller@gmx.de> Cc: Thomas Zimmermann <tzimmermann@suse.de> Cc: Jens Axboe <axboe@kernel.dk>
1 parent 556e2d1 commit 2bebc3c

File tree

1 file changed

+1
-13
lines changed

1 file changed

+1
-13
lines changed

drivers/firmware/sysfb.c

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ EXPORT_SYMBOL_GPL(sysfb_disable);
7171

7272
static __init int sysfb_init(void)
7373
{
74-
const struct screen_info *si = &screen_info;
74+
struct screen_info *si = &screen_info;
7575
struct simplefb_platform_data mode;
7676
const char *name;
7777
bool compatible;
@@ -119,18 +119,6 @@ static __init int sysfb_init(void)
119119
if (ret)
120120
goto err;
121121

122-
/*
123-
* The firmware framebuffer is now maintained by the created
124-
* device. Disable screen_info after we've consumed it. Prevents
125-
* invalid access during kexec reboots.
126-
*
127-
* TODO: Vgacon still relies on the global screen_info. Make
128-
* vgacon work with the platform device, so we can clear
129-
* the screen_info unconditionally.
130-
*/
131-
if (strcmp(name, "platform-framebuffer"))
132-
screen_info.orig_video_isVGA = 0;
133-
134122
goto unlock_mutex;
135123
err:
136124
platform_device_put(pd);

0 commit comments

Comments
 (0)