diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2011-02-17 11:11:28 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2011-02-17 12:02:22 +1000 |
| commit | 317495b25ec1f0beb0dbac8ee0dfec59a1addf03 (patch) | |
| tree | fc852b103f4e1c0bcce036f910d3485c5097cd0a /drivers | |
| parent | b8884da6113be83f6f3b296539bcd9f602a6abd8 (diff) | |
| download | linux-3.10-317495b25ec1f0beb0dbac8ee0dfec59a1addf03.tar.gz linux-3.10-317495b25ec1f0beb0dbac8ee0dfec59a1addf03.tar.bz2 linux-3.10-317495b25ec1f0beb0dbac8ee0dfec59a1addf03.zip | |
drm/nouveau: fix suspend/resume on GPUs that don't have PM support
This has been broken since 2.6.37, and fixes resume on a couple of fermi
boards I have access to.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_pm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_pm.c b/drivers/gpu/drm/nouveau/nouveau_pm.c index f05c0cddfec..4399e2f34db 100644 --- a/drivers/gpu/drm/nouveau/nouveau_pm.c +++ b/drivers/gpu/drm/nouveau/nouveau_pm.c @@ -543,7 +543,7 @@ nouveau_pm_resume(struct drm_device *dev) struct nouveau_pm_engine *pm = &dev_priv->engine.pm; struct nouveau_pm_level *perflvl; - if (pm->cur == &pm->boot) + if (!pm->cur || pm->cur == &pm->boot) return; perflvl = pm->cur; |