Fixes for 4.9

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-4.9/drm-bochs-downgrade-pci_request_region-failure-from-.patch b/queue-4.9/drm-bochs-downgrade-pci_request_region-failure-from-.patch
new file mode 100644 (file)
index 0000000..eb3fd30
--- /dev/null
+++ b/queue-4.9/drm-bochs-downgrade-pci_request_region-failure-from-.patch
@@ -0,0 +1,48 @@
+From 323fb84bd49bfde861181e654d1304cd9d5e479b Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+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 <kraxel@redhat.com>
+
+[ 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 <marmarek@invisiblethingslab.com>
+Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
+Acked-by: Sam Ravnborg <sam@ravnborg.org>
+Link: http://patchwork.freedesktop.org/patch/msgid/20200313084152.2734-1-kraxel@redhat.com
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ 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.9/series b/queue-4.9/series
index bf515784c4141b47ce0f2dddaaa6ad3db303310f..a9a9db73643060bbe77f69287d9cf302d19084f5 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -1,2 +1,3 @@
 l2tp-ensure-sessions-are-freed-after-their-pppol2tp-socket.patch
 l2tp-fix-race-between-l2tp_session_delete-and-l2tp_tunnel_closeall.patch
+drm-bochs-downgrade-pci_request_region-failure-from-.patch