diff options
| author | Mario Limonciello (AMD) <superm1@kernel.org> | 2025-08-11 11:26:04 -0500 |
|---|---|---|
| committer | Mario Limonciello (AMD) <superm1@kernel.org> | 2025-09-10 09:35:33 -0500 |
| commit | 337bf13aa9ddab8ae47f2677ab75cf69ae33437b (patch) | |
| tree | 16ab0f1cc841271602d7866dea4b5cb27c23ad69 | |
| parent | 6e490dea61b88aac9762c9f79a54aad4ea2e6cd1 (diff) | |
PCI/VGA: Replace vga_is_firmware_default() with a screen info check
vga_is_firmware_default() checks firmware resources to find the owner
framebuffer resources to find the firmware PCI device. This is an
open coded implementation of screen_info_pci_dev(). Switch to using
screen_info_pci_dev() instead.
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
Suggested-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://lore.kernel.org/r/20250811162606.587759-3-superm1@kernel.org
Signed-off-by: Mario Limonciello (AMD) <superm1@kernel.org>
| -rw-r--r-- | drivers/pci/vgaarb.c | 31 |
1 files changed, 5 insertions, 26 deletions
diff --git a/drivers/pci/vgaarb.c b/drivers/pci/vgaarb.c index 78748e8d2dba..b58f94ee4891 100644 --- a/drivers/pci/vgaarb.c +++ b/drivers/pci/vgaarb.c @@ -556,34 +556,13 @@ EXPORT_SYMBOL(vga_put); static bool vga_is_firmware_default(struct pci_dev *pdev) { -#if defined(CONFIG_X86) - u64 base = screen_info.lfb_base; - u64 size = screen_info.lfb_size; - struct resource *r; - u64 limit; +#ifdef CONFIG_SCREEN_INFO + struct screen_info *si = &screen_info; - /* Select the device owning the boot framebuffer if there is one */ - - if (screen_info.capabilities & VIDEO_CAPABILITY_64BIT_BASE) - base |= (u64)screen_info.ext_lfb_base << 32; - - limit = base + size; - - /* Does firmware framebuffer belong to us? */ - pci_dev_for_each_resource(pdev, r) { - if (resource_type(r) != IORESOURCE_MEM) - continue; - - if (!r->start || !r->end) - continue; - - if (base < r->start || limit >= r->end) - continue; - - return true; - } -#endif + return pdev == screen_info_pci_dev(si); +#else return false; +#endif } static bool vga_arb_integrated_gpu(struct device *dev) |