Skip to contentSkip to conversation

nouveau: move the hotplug ignore to correct place.

PATCH New Dave Airlie 1 participant 1 message Dec 2, 2014

Subsystems (3)
DRM drivers DRM misc nouveau
lore
Share & tools
lore

Dave Airlie

author maintainer
#0 lore raw

PATCH 1/1 nouveau: move the hotplug ignore to correct place.

From: Dave Airlie <[email protected]>

Introduced in b440bde74f, however it was added to the wrong function in nouveau.

https://bugzilla.kernel.org/show_bug.cgi?id=86011

Cc Bjorn Helgaas <[email protected]>
CC [email protected] # v3.15+
Signed-off-by Dave Airlie <[email protected]>
---
 drivers/gpu/drm/nouveau/nouveau_drm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/nouveau/nouveau_drm.c +1 -1
index 5723807..62b97c4 100644
@@ -629,7 +629,6 @@ int nouveau_pmops_suspend(struct device *dev)
 
 	pci_save_state(pdev);
 	pci_disable_device(pdev);
-	pci_ignore_hotplug(pdev);
 	pci_set_power_state(pdev, PCI_D3hot);
 	return 0;
 }

@@ -933,6 +932,7 @@ static int nouveau_pmops_runtime_suspend(struct device *dev)
 	ret = nouveau_do_suspend(drm_dev, true);
 	pci_save_state(pdev);
 	pci_disable_device(pdev);
+	pci_ignore_hotplug(pdev);
 	pci_set_power_state(pdev, PCI_D3cold);
 	drm_dev->switch_power_state = DRM_SWITCH_POWER_DYNAMIC_OFF;
 	return ret;
Signature · 6 lines
1.9.3

_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel