From a4da2d95ef2d5688c53911df23b3706c5bf71ea7 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Thu, 10 Nov 2011 13:20:14 +1000 Subject: [PATCH] --- yaml --- r: 282621 b: refs/heads/master c: d2edab4acffb35a6e24259886d377774efd37e6e h: refs/heads/master i: 282619: 54bd915c6e5d58a26092eb8c2f1ad4944e26003a v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_pm.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3a3812199034..a9bc1a1063c0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d4676461a75699ec0f6d271e3fe75ee631755c6e +refs/heads/master: d2edab4acffb35a6e24259886d377774efd37e6e diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_pm.c b/trunk/drivers/gpu/drm/nouveau/nouveau_pm.c index c6ebf693ffb8..1442d0673671 100644 --- a/trunk/drivers/gpu/drm/nouveau/nouveau_pm.c +++ b/trunk/drivers/gpu/drm/nouveau/nouveau_pm.c @@ -117,7 +117,7 @@ nouveau_pm_perflvl_aux(struct drm_device *dev, struct nouveau_pm_level *perflvl, } if (pm->voltage.supported && pm->voltage_set) { - if (a->volt_min && b->volt_min && b->volt_min > a->volt_min) { + if (perflvl->volt_min && b->volt_min > a->volt_min) { ret = pm->voltage_set(dev, perflvl->volt_min); if (ret) { NV_ERROR(dev, "voltage set failed: %d\n", ret);