Commit 816f8917 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

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
parents bdef65de f321c35f

Documentation/gpu/vgaarbiter.rst

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ In-kernel interface 
.. kernel-doc:: include/linux/vgaarb.h

   :internal:



.. kernel-doc:: drivers/gpu/vga/vgaarb.c

.. kernel-doc:: drivers/pci/vgaarb.c

   :export:



libpciaccess

drivers/gpu/vga/Kconfig

+0 −19
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

config VGA_ARB

	bool "VGA Arbitration" if EXPERT

	default y

	depends on (PCI && !S390)

	help

	  Some "legacy" VGA devices implemented on PCI typically have the same

	  hard-decoded addresses as they did on ISA. When multiple PCI devices

	  are accessed at same time they need some kind of coordination. Please

	  see Documentation/gpu/vgaarbiter.rst for more details. Select this to

	  enable VGA arbiter.



config VGA_ARB_MAX_GPUS

	int "Maximum number of GPUs"

	default 16

	depends on VGA_ARB

	help

	  Reserves space in the kernel to maintain resource locking for

	  multiple GPUS.  The overhead for each GPU is very small.



config VGA_SWITCHEROO

	bool "Laptop Hybrid Graphics - GPU switching support"

	depends on X86

drivers/gpu/vga/Makefile

+0 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

obj-$(CONFIG_VGA_ARB)  += vgaarb.o

obj-$(CONFIG_VGA_SWITCHEROO) += vga_switcheroo.o

drivers/pci/Kconfig

+19 −0
Original line number Diff line number Diff line
@@ -252,6 +252,25 @@ config PCIE_BUS_PEER2PEER 


endchoice



config VGA_ARB

	bool "VGA Arbitration" if EXPERT

	default y

	depends on (PCI && !S390)

	help

	  Some "legacy" VGA devices implemented on PCI typically have the same

	  hard-decoded addresses as they did on ISA. When multiple PCI devices

	  are accessed at same time they need some kind of coordination. Please

	  see Documentation/gpu/vgaarbiter.rst for more details. Select this to

	  enable VGA arbiter.



config VGA_ARB_MAX_GPUS

	int "Maximum number of GPUs"

	default 16

	depends on VGA_ARB

	help

	  Reserves space in the kernel to maintain resource locking for

	  multiple GPUS.  The overhead for each GPU is very small.



source "drivers/pci/hotplug/Kconfig"

source "drivers/pci/controller/Kconfig"

source "drivers/pci/endpoint/Kconfig"

drivers/pci/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ obj-$(CONFIG_PCI_PF_STUB) += pci-pf-stub.o 
obj-$(CONFIG_PCI_ECAM)		+= ecam.o

obj-$(CONFIG_PCI_P2PDMA)	+= p2pdma.o

obj-$(CONFIG_XEN_PCIDEV_FRONTEND) += xen-pcifront.o

obj-$(CONFIG_VGA_ARB)		+= vgaarb.o



# Endpoint library must be initialized before its users

obj-$(CONFIG_PCI_ENDPOINT)	+= endpoint/