summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nouveau_pm.c
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2011-11-21 21:28:28 +1000
committerBen Skeggs <bskeggs@redhat.com>2011-12-21 19:01:44 +1000
commit675aac033e089833e763ea4fbabae66883d10574 (patch)
tree69e16cb4743d72b36d54bcffa57bf06b9eb449cc /drivers/gpu/drm/nouveau/nouveau_pm.c
parentc8b9641a9146b13d34824f99c3d22c8c0c3a06bd (diff)
downloadblackbird-op-linux-675aac033e089833e763ea4fbabae66883d10574.tar.gz
blackbird-op-linux-675aac033e089833e763ea4fbabae66883d10574.zip
drm/nouveau: just pass gpio line to pwm_*, not entire gpio struct
We don't need more than the line id to determine the PWM controller, and the GPIO interfaces are about to change somewhat. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_pm.c')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_pm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_pm.c b/drivers/gpu/drm/nouveau/nouveau_pm.c
index 1442d0673671..788ba33da77c 100644
--- a/drivers/gpu/drm/nouveau/nouveau_pm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_pm.c
@@ -49,7 +49,7 @@ nouveau_pwmfan_get(struct drm_device *dev)
gpio = nouveau_bios_gpio_entry(dev, DCB_GPIO_PWM_FAN);
if (gpio) {
- ret = pm->pwm_get(dev, gpio, &divs, &duty);
+ ret = pm->pwm_get(dev, gpio->line, &divs, &duty);
if (ret == 0) {
divs = max(divs, duty);
if (dev_priv->card_type <= NV_40 ||
@@ -90,7 +90,7 @@ nouveau_pwmfan_set(struct drm_device *dev, int percent)
(gpio->state[0] & 1))
duty = divs - duty;
- return pm->pwm_set(dev, gpio, divs, duty);
+ return pm->pwm_set(dev, gpio->line, divs, duty);
}
return -ENODEV;
OpenPOWER on IntegriCloud