Commit b1737ad4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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"
parents 9d64bf43 2bebc3cd

drivers/firmware/sysfb.c

+1 −13
Original line number Diff line number Diff line
@@ -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);