Skip to content

Commit c25a19a

Browse files
Thomas Zimmermannhdeller
authored andcommitted
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: Thomas Zimmermann <[email protected]> Reviewed-by: Javier Martinez Canillas <[email protected]> Signed-off-by: Helge Deller <[email protected]>
1 parent df67699 commit c25a19a

File tree

1 file changed

+1
-8
lines changed

1 file changed

+1
-8
lines changed

drivers/video/fbdev/hyperv_fb.c

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@
4848
#include <linux/aperture.h>
4949
#include <linux/module.h>
5050
#include <linux/kernel.h>
51-
#include <linux/screen_info.h>
5251
#include <linux/vmalloc.h>
5352
#include <linux/init.h>
5453
#include <linux/completion.h>
@@ -1059,14 +1058,8 @@ static int hvfb_getmem(struct hv_device *hdev, struct fb_info *info)
10591058
else
10601059
aperture_remove_all_conflicting_devices(KBUILD_MODNAME);
10611060

1062-
if (!gen2vm) {
1061+
if (!gen2vm)
10631062
pci_dev_put(pdev);
1064-
} else if (IS_ENABLED(CONFIG_SYSFB)) {
1065-
/* framebuffer is reallocated, clear screen_info to avoid misuse from kexec */
1066-
screen_info.lfb_size = 0;
1067-
screen_info.lfb_base = 0;
1068-
screen_info.orig_video_isVGA = 0;
1069-
}
10701063

10711064
return 0;
10721065

0 commit comments

Comments
 (0)