From: Ben Skeggs <bskeggs@redhat.com>
Date: Wed, 7 Mar 2012 04:18:49 +0000 (+1000)
Subject: drm/nouveau/pm: fix oops if chipset has no pm support at all
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=c11dd0da5277596d0ccdccb745b273d69a94f2d7;p=openwrt%2Fstaging%2Fblogic.git

drm/nouveau/pm: fix oops if chipset has no pm support at all

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 dcc16927716f..34d591b7d4ef 100644
--- a/drivers/gpu/drm/nouveau/nouveau_pm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_pm.c
@@ -284,9 +284,11 @@ nouveau_pm_perflvl_get(struct drm_device *dev, struct nouveau_pm_level *perflvl)
 
 	memset(perflvl, 0, sizeof(*perflvl));
 
-	ret = pm->clocks_get(dev, perflvl);
-	if (ret)
-		return ret;
+	if (pm->clocks_get) {
+		ret = pm->clocks_get(dev, perflvl);
+		if (ret)
+			return ret;
+	}
 
 	if (pm->voltage.supported && pm->voltage_get) {
 		ret = pm->voltage_get(dev);