mirror of
https://github.com/torvalds/linux.git
synced 2026-05-05 15:02:40 -04:00
fbdev: Remove conflicting devices on PCI bus
Remove firmware devices on the PCI bus, by calling aperture_remove_conflicting_pci_devices() in the probe function of each related fbdev driver. iSo far, most of these drivers did not remove conflicting VESA or EFI devices, or outride failed for resource conflicts (i.e., matroxfb.) This must have been broken for quite some time. Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> Reviewed-by: Javier Martinez Canillas <javierm@redhat.com> Link: https://patchwork.freedesktop.org/patch/msgid/20220718072322.8927-7-tzimmermann@suse.de
This commit is contained in:
@@ -107,6 +107,7 @@
|
||||
* Add support for 945GME. (Phil Endecott <spam_from_intelfb@chezphil.org>)
|
||||
*/
|
||||
|
||||
#include <linux/aperture.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/errno.h>
|
||||
@@ -483,6 +484,10 @@ static int intelfb_pci_register(struct pci_dev *pdev,
|
||||
|
||||
DBG_MSG("intelfb_pci_register\n");
|
||||
|
||||
err = aperture_remove_conflicting_pci_devices(pdev, "intelfb");
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
num_registered++;
|
||||
if (num_registered != 1) {
|
||||
ERR_MSG("Attempted to register %d devices "
|
||||
|
||||
Reference in New Issue
Block a user