diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2014-02-26 11:51:25 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-28 15:31:39 -0800 |
| commit | e5bb7425e5bae76c8950089a946edcba3e0540ab (patch) | |
| tree | 4a59e9255ab2ad23be1ed81b28dd0470c18f2fef | |
| parent | 9069fd54960304a7c941909cbccdf8df9c42b488 (diff) | |
| download | linux-e5bb7425e5bae76c8950089a946edcba3e0540ab.tar.bz2 | |
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: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Acked-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/video/hyperv_fb.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/video/hyperv_fb.c b/drivers/video/hyperv_fb.c index b7b3dd0ab675..e23392ec5af3 100644 --- a/drivers/video/hyperv_fb.c +++ b/drivers/video/hyperv_fb.c @@ -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); |