diff options
| author | Martin Peres <martin.peres@ensi-bourges.fr> | 2011-08-20 16:37:06 +0200 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2012-03-13 17:06:11 +1000 |
| commit | b1aa5531cc74ea023ad35e9cf5872112a15b4f70 (patch) | |
| tree | 8040f29fb58c8dccb9f6076409bbf9e30589a474 /drivers/gpu | |
| parent | bc6389e4fa1a6535021ffc4d3b37d48f9a0542e2 (diff) | |
| download | linux-b1aa5531cc74ea023ad35e9cf5872112a15b4f70.tar.gz | |
drm/nouveau: move pwm_divisor to the nouveau_pm_fan struct
Signed-off-by: Martin Peres <martin.peres@labri.fr>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_drv.h | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_perf.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_pm.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h index 378c64c2973e..78302cccf6fd 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drv.h +++ b/drivers/gpu/drm/nouveau/nouveau_drv.h @@ -523,6 +523,7 @@ struct nouveau_pm_fan { u32 min_duty; u32 max_duty; u32 pwm_freq; + u32 pwm_divisor; }; struct nouveau_pm_engine { @@ -533,7 +534,6 @@ struct nouveau_pm_engine { struct nouveau_pm_temp_sensor_constants sensor_constants; struct nouveau_pm_threshold_temp threshold_temp; struct nouveau_pm_fan fan; - u32 pwm_divisor; struct nouveau_pm_level boot; struct nouveau_pm_level *cur; diff --git a/drivers/gpu/drm/nouveau/nouveau_perf.c b/drivers/gpu/drm/nouveau/nouveau_perf.c index 54895cc60d2a..2ca26f39292a 100644 --- a/drivers/gpu/drm/nouveau/nouveau_perf.c +++ b/drivers/gpu/drm/nouveau/nouveau_perf.c @@ -206,7 +206,7 @@ nouveau_perf_init(struct drm_device *dev) recordlen = perf[3] + (perf[4] * perf[5]); entries = perf[2]; - pm->pwm_divisor = ROM16(perf[6]); + pm->fan.pwm_divisor = ROM16(perf[6]); } else { recordlen = perf[2] + (perf[3] * perf[4]); entries = perf[5]; diff --git a/drivers/gpu/drm/nouveau/nouveau_pm.c b/drivers/gpu/drm/nouveau/nouveau_pm.c index 0c79f060f7f1..5ee5ca6166aa 100644 --- a/drivers/gpu/drm/nouveau/nouveau_pm.c +++ b/drivers/gpu/drm/nouveau/nouveau_pm.c @@ -77,7 +77,7 @@ nouveau_pwmfan_set(struct drm_device *dev, int percent) ret = nouveau_gpio_find(dev, 0, DCB_GPIO_PWM_FAN, 0xff, &gpio); if (ret == 0) { - divs = pm->pwm_divisor; + divs = pm->fan.pwm_divisor; if (pm->fan.pwm_freq) { /*XXX: PNVIO clock more than likely... */ divs = 135000 / pm->fan.pwm_freq; |