From 37a70b8acdb2c06fde1e7d9efcf5ee299aaa8088 Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Thu, 2 Apr 2020 17:35:22 -0400 Subject: [PATCH] Fixes for 4.4 Signed-off-by: Sasha Levin --- ...ade-pci_request_region-failure-from-.patch | 48 +++++++++++++++++++ queue-4.4/series | 1 + 2 files changed, 49 insertions(+) create mode 100644 queue-4.4/drm-bochs-downgrade-pci_request_region-failure-from-.patch create mode 100644 queue-4.4/series diff --git a/queue-4.4/drm-bochs-downgrade-pci_request_region-failure-from-.patch b/queue-4.4/drm-bochs-downgrade-pci_request_region-failure-from-.patch new file mode 100644 index 00000000000..a5c63578b9c --- /dev/null +++ b/queue-4.4/drm-bochs-downgrade-pci_request_region-failure-from-.patch @@ -0,0 +1,48 @@ +From 3590ebd91409289e3811817e335a052c43386a41 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 13 Mar 2020 09:41:52 +0100 +Subject: drm/bochs: downgrade pci_request_region failure from error to warning +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Gerd Hoffmann + +[ Upstream commit 8c34cd1a7f089dc03933289c5d4a4d1489549828 ] + +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 +Signed-off-by: Gerd Hoffmann +Acked-by: Sam Ravnborg +Link: http://patchwork.freedesktop.org/patch/msgid/20200313084152.2734-1-kraxel@redhat.com +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/bochs/bochs_hw.c | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/drivers/gpu/drm/bochs/bochs_hw.c b/drivers/gpu/drm/bochs/bochs_hw.c +index a39b0343c197d..401c218567af9 100644 +--- a/drivers/gpu/drm/bochs/bochs_hw.c ++++ b/drivers/gpu/drm/bochs/bochs_hw.c +@@ -97,10 +97,8 @@ int bochs_hw_init(struct drm_device *dev, uint32_t flags) + size = min(size, mem); + } + +- if (pci_request_region(pdev, 0, "bochs-drm") != 0) { +- DRM_ERROR("Cannot request framebuffer\n"); +- return -EBUSY; +- } ++ if (pci_request_region(pdev, 0, "bochs-drm") != 0) ++ DRM_WARN("Cannot request framebuffer, boot fb still active?\n"); + + bochs->fb_map = ioremap(addr, size); + if (bochs->fb_map == NULL) { +-- +2.20.1 + diff --git a/queue-4.4/series b/queue-4.4/series new file mode 100644 index 00000000000..c01f499c84a --- /dev/null +++ b/queue-4.4/series @@ -0,0 +1 @@ +drm-bochs-downgrade-pci_request_region-failure-from-.patch -- 2.47.3