Commit 54fb4a4c authored by Gerd Hoffmann's avatar Gerd Hoffmann Committed by Kelsey Skunberg

drm/bochs: downgrade pci_request_region failure from error to warning

BugLink: https://bugs.launchpad.net/bugs/1874045

[ Upstream commit 8c34cd1a ]

Shutdown of firmware framebuffer has a bunch of problems.  Because
of this the framebuffer region might still be reserved even after
drm_fb_helper_remove_conflicting_pci_framebuffers() returned.

Don't consider pci_request_region() failure for the framebuffer
region as fatal error to workaround this issue.
Reported-by: default avatarMarek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
Link: http://patchwork.freedesktop.org/patch/msgid/20200313084152.2734-1-kraxel@redhat.comSigned-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarKleber Sacilotto de Souza <kleber.souza@canonical.com>
Signed-off-by: default avatarKelsey Skunberg <kelsey.skunberg@canonical.com>
parent 0cd5a645
...@@ -97,10 +97,8 @@ int bochs_hw_init(struct drm_device *dev, uint32_t flags) ...@@ -97,10 +97,8 @@ int bochs_hw_init(struct drm_device *dev, uint32_t flags)
size = min(size, mem); size = min(size, mem);
} }
if (pci_request_region(pdev, 0, "bochs-drm") != 0) { if (pci_request_region(pdev, 0, "bochs-drm") != 0)
DRM_ERROR("Cannot request framebuffer\n"); DRM_WARN("Cannot request framebuffer, boot fb still active?\n");
return -EBUSY;
}
bochs->fb_map = ioremap(addr, size); bochs->fb_map = ioremap(addr, size);
if (bochs->fb_map == NULL) { if (bochs->fb_map == NULL) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment