Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e5bb7425 authored by Gerd Hoffmann's avatar Gerd Hoffmann Committed by Greg Kroah-Hartman
Browse files

hyperv-fb: kick off efifb early 



Remove firmware framebuffer before initializing hyperv-fb.  Needed
on gen2 virtual machines.   Letting register_framebuffer handle the
switchover results in efifb still being active while hyperv graphics
are initialized, which in turn can make the linux kernel hang.

Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Signed-off-by: default avatarHaiyang Zhang <haiyangz@microsoft.com>
Acked-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9069fd54

drivers/video/hyperv_fb.c

+2 −0
Original line number Diff line number Diff line
@@ -679,6 +679,8 @@ static int hvfb_getmem(struct fb_info *info) 
	if (gen2vm) {

		info->apertures->ranges[0].base = screen_info.lfb_base;

		info->apertures->ranges[0].size = screen_info.lfb_size;

		remove_conflicting_framebuffers(info->apertures,

						KBUILD_MODNAME, false);

	} else {

		info->apertures->ranges[0].base = pci_resource_start(pdev, 0);

		info->apertures->ranges[0].size = pci_resource_len(pdev, 0);