projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'topic/drm-misc-2015-07-23' of git://anongit.freedesktop.org/drm-intel...
[linux-2.6-block.git]
/
drivers
/
gpu
/
drm
/
nouveau
/
nouveau_drm.c
diff --git
a/drivers/gpu/drm/nouveau/nouveau_drm.c
b/drivers/gpu/drm/nouveau/nouveau_drm.c
index 9624b3827c349ae503c65fd5ee138988cf37f1ab..36b40c9252b5df3f7aac5608957f78e9c887aa4f 100644
(file)
--- a/
drivers/gpu/drm/nouveau/nouveau_drm.c
+++ b/
drivers/gpu/drm/nouveau/nouveau_drm.c
@@
-23,6
+23,7
@@
*/
#include <linux/console.h>
+#include <linux/delay.h>
#include <linux/module.h>
#include <linux/pci.h>
#include <linux/pm_runtime.h>
@@
-666,6
+667,7
@@
nouveau_pmops_suspend(struct device *dev)
pci_save_state(pdev);
pci_disable_device(pdev);
pci_set_power_state(pdev, PCI_D3hot);
+ udelay(200);
return 0;
}