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

Revert "video/aperture: Move vga handling to pci function"

Browse Source 
This reverts commit 28916927b7 which is
commit f1d599d315fb7b7343cddaf365e671aaa8453aca upstream.

It breaks the Android ABI and can be brought back later in an abi-safe
way if needed.

Bug: 161946584
Change-Id: Iffad2c2b492da2aa7b87dba8d9bd792be74b3b58
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman 2023-11-01 14:36:04 +00:00
parent aa5b12e90a
commit a81c232edd
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/video/aperture.c
View File

@ -298,6 +298,14 @@ int aperture_remove_conflicting_devices(resource_size_t base, resource_size_t si
aperture_detach_devices(base, size);
/*
* If this is the primary adapter, there could be a VGA device
* that consumes the VGA framebuffer I/O range. Remove this device
* as well.
*/
if (primary)
aperture_detach_devices(VGA_FB_PHYS_BASE, VGA_FB_PHYS_SIZE);
return 0;
}
EXPORT_SYMBOL(aperture_remove_conflicting_devices);
@ -337,13 +345,6 @@ int aperture_remove_conflicting_pci_devices(struct pci_dev *pdev, const char *na
}
if (primary) {
/*
* If this is the primary adapter, there could be a VGA device
* that consumes the VGA framebuffer I/O range. Remove this
* device as well.
*/
aperture_detach_devices(VGA_FB_PHYS_BASE, VGA_FB_PHYS_SIZE);
/*
* WARNING: Apparently we must kick fbdev drivers before vgacon,
* otherwise the vga fbdev driver falls over.