From 33b12f8e4801e8fd96ddf6cb6b56960fd123f62b Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 1 Nov 2023 14:36:06 +0000 Subject: [PATCH] Revert "video/aperture: Only kick vgacon when the pdev is decoding vga" This reverts commit 4aad3b82b9de7c4ffccb02f87d0c6903569333c9 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 --- drivers/video/aperture.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/drivers/video/aperture.c b/drivers/video/aperture.c index 7ea18086e659..5c94abdb1ad6 100644 --- a/drivers/video/aperture.c +++ b/drivers/video/aperture.c @@ -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;