From 61f22cff5916dc528690721aa3aaa88f9c6576ad Mon Sep 17 00:00:00 2001 From: Felix Held Date: Thu, 16 Nov 2023 14:09:48 +0100 Subject: nb/intel/sandybridge: assign gma ops in chipset devicetree Since the integrated GPU is always function 0 of device 2 on bus 0, the device operations can be statically assigned in the devicetree and there's no need to bind the host bridge device operations to the PCI device during runtime via a list of PCI IDs. TEST=Lenovo X220 still boots to Linux and graphics works in UEFI Signed-off-by: Felix Held Tested-by: Patrick Rudolph Change-Id: I20e387e626e19dc441aceda18451186d1e86cd5f Reviewed-on: https://review.coreboot.org/c/coreboot/+/79114 Reviewed-by: Patrick Rudolph Reviewed-by: Arthur Heymans Tested-by: build bot (Jenkins) --- src/northbridge/intel/sandybridge/chipset.cb | 2 +- src/northbridge/intel/sandybridge/gma.c | 15 +-------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/src/northbridge/intel/sandybridge/chipset.cb b/src/northbridge/intel/sandybridge/chipset.cb index 9fb17010765f..38a53d54e1d1 100644 --- a/src/northbridge/intel/sandybridge/chipset.cb +++ b/src/northbridge/intel/sandybridge/chipset.cb @@ -14,7 +14,7 @@ chip northbridge/intel/sandybridge device pci 01.0 alias peg10 off end # PEG10 device pci 01.1 alias peg11 off end # PEG11 device pci 01.2 alias peg12 off end # PEG12 - device pci 02.0 alias igd off end # vga controller + device pci 02.0 alias igd off ops sandybridge_gma_func0_ops end # vga controller device pci 04.0 alias dev4 off end # Device 4 device pci 06.0 alias peg60 off end # PEG60 diff --git a/src/northbridge/intel/sandybridge/gma.c b/src/northbridge/intel/sandybridge/gma.c index 3eed5cc9bc8f..2304a0468800 100644 --- a/src/northbridge/intel/sandybridge/gma.c +++ b/src/northbridge/intel/sandybridge/gma.c @@ -640,7 +640,7 @@ static void gma_func0_disable(struct device *dev) dev->enabled = 0; } -static struct device_operations gma_func0_ops = { +struct device_operations sandybridge_gma_func0_ops = { .read_resources = pci_dev_read_resources, .set_resources = pci_dev_set_resources, .enable_resources = pci_dev_enable_resources, @@ -650,16 +650,3 @@ static struct device_operations gma_func0_ops = { .ops_pci = &pci_dev_ops_pci, .acpi_name = gma_acpi_name, }; - -static const unsigned short pci_device_ids[] = { - 0x0102, 0x0106, 0x010a, 0x0112, - 0x0116, 0x0122, 0x0126, 0x0156, - 0x0166, 0x0162, 0x016a, 0x0152, - 0 -}; - -static const struct pci_driver gma __pci_driver = { - .ops = &gma_func0_ops, - .vendor = PCI_VID_INTEL, - .devices = pci_device_ids, -}; -- cgit v1.2.3