shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-11 13:27:06 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "drm/gma500: Use drm_aperture_remove_conflicting_pci_framebuffers"

Browse Source 
This reverts commit cccfcbb9e5 which is
commit 80e993988b 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 * We cannot yet easily find the framebuffer's location in memory. So
* remove all framebuffers here. Note that we still want the pci special * remove all framebuffers here.
* handling to kick out vgacon.
* *
* TODO: Refactor psb_driver_load() to map vdc_reg earlier. Then we * TODO: Refactor psb_driver_load() to map vdc_reg earlier. Then we
* might be able to read the framebuffer range from the device. * might be able to read the framebuffer range from the device.
*/ */
ret = drm_aperture_remove_framebuffers(false, &driver); ret = drm_aperture_remove_framebuffers(true, &driver);
if (ret)
return ret;
ret = drm_aperture_remove_conflicting_pci_framebuffers(pdev, &driver);
if (ret) if (ret)
return ret; return ret;