From 900112a6dc0f54d9246919d4fff28ddeeaba8b77 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 1 Nov 2023 14:36:11 +0000 Subject: [PATCH] Revert "drm/ast: Use drm_aperture_remove_conflicting_pci_framebuffers" This reverts commit cd1f889c99eee5a6fae671962a63bc89e68d7837 which is commit c1ebead36099deb85384f6fb262fe619a04cee73 upstream. It breaks the Android ABI and can be brought back later in an abi-safe way if needed. Bug: 161946584 Change-Id: Id6345a15790f5e3209485004ebe071119684859b Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/ast/ast_drv.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/ast/ast_drv.c b/drivers/gpu/drm/ast/ast_drv.c index 800471f2a203..b9392f31e629 100644 --- a/drivers/gpu/drm/ast/ast_drv.c +++ b/drivers/gpu/drm/ast/ast_drv.c @@ -89,13 +89,27 @@ static const struct pci_device_id ast_pciidlist[] = { MODULE_DEVICE_TABLE(pci, ast_pciidlist); +static int ast_remove_conflicting_framebuffers(struct pci_dev *pdev) +{ + bool primary = false; + resource_size_t base, size; + + base = pci_resource_start(pdev, 0); + size = pci_resource_len(pdev, 0); +#ifdef CONFIG_X86 + primary = pdev->resource[PCI_ROM_RESOURCE].flags & IORESOURCE_ROM_SHADOW; +#endif + + return drm_aperture_remove_conflicting_framebuffers(base, size, primary, &ast_driver); +} + static int ast_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) { struct ast_private *ast; struct drm_device *dev; int ret; - ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, &ast_driver); + ret = ast_remove_conflicting_framebuffers(pdev); if (ret) return ret;