From c0584fbc45e041e3bacac3a788a47c77a9b40f48 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 1 Nov 2023 14:36:10 +0000 Subject: [PATCH] Revert "fbdev/radeon: use pci aperture helpers" This reverts commit 6db53af15444e7022640d7b8d5e7531d94e27a43 which is commit 9b539c4d1b921bc9c8c578d4d50f0a7e7874d384 upstream. It breaks the Android ABI and can be brought back later in an abi-safe way if needed. Bug: 161946584 Change-Id: If14dd22c006f9d09857175a60c7f684409242515 Signed-off-by: Greg Kroah-Hartman --- drivers/video/fbdev/aty/radeon_base.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) 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;