mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-02 08:39:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'fbdev-for-6.8-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev

Browse Source 
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"
This commit is contained in:
Linus Torvalds
2024-01-20 09:14:04 -08:00
parent 9d64bf433c 2bebc3cd48
commit b1737ad440
1 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/firmware/sysfb.c
View File

@@ -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);