NothingOSS/android_kernel_msm-6.1_nothing_sm7635
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "drm/gma500: Use drm_aperture_remove_conflicting_pci_framebuffers"

Browse source 
This reverts commit cccfcbb9e5 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 <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman 2023-11-01 14:36:09 +00:00
parent 6603cc468d
commit 3e052a378b
1 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
drivers/gpu/drm/gma500/psb_drv.c
View file

@ -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;