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

Revert "video/aperture: Only kick vgacon when the pdev is decoding vga"

Browse Source 
This reverts commit 4aad3b82b9 which is
commit 7450cd235b45d43ee6f3c235f89e92623458175d upstream.

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

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

16
drivers/video/aperture.c
View File

@ -344,15 +344,13 @@ int aperture_remove_conflicting_pci_devices(struct pci_dev *pdev, const char *na
aperture_detach_devices(base, size);
}
if (primary) {
/*
* WARNING: Apparently we must kick fbdev drivers before vgacon,
* otherwise the vga fbdev driver falls over.
*/
ret = vga_remove_vgacon(pdev);
if (ret)
return ret;
}
/*
* WARNING: Apparently we must kick fbdev drivers before vgacon,
* otherwise the vga fbdev driver falls over.
*/
ret = vga_remove_vgacon(pdev);
if (ret)
return ret;
return 0;