Skip to content

Commit 8c34cd1

Browse files
committed
drm/bochs: downgrade pci_request_region failure from error to warning
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: Marek Marczykowski-Górecki <[email protected]> Signed-off-by: Gerd Hoffmann <[email protected]> Acked-by: Sam Ravnborg <[email protected]> Link: http://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent 9803aac commit 8c34cd1

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

drivers/gpu/drm/bochs/bochs_hw.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -156,10 +156,8 @@ int bochs_hw_init(struct drm_device *dev)
156156
size = min(size, mem);
157157
}
158158

159-
if (pci_request_region(pdev, 0, "bochs-drm") != 0) {
160-
DRM_ERROR("Cannot request framebuffer\n");
161-
return -EBUSY;
162-
}
159+
if (pci_request_region(pdev, 0, "bochs-drm") != 0)
160+
DRM_WARN("Cannot request framebuffer, boot fb still active?\n");
163161

164162
bochs->fb_map = ioremap(addr, size);
165163
if (bochs->fb_map == NULL) {

0 commit comments

Comments
 (0)