Merge tag 'pci-v5.3-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull PCI fixes from Bjorn Helgaas: - Reset both NVIDIA GPU and HDA in ThinkPad P50 quirk, which was broken by another quirk that enabled the HDA device (Lyude Paul) - Fix pciebus-howto.rst documentation filename typo (Bjorn Helgaas) * tag 'pci-v5.3-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: Documentation PCI: Fix pciebus-howto.rst filename typo PCI: Reset both NVIDIA GPU and HDA in ThinkPad P50 workaround
This commit is contained in:
@@ -9,7 +9,7 @@ Linux PCI Bus Subsystem
|
||||
:numbered:
|
||||
|
||||
pci
|
||||
picebus-howto
|
||||
pciebus-howto
|
||||
pci-iov-howto
|
||||
msi-howto
|
||||
acpi-info
|
||||
|
||||
@@ -5256,7 +5256,7 @@ static void quirk_reset_lenovo_thinkpad_p50_nvgpu(struct pci_dev *pdev)
|
||||
*/
|
||||
if (ioread32(map + 0x2240c) & 0x2) {
|
||||
pci_info(pdev, FW_BUG "GPU left initialized by EFI, resetting\n");
|
||||
ret = pci_reset_function(pdev);
|
||||
ret = pci_reset_bus(pdev);
|
||||
if (ret < 0)
|
||||
pci_err(pdev, "Failed to reset GPU: %d\n", ret);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user