android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "video/aperture: Only remove sysfb on the default vga pci device"

Browse Source 
This reverts commit 485ec8f8e1 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 <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman 2023-11-01 14:36:13 +00:00
parent 900112a6dc
commit 064668b55e
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/video/aperture.c
View File

@ -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;
}
/*