From 3e052a378b167982340e81af73980294d20d93b4 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 1 Nov 2023 14:36:09 +0000 Subject: [PATCH] Revert "drm/gma500: Use drm_aperture_remove_conflicting_pci_framebuffers" This reverts commit cccfcbb9e51af026529618e3bdc09b6beacac919 which is commit 80e993988b97fe794f3ec2be6db05fe30f9353c3 upstream. It breaks the Android ABI and can be brought back later in an abi-safe way if needed. Bug: 161946584 Change-Id: I98437f0d8222293d93ad48311e8b719931f68c75 Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/gma500/psb_drv.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/gma500/psb_drv.c b/drivers/gpu/drm/gma500/psb_drv.c index 000e6704e3c7..cd9c73f5a64a 100644 --- a/drivers/gpu/drm/gma500/psb_drv.c +++ b/drivers/gpu/drm/gma500/psb_drv.c @@ -424,17 +424,12 @@ static int psb_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) /* * We cannot yet easily find the framebuffer's location in memory. So - * remove all framebuffers here. Note that we still want the pci special - * handling to kick out vgacon. + * remove all framebuffers here. * * TODO: Refactor psb_driver_load() to map vdc_reg earlier. Then we * might be able to read the framebuffer range from the device. */ - ret = drm_aperture_remove_framebuffers(false, &driver); - if (ret) - return ret; - - ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, &driver); + ret = drm_aperture_remove_framebuffers(true, &driver); if (ret) return ret;