1 files changed, 3 insertions, 21 deletions

diff --git a/drivers/gpu/drm/virtio/virtgpu_drm_bus.c b/drivers/gpu/drm/virtio/virtgpu_drm_bus.c
index 094b876f6da6..757ca28ab93e 100644
--- a/drivers/gpu/drm/virtio/virtgpu_drm_bus.c
+++ b/drivers/gpu/drm/virtio/virtgpu_drm_bus.c
@@ -28,26 +28,6 @@
 
 #include "virtgpu_drv.h"
 
-static void virtio_pci_kick_out_firmware_fb(struct pci_dev *pci_dev)
-{
-        struct apertures_struct *ap;
-        bool primary;
-
-        ap = alloc_apertures(1);
-        if (!ap)
-                return;
-
-        ap->ranges[0].base = pci_resource_start(pci_dev, 0);
-        ap->ranges[0].size = pci_resource_len(pci_dev, 0);
-
-        primary = pci_dev->resource[PCI_ROM_RESOURCE].flags
-                & IORESOURCE_ROM_SHADOW;
-
-        drm_fb_helper_remove_conflicting_framebuffers(ap, "virtiodrmfb", primary);
-
-        kfree(ap);
-}
-
 int drm_virtio_init(struct drm_driver *driver, struct virtio_device *vdev)
 {
         struct drm_device *dev;
@@ -69,7 +49,9 @@ int drm_virtio_init(struct drm_driver *driver, struct virtio_device *vdev)
                          pname);
                 dev->pdev = pdev;
                 if (vga)
-                        virtio_pci_kick_out_firmware_fb(pdev);
+                        drm_fb_helper_remove_conflicting_pci_framebuffers(pdev,
+                                                                          0,
+                                                                          "virtiodrmfb");
 
                 snprintf(unique, sizeof(unique), "pci:%s", pname);
                 ret = drm_dev_set_unique(dev, unique);