From: Dave Airlie Date: Mon, 29 Oct 2012 23:26:54 +0000 (-0600) Subject: PCI: Don't touch card regs after runtime suspend D3 X-Git-Tag: next-20121106~83^2~1^2~2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=aa26f41d3675702880505ac04cc567d16acdaa92;p=karo-tx-linux.git PCI: Don't touch card regs after runtime suspend D3 If the driver takes care of state saving, don't touch any registers on it. Optimus (dual-gpu) laptops seem to have their own form of D3cold, but unfortunately enter it on normal D3 transitions via the ACPI callback. So when we use runtime PM to transition to D3, the card disappears off the PCI bus, however we then try to access registers on it in the runtime suspend finish, which really doesn't work. This patch checks whether the pci state is saved and doesn't attempt to hit any registers after that point if it is. (Looks okay to Rafael) Signed-off-by: Dave Airlie Signed-off-by: Bjorn Helgaas --- diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index 94c6e2aa03d6..11d9c8a9d0d0 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -1023,10 +1023,10 @@ static int pci_pm_runtime_suspend(struct device *dev) return 0; } - if (!pci_dev->state_saved) + if (!pci_dev->state_saved) { pci_save_state(pci_dev); - - pci_finish_runtime_suspend(pci_dev); + pci_finish_runtime_suspend(pci_dev); + } return 0; }