From d639b4f5ba5f1bbdfbba920e1deb035a1bed83ae Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Tue, 4 Dec 2012 13:25:26 +1000 Subject: [PATCH] drm/nouveau/therm: collect fan tach info in common fan constructor This info will be used by two more implementations in upcoming commits. Signed-off-by: Ben Skeggs Signed-off-by: Martin Peres --- drivers/gpu/drm/nouveau/core/subdev/therm/fan.c | 15 +++++++++++---- drivers/gpu/drm/nouveau/core/subdev/therm/priv.h | 7 ++++++- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/nouveau/core/subdev/therm/fan.c b/drivers/gpu/drm/nouveau/core/subdev/therm/fan.c index 5231786..4822733 100644 --- a/drivers/gpu/drm/nouveau/core/subdev/therm/fan.c +++ b/drivers/gpu/drm/nouveau/core/subdev/therm/fan.c @@ -27,6 +27,7 @@ #include #include + #include #include @@ -104,13 +105,13 @@ nouveau_therm_fan_set(struct nouveau_therm *therm, int percent) int nouveau_therm_fan_sense(struct nouveau_therm *therm) { + struct nouveau_therm_priv *priv = (void *)therm; struct nouveau_timer *ptimer = nouveau_timer(therm); struct nouveau_gpio *gpio = nouveau_gpio(therm); - struct dcb_gpio_func func; u32 cycles, cur, prev; u64 start, end, tach; - if (gpio->find(gpio, 0, DCB_GPIO_FAN_SENSE, 0xff, &func)) + if (priv->fan.tach.func == DCB_GPIO_UNUSED) return -ENODEV; /* Time a complete rotation and extrapolate to RPM: @@ -118,12 +119,12 @@ nouveau_therm_fan_sense(struct nouveau_therm *therm) * We get 4 changes (0 -> 1 -> 0 -> 1) per complete rotation. */ start = ptimer->read(ptimer); - prev = gpio->get(gpio, 0, func.func, func.line); + prev = gpio->get(gpio, 0, priv->fan.tach.func, priv->fan.tach.line); cycles = 0; do { usleep_range(500, 1000); /* supports 0 < rpm < 7500 */ - cur = gpio->get(gpio, 0, func.func, func.line); + cur = gpio->get(gpio, 0, priv->fan.tach.func, priv->fan.tach.line); if (prev != cur) { if (!start) start = ptimer->read(ptimer); @@ -220,7 +221,13 @@ int nouveau_therm_fan_ctor(struct nouveau_therm *therm) { struct nouveau_therm_priv *priv = (void *)therm; + struct nouveau_gpio *gpio = nouveau_gpio(therm); struct nouveau_bios *bios = nouveau_bios(therm); + int ret; + + ret = gpio->find(gpio, 0, DCB_GPIO_FAN_SENSE, 0xff, &priv->fan.tach); + if (ret) + priv->fan.tach.func = DCB_GPIO_UNUSED; nouveau_therm_fan_set_defaults(therm); nvbios_perf_fan_parse(bios, &priv->bios_perf_fan); diff --git a/drivers/gpu/drm/nouveau/core/subdev/therm/priv.h b/drivers/gpu/drm/nouveau/core/subdev/therm/priv.h index 64f4a4a..33fbc59 100644 --- a/drivers/gpu/drm/nouveau/core/subdev/therm/priv.h +++ b/drivers/gpu/drm/nouveau/core/subdev/therm/priv.h @@ -28,6 +28,7 @@ #include #include +#include #include #include @@ -44,6 +45,8 @@ struct nouveau_therm_priv { enum nouveau_therm_fan_mode mode; int percent; + struct dcb_gpio_func tach; + int (*pwm_get)(struct nouveau_therm *, int line, u32*, u32*); int (*pwm_set)(struct nouveau_therm *, int line, u32, u32); int (*pwm_clock)(struct nouveau_therm *); @@ -70,9 +73,11 @@ int nouveau_therm_fan_user_set(struct nouveau_therm *therm, int percent); int nouveau_therm_fan_set_mode(struct nouveau_therm *therm, enum nouveau_therm_fan_mode mode); - int nouveau_therm_fan_sense(struct nouveau_therm *therm); +int nv50_fan_pwm_get(struct nouveau_therm *, int, u32 *, u32 *); +int nv50_fan_pwm_set(struct nouveau_therm *, int, u32, u32); +int nv50_fan_pwm_clock(struct nouveau_therm *); int nv50_temp_get(struct nouveau_therm *therm); #endif -- 2.7.4