diff options
| author | Lukas Wunner <lukas@wunner.de> | 2015-04-19 17:18:01 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-06-26 10:26:37 +1000 |
| commit | c5fd936e992dd2829167d2adc63e151675ca6898 (patch) | |
| tree | c918bba01de7222dfc52cc736dbfd23a9966c1ab /drivers/gpu | |
| parent | 6b8eeca65b18ae77e175cc2b6571731f0ee413bf (diff) | |
| download | op-kernel-dev-c5fd936e992dd2829167d2adc63e151675ca6898.zip op-kernel-dev-c5fd936e992dd2829167d2adc63e151675ca6898.tar.gz | |
drm/nouveau: Pause between setting gpu to D3hot and cutting the power
On the MacBook Pro, power of the gpu is cut by a gmux chip. Sometimes
the gpu gets stuck in powersaving mode and refuses to wake up
("Refused to change power state, currently in D3"). Inserting a
delay between setting the gpu to D3hot and cutting the power seems
to help (most of the time). This issue and its (partial) remediation
by the patch was observed with an Nvidia GT650M (NVE7 / GK107).
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_drm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c index 8904933..649024d 100644 --- 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; } |
