diff --git a/drivers/video/fbdev/aty/radeon_base.c b/drivers/video/fbdev/aty/radeon_base.c index 50c384ce2883..8b28c9bddd97 100644 --- a/drivers/video/fbdev/aty/radeon_base.c +++ b/drivers/video/fbdev/aty/radeon_base.c @@ -2238,6 +2238,14 @@ static const struct bin_attribute edid2_attr = { .read = radeon_show_edid2, }; +static int radeon_kick_out_firmware_fb(struct pci_dev *pdev) +{ + resource_size_t base = pci_resource_start(pdev, 0); + resource_size_t size = pci_resource_len(pdev, 0); + + return aperture_remove_conflicting_devices(base, size, false, KBUILD_MODNAME); +} + static int radeonfb_pci_register(struct pci_dev *pdev, const struct pci_device_id *ent) { @@ -2288,7 +2296,7 @@ static int radeonfb_pci_register(struct pci_dev *pdev, rinfo->fb_base_phys = pci_resource_start (pdev, 0); rinfo->mmio_base_phys = pci_resource_start (pdev, 2); - ret = aperture_remove_conflicting_pci_devices(pdev, KBUILD_MODNAME); + ret = radeon_kick_out_firmware_fb(pdev); if (ret) goto err_release_fb;