From 064668b55e3c7281b7d0c15b8db08fdb444a9cc9 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 1 Nov 2023 14:36:13 +0000 Subject: [PATCH] Revert "video/aperture: Only remove sysfb on the default vga pci device" This reverts commit 485ec8f8e1d8ae12aa1daa5ad345ba8940ad2db7 which is commit 5ae3716cfdcd286268133867f67d0803847acefc upstream. It breaks the Android ABI and can be brought back later in an abi-safe way if needed. Bug: 161946584 Change-Id: Iec66232fff97b07fd0c57975e8b1785710cfb395 Signed-off-by: Greg Kroah-Hartman --- drivers/video/aperture.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/video/aperture.c b/drivers/video/aperture.c index 5c94abdb1ad6..41e77de1ea82 100644 --- a/drivers/video/aperture.c +++ b/drivers/video/aperture.c @@ -332,16 +332,15 @@ int aperture_remove_conflicting_pci_devices(struct pci_dev *pdev, const char *na primary = pdev->resource[PCI_ROM_RESOURCE].flags & IORESOURCE_ROM_SHADOW; #endif - if (primary) - sysfb_disable(); - for (bar = 0; bar < PCI_STD_NUM_BARS; ++bar) { if (!(pci_resource_flags(pdev, bar) & IORESOURCE_MEM)) continue; base = pci_resource_start(pdev, bar); size = pci_resource_len(pdev, bar); - aperture_detach_devices(base, size); + ret = aperture_remove_conflicting_devices(base, size, primary, name); + if (ret) + return ret; } /*