diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-01-20 20:14:04 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-01-20 20:14:04 +0300 |
commit | b1737ad4406a35f20eaae0e8079cc6ca6447e83a (patch) | |
tree | e9c42c3da24bb334feb53f26653b3e41aaf9623c /drivers | |
parent | 9d64bf433c53cab2f48a3fff7a1f2a696bc5229a (diff) | |
parent | 2bebc3cd48701607e38e8258ab9692de9b1a718b (diff) | |
download | linux-b1737ad4406a35f20eaae0e8079cc6ca6447e83a.tar.xz |
Merge tag 'fbdev-for-6.8-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev
Pull fbdev fix from Helge Deller:
"There were various reports from people without any graphics output on
the screen and it turns out one commit triggers the problem.
- Revert 'firmware/sysfb: Clear screen_info state after consuming it'"
* tag 'fbdev-for-6.8-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev:
Revert "firmware/sysfb: Clear screen_info state after consuming it"
Diffstat (limited to 'drivers')
-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); |