aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2011-11-09 22:20:14 -0500
committerBen Skeggs <bskeggs@redhat.com>2011-12-21 04:01:33 -0500
commitd2edab4acffb35a6e24259886d377774efd37e6e (patch)
tree3ac54008a2e14f530cd5261ba8e69f1292dcbef8
parentd4676461a75699ec0f6d271e3fe75ee631755c6e (diff)
drm/nouveau/pm: fix missing volt changes when boot voltage is undefined
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_pm.c2
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 c6ebf693ffb8..1442d0673671 100644
--- a/drivers/gpu/drm/nouveau/nouveau_pm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_pm.c
@@ -117,7 +117,7 @@ nouveau_pm_perflvl_aux(struct drm_device *dev, struct nouveau_pm_level *perflvl,
117 } 117 }
118 118
119 if (pm->voltage.supported && pm->voltage_set) { 119 if (pm->voltage.supported && pm->voltage_set) {
120 if (a->volt_min && b->volt_min && b->volt_min > a->volt_min) { 120 if (perflvl->volt_min && b->volt_min > a->volt_min) {
121 ret = pm->voltage_set(dev, perflvl->volt_min); 121 ret = pm->voltage_set(dev, perflvl->volt_min);
122 if (ret) { 122 if (ret) {
123 NV_ERROR(dev, "voltage set failed: %d\n", ret); 123 NV_ERROR(dev, "voltage set failed: %d\n", ret);