On Tue, Jun 24, 2025 at 03:30:40PM -0500, Mario Limonciello wrote:
> From: Mario Limonciello <mario.limonciello@xxxxxxx>
>
> 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.
>
> Suggested-by: Thomas Zimmermann <tzimmermann@xxxxxxx>
> Signed-off-by: Mario Limonciello <mario.limonciello@xxxxxxx>
Acked-by: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>
(after the kernel robot issue is fixed, of course)
> ---
> v5:
> * split from next patch
> ---
> drivers/pci/vgaarb.c | 29 ++---------------------------
> 1 file changed, 2 insertions(+), 27 deletions(-)
>
> diff --git a/drivers/pci/vgaarb.c b/drivers/pci/vgaarb.c
> index 78748e8d2dbae..c3457708c01e3 100644
> --- a/drivers/pci/vgaarb.c
> +++ b/drivers/pci/vgaarb.c
> @@ -556,34 +556,9 @@ 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;
> + 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 false;
> + return pdev == screen_info_pci_dev(si);
> }
>
> static bool vga_arb_integrated_gpu(struct device *dev)
> --
> 2.43.0
>
