From: Bjorn Helgaas <bhelgaas@google.com>
Date: Tue, 22 Mar 2022 22:16:22 +0000 (-0500)
Subject: Merge branch 'pci/vga'
X-Git-Tag: v6.6.17~7909^2~12
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=816f8917046de14e78a5715b72d462e10123a45c;p=platform%2Fkernel%2Flinux-rpi.git

Merge branch 'pci/vga'

- Move vgaarb.c from drivers/gpu/vga to drivers/pci (Bjorn Helgaas)

- Factor out default VGA device selection (Huacai Chen)

- Move firmware default device detection to ADD_DEVICE path so we can
  select a default device regardless of whether it is enumerated before or
  after vga_arb_device_init() (Huacai Chen)

- Move non-legacy VGA detection to ADD_DEVICE path (Huacai Chen)

- Move disabled VGA device detection to ADD_DEVICE path (Huacai Chen)

* pci/vga:
  PCI/VGA: Replace full MIT license text with SPDX identifier
  PCI/VGA: Use unsigned format string to print lock counts
  PCI/VGA: Log bridge control messages when adding devices
  PCI/VGA: Remove empty vga_arb_device_card_gone()
  PCI/VGA: Move disabled VGA device detection to ADD_DEVICE path
  PCI/VGA: Move non-legacy VGA detection to ADD_DEVICE path
  PCI/VGA: Move firmware default device detection to ADD_DEVICE path
  PCI/VGA: Factor out default VGA device selection
  PCI/VGA: Factor out vga_select_framebuffer_device()
  PCI/VGA: Move vga_arb_integrated_gpu() earlier in file
  PCI/VGA: Move vgaarb to drivers/pci
---

816f8917046de14e78a5715b72d462e10123a45c