From: Ben Skeggs <bskeggs@redhat.com>
Date: Thu, 17 Feb 2011 01:11:28 +0000 (+1000)
Subject: drm/nouveau: fix suspend/resume on GPUs that don't have PM support
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=317495b25ec1f0beb0dbac8ee0dfec59a1addf03;p=linux.git

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>
---

diff --git a/drivers/gpu/drm/nouveau/nouveau_pm.c b/drivers/gpu/drm/nouveau/nouveau_pm.c
index f05c0cddfecab..4399e2f34db41 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;