Commit c25a19af authored by Thomas Zimmermann's avatar Thomas Zimmermann Committed by Helge Deller
Browse files

fbdev/hyperv_fb: Do not clear global screen_info 



Do not clear the global instance of screen_info. If necessary, clearing
fields in screen_info should be done by architecture or firmware code
that maintains the firmware framebuffer.

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarJavier Martinez Canillas <javierm@redhat.com>
Signed-off-by: default avatarHelge Deller <deller@gmx.de>
parent df67699c

drivers/video/fbdev/hyperv_fb.c

+1 −8
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ 
#include <linux/aperture.h>

#include <linux/module.h>

#include <linux/kernel.h>

#include <linux/screen_info.h>

#include <linux/vmalloc.h>

#include <linux/init.h>

#include <linux/completion.h>
@@ -1059,14 +1058,8 @@ static int hvfb_getmem(struct hv_device *hdev, struct fb_info *info) 
	else

		aperture_remove_all_conflicting_devices(KBUILD_MODNAME);



	if (!gen2vm) {

	if (!gen2vm)

		pci_dev_put(pdev);

	} else if (IS_ENABLED(CONFIG_SYSFB)) {

		/* framebuffer is reallocated, clear screen_info to avoid misuse from kexec */

		screen_info.lfb_size = 0;

		screen_info.lfb_base = 0;

		screen_info.orig_video_isVGA = 0;

	}



	return 0;