drm/nouveau/therm: cleanly separate pwm control logic from therm
authorBen Skeggs <bskeggs@redhat.com>
Wed, 5 Dec 2012 06:21:59 +0000 (16:21 +1000)
committerBen Skeggs <bskeggs@redhat.com>
Wed, 20 Feb 2013 06:00:18 +0000 (16:00 +1000)
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Martin Peres <martin.peres@labri.fr>
drivers/gpu/drm/nouveau/Makefile
drivers/gpu/drm/nouveau/core/include/subdev/therm.h
drivers/gpu/drm/nouveau/core/subdev/therm/base.c
drivers/gpu/drm/nouveau/core/subdev/therm/fan.c
drivers/gpu/drm/nouveau/core/subdev/therm/fannil.c [new file with mode: 0644]
drivers/gpu/drm/nouveau/core/subdev/therm/fanpwm.c [new file with mode: 0644]
drivers/gpu/drm/nouveau/core/subdev/therm/nv40.c
drivers/gpu/drm/nouveau/core/subdev/therm/nv50.c
drivers/gpu/drm/nouveau/core/subdev/therm/nva3.c
drivers/gpu/drm/nouveau/core/subdev/therm/nvd0.c
drivers/gpu/drm/nouveau/core/subdev/therm/priv.h

index 7938d1a9ddd31a949834d47dc9c2eb71b5e7a8d7..c58d66cbef4c93dd4ba35ce526693d7e93db2eb4 100644 (file)
@@ -106,6 +106,8 @@ nouveau-y += core/subdev/mxm/mxms.o
 nouveau-y += core/subdev/mxm/nv50.o
 nouveau-y += core/subdev/therm/base.o
 nouveau-y += core/subdev/therm/fan.o
+nouveau-y += core/subdev/therm/fannil.o
+nouveau-y += core/subdev/therm/fanpwm.o
 nouveau-y += core/subdev/therm/ic.o
 nouveau-y += core/subdev/therm/temp.o
 nouveau-y += core/subdev/therm/nv40.o
index a96d43ad972bf39d1dc993499a59019757a5576b..ad3aea01635a2ed021c272d767785303dafed5f7 100644 (file)
@@ -28,6 +28,11 @@ enum nouveau_therm_attr_type {
 struct nouveau_therm {
        struct nouveau_subdev base;
 
+       int (*pwm_ctrl)(struct nouveau_therm *, int line, bool);
+       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 *);
+
        int (*fan_get)(struct nouveau_therm *);
        int (*fan_set)(struct nouveau_therm *, int);
        int (*fan_sense)(struct nouveau_therm *);
@@ -47,8 +52,10 @@ nouveau_therm(void *obj)
 
 #define nouveau_therm_create(p,e,o,d)                                          \
        nouveau_therm_create_((p), (e), (o), sizeof(**d), (void **)d)
-#define nouveau_therm_destroy(p)                                               \
-       nouveau_subdev_destroy(&(p)->base)
+#define nouveau_therm_destroy(p) ({                                            \
+       struct nouveau_therm *therm = (p);                                     \
+        _nouveau_therm_dtor(nv_object(therm));                                 \
+})
 #define nouveau_therm_init(p) ({                                               \
        struct nouveau_therm *therm = (p);                                     \
         _nouveau_therm_init(nv_object(therm));                                 \
@@ -58,12 +65,11 @@ nouveau_therm(void *obj)
         _nouveau_therm_init(nv_object(therm), (s));                            \
 })
 
-int nouveau_therm_create_(struct nouveau_object *, struct nouveau_object *,
-                         struct nouveau_oclass *, int, void **);
-
-#define _nouveau_therm_dtor _nouveau_subdev_dtor
-int _nouveau_therm_init(struct nouveau_object *);
-int _nouveau_therm_fini(struct nouveau_object *, bool);
+int  nouveau_therm_create_(struct nouveau_object *, struct nouveau_object *,
+                          struct nouveau_oclass *, int, void **);
+void _nouveau_therm_dtor(struct nouveau_object *);
+int  _nouveau_therm_init(struct nouveau_object *);
+int  _nouveau_therm_fini(struct nouveau_object *, bool);
 
 extern struct nouveau_oclass nv40_therm_oclass;
 extern struct nouveau_oclass nv50_therm_oclass;
index 6260eacb92bd6c92d6b2a7cf2e5d59930a5bb65a..4ebd3c86f8e1f09afb9fb04fe9f665753ca1fb53 100644 (file)
@@ -37,11 +37,11 @@ nouveau_therm_attr_get(struct nouveau_therm *therm,
 
        switch (type) {
        case NOUVEAU_THERM_ATTR_FAN_MIN_DUTY:
-               return priv->bios_fan.min_duty;
+               return priv->fan->bios.min_duty;
        case NOUVEAU_THERM_ATTR_FAN_MAX_DUTY:
-               return priv->bios_fan.max_duty;
+               return priv->fan->bios.max_duty;
        case NOUVEAU_THERM_ATTR_FAN_MODE:
-               return priv->fan.mode;
+               return priv->fan->mode;
        case NOUVEAU_THERM_ATTR_THRS_FAN_BOOST:
                return priv->bios_sensor.thrs_fan_boost.temp;
        case NOUVEAU_THERM_ATTR_THRS_FAN_BOOST_HYST:
@@ -73,16 +73,16 @@ nouveau_therm_attr_set(struct nouveau_therm *therm,
        case NOUVEAU_THERM_ATTR_FAN_MIN_DUTY:
                if (value < 0)
                        value = 0;
-               if (value > priv->bios_fan.max_duty)
-                       value = priv->bios_fan.max_duty;
-               priv->bios_fan.min_duty = value;
+               if (value > priv->fan->bios.max_duty)
+                       value = priv->fan->bios.max_duty;
+               priv->fan->bios.min_duty = value;
                return 0;
        case NOUVEAU_THERM_ATTR_FAN_MAX_DUTY:
                if (value < 0)
                        value = 0;
-               if (value < priv->bios_fan.min_duty)
-                       value = priv->bios_fan.min_duty;
-               priv->bios_fan.max_duty = value;
+               if (value < priv->fan->bios.min_duty)
+                       value = priv->fan->bios.min_duty;
+               priv->fan->bios.max_duty = value;
                return 0;
        case NOUVEAU_THERM_ATTR_FAN_MODE:
                return nouveau_therm_fan_set_mode(therm, value);
@@ -126,8 +126,8 @@ _nouveau_therm_init(struct nouveau_object *object)
        if (ret)
                return ret;
 
-       if (priv->fan.percent >= 0)
-               therm->fan_set(therm, priv->fan.percent);
+       if (priv->fan->percent >= 0)
+               therm->fan_set(therm, priv->fan->percent);
 
        return 0;
 }
@@ -138,7 +138,7 @@ _nouveau_therm_fini(struct nouveau_object *object, bool suspend)
        struct nouveau_therm *therm = (void *)object;
        struct nouveau_therm_priv *priv = (void *)therm;
 
-       priv->fan.percent = therm->fan_get(therm);
+       priv->fan->percent = therm->fan_get(therm);
 
        return nouveau_subdev_fini(&therm->base, suspend);
 }
@@ -158,10 +158,6 @@ nouveau_therm_create_(struct nouveau_object *parent,
        if (ret)
                return ret;
 
-       nouveau_therm_ic_ctor(&priv->base);
-       nouveau_therm_sensor_ctor(&priv->base);
-       nouveau_therm_fan_ctor(&priv->base);
-
        priv->base.fan_get = nouveau_therm_fan_user_get;
        priv->base.fan_set = nouveau_therm_fan_user_set;
        priv->base.fan_sense = nouveau_therm_fan_sense;
@@ -169,3 +165,20 @@ nouveau_therm_create_(struct nouveau_object *parent,
        priv->base.attr_set = nouveau_therm_attr_set;
        return 0;
 }
+
+int
+nouveau_therm_preinit(struct nouveau_therm *therm)
+{
+       nouveau_therm_ic_ctor(therm);
+       nouveau_therm_sensor_ctor(therm);
+       nouveau_therm_fan_ctor(therm);
+       return 0;
+}
+
+void
+_nouveau_therm_dtor(struct nouveau_object *object)
+{
+       struct nouveau_therm_priv *priv = (void *)object;
+       kfree(priv->fan);
+       nouveau_subdev_destroy(&priv->base.base);
+}
index b4d14490d09e991c0eac5cac2b6a7835146f441e..e2fbddd56673e7d25ca0f9583eba89792825007d 100644 (file)
@@ -35,73 +35,23 @@ int
 nouveau_therm_fan_get(struct nouveau_therm *therm)
 {
        struct nouveau_therm_priv *priv = (void *)therm;
-       struct nouveau_gpio *gpio = nouveau_gpio(therm);
-       struct dcb_gpio_func func;
-       int card_type = nv_device(therm)->card_type;
-       u32 divs, duty;
-       int ret;
-
-       if (!priv->fan.pwm_get)
-               return -ENODEV;
-
-       ret = gpio->find(gpio, 0, DCB_GPIO_PWM_FAN, 0xff, &func);
-       if (ret == 0) {
-               ret = priv->fan.pwm_get(therm, func.line, &divs, &duty);
-               if (ret == 0 && divs) {
-                       divs = max(divs, duty);
-                       if (card_type <= NV_40 || (func.log[0] & 1))
-                               duty = divs - duty;
-                       return (duty * 100) / divs;
-               }
-
-               return gpio->get(gpio, 0, func.func, func.line) * 100;
-       }
-
-       return -ENODEV;
+       return priv->fan->get(therm);
 }
 
 int
 nouveau_therm_fan_set(struct nouveau_therm *therm, int percent)
 {
        struct nouveau_therm_priv *priv = (void *)therm;
-       struct nouveau_gpio *gpio = nouveau_gpio(therm);
-       struct dcb_gpio_func func;
-       int card_type = nv_device(therm)->card_type;
-       u32 divs, duty;
-       int ret;
-
-       if (priv->fan.mode == FAN_CONTROL_NONE)
-               return -EINVAL;
 
-       if (!priv->fan.pwm_set)
-               return -ENODEV;
-
-       if (percent < priv->bios_fan.min_duty)
-               percent = priv->bios_fan.min_duty;
-       if (percent > priv->bios_fan.max_duty)
-               percent = priv->bios_fan.max_duty;
-
-       ret = gpio->find(gpio, 0, DCB_GPIO_PWM_FAN, 0xff, &func);
-       if (ret == 0) {
-               divs = priv->bios_perf_fan.pwm_divisor;
-               if (priv->bios_fan.pwm_freq) {
-                       divs = 1;
-                       if (priv->fan.pwm_clock)
-                               divs = priv->fan.pwm_clock(therm);
-                       divs /= priv->bios_fan.pwm_freq;
-               }
-
-               duty = ((divs * percent) + 99) / 100;
-               if (card_type <= NV_40 || (func.log[0] & 1))
-                       duty = divs - duty;
+       if (percent < priv->fan->bios.min_duty)
+               percent = priv->fan->bios.min_duty;
+       if (percent > priv->fan->bios.max_duty)
+               percent = priv->fan->bios.max_duty;
 
-               ret = priv->fan.pwm_set(therm, func.line, divs, duty);
-               if (ret == 0)
-                       ret = priv->fan.pwm_ctrl(therm, func.line, true);
-               return ret;
-       }
+       if (priv->fan->mode == FAN_CONTROL_NONE)
+               return -EINVAL;
 
-       return -ENODEV;
+       return priv->fan->set(therm, percent);
 }
 
 int
@@ -113,7 +63,7 @@ nouveau_therm_fan_sense(struct nouveau_therm *therm)
        u32 cycles, cur, prev;
        u64 start, end, tach;
 
-       if (priv->fan.tach.func == DCB_GPIO_UNUSED)
+       if (priv->fan->tach.func == DCB_GPIO_UNUSED)
                return -ENODEV;
 
        /* Time a complete rotation and extrapolate to RPM:
@@ -121,12 +71,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, priv->fan.tach.func, priv->fan.tach.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, priv->fan.tach.func, priv->fan.tach.line);
+               cur = gpio->get(gpio, 0, priv->fan->tach.func, priv->fan->tach.line);
                if (prev != cur) {
                        if (!start)
                                start = ptimer->read(ptimer);
@@ -150,7 +100,7 @@ nouveau_therm_fan_set_mode(struct nouveau_therm *therm,
 {
        struct nouveau_therm_priv *priv = (void *)therm;
 
-       if (priv->fan.mode == mode)
+       if (priv->fan->mode == mode)
                return 0;
 
        if (mode < FAN_CONTROL_NONE || mode >= FAN_CONTROL_NR)
@@ -168,7 +118,7 @@ nouveau_therm_fan_set_mode(struct nouveau_therm *therm,
                break;
        }
 
-       priv->fan.mode = mode;
+       priv->fan->mode = mode;
        return 0;
 }
 
@@ -183,7 +133,7 @@ nouveau_therm_fan_user_set(struct nouveau_therm *therm, int percent)
 {
        struct nouveau_therm_priv *priv = (void *)therm;
 
-       if (priv->fan.mode != FAN_CONTROL_MANUAL)
+       if (priv->fan->mode != FAN_CONTROL_MANUAL)
                return -EINVAL;
 
        return nouveau_therm_fan_set(therm, percent);
@@ -194,9 +144,9 @@ nouveau_therm_fan_set_defaults(struct nouveau_therm *therm)
 {
        struct nouveau_therm_priv *priv = (void *)therm;
 
-       priv->bios_fan.pwm_freq = 0;
-       priv->bios_fan.min_duty = 0;
-       priv->bios_fan.max_duty = 100;
+       priv->fan->bios.pwm_freq = 0;
+       priv->fan->bios.min_duty = 0;
+       priv->fan->bios.max_duty = 100;
 }
 
 
@@ -205,13 +155,13 @@ nouveau_therm_fan_safety_checks(struct nouveau_therm *therm)
 {
        struct nouveau_therm_priv *priv = (void *)therm;
 
-       if (priv->bios_fan.min_duty > 100)
-               priv->bios_fan.min_duty = 100;
-       if (priv->bios_fan.max_duty > 100)
-               priv->bios_fan.max_duty = 100;
+       if (priv->fan->bios.min_duty > 100)
+               priv->fan->bios.min_duty = 100;
+       if (priv->fan->bios.max_duty > 100)
+               priv->fan->bios.max_duty = 100;
 
-       if (priv->bios_fan.min_duty > priv->bios_fan.max_duty)
-               priv->bios_fan.min_duty = priv->bios_fan.max_duty;
+       if (priv->fan->bios.min_duty > priv->fan->bios.max_duty)
+               priv->fan->bios.min_duty = priv->fan->bios.max_duty;
 }
 
 int nouveau_fan_pwm_clock_dummy(struct nouveau_therm *therm)
@@ -225,15 +175,29 @@ 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);
+       struct dcb_gpio_func func;
        int ret;
 
-       ret = gpio->find(gpio, 0, DCB_GPIO_FAN_SENSE, 0xff, &priv->fan.tach);
+       /* attempt to locate a drivable fan, and determine control method */
+       ret = gpio->find(gpio, 0, DCB_GPIO_PWM_FAN, 0xff, &func);
+       if (ret == 0)
+               ret = nouveau_fanpwm_create(therm, &func);
+       if (ret)
+               ret = nouveau_fannil_create(therm);
+       if (ret)
+               return ret;
+
+       nv_info(therm, "FAN control: %s\n", priv->fan->type);
+
+       /* attempt to detect a tachometer connection */
+       ret = gpio->find(gpio, 0, DCB_GPIO_FAN_SENSE, 0xff, &priv->fan->tach);
        if (ret)
-               priv->fan.tach.func = DCB_GPIO_UNUSED;
+               priv->fan->tach.func = DCB_GPIO_UNUSED;
 
+       /* other random init... */
        nouveau_therm_fan_set_defaults(therm);
-       nvbios_perf_fan_parse(bios, &priv->bios_perf_fan);
-       if (nvbios_therm_fan_parse(bios, &priv->bios_fan))
+       nvbios_perf_fan_parse(bios, &priv->fan->perf);
+       if (nvbios_therm_fan_parse(bios, &priv->fan->bios))
                nv_error(therm, "parsing the thermal table failed\n");
        nouveau_therm_fan_safety_checks(therm);
 
diff --git a/drivers/gpu/drm/nouveau/core/subdev/therm/fannil.c b/drivers/gpu/drm/nouveau/core/subdev/therm/fannil.c
new file mode 100644 (file)
index 0000000..82f0432
--- /dev/null
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2012 Red Hat Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors: Ben Skeggs
+ */
+
+#include "priv.h"
+
+static int
+nouveau_fannil_get(struct nouveau_therm *therm)
+{
+       return -ENODEV;
+}
+
+int
+nouveau_fannil_set(struct nouveau_therm *therm, int percent)
+{
+       return -ENODEV;
+}
+
+int
+nouveau_fannil_create(struct nouveau_therm *therm)
+{
+       struct nouveau_therm_priv *tpriv = (void *)therm;
+       struct nouveau_fan *priv;
+
+       priv = kzalloc(sizeof(*priv), GFP_KERNEL);
+       tpriv->fan = priv;
+       if (!priv)
+               return -ENOMEM;
+
+       priv->type = "none / external";
+       priv->get = nouveau_fannil_get;
+       priv->set = nouveau_fannil_set;
+       return 0;
+}
diff --git a/drivers/gpu/drm/nouveau/core/subdev/therm/fanpwm.c b/drivers/gpu/drm/nouveau/core/subdev/therm/fanpwm.c
new file mode 100644 (file)
index 0000000..5f71db8
--- /dev/null
@@ -0,0 +1,107 @@
+/*
+ * Copyright 2012 Red Hat Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors: Ben Skeggs
+ *         Martin Peres
+ */
+
+#include <core/option.h>
+#include <subdev/gpio.h>
+
+#include "priv.h"
+
+struct nouveau_fanpwm_priv {
+       struct nouveau_fan base;
+       struct dcb_gpio_func func;
+};
+
+static int
+nouveau_fanpwm_get(struct nouveau_therm *therm)
+{
+       struct nouveau_therm_priv *tpriv = (void *)therm;
+       struct nouveau_fanpwm_priv *priv = (void *)tpriv->fan;
+       struct nouveau_gpio *gpio = nouveau_gpio(therm);
+       int card_type = nv_device(therm)->card_type;
+       u32 divs, duty;
+       int ret;
+
+       ret = therm->pwm_get(therm, priv->func.line, &divs, &duty);
+       if (ret == 0 && divs) {
+               divs = max(divs, duty);
+               if (card_type <= NV_40 || (priv->func.log[0] & 1))
+                       duty = divs - duty;
+               return (duty * 100) / divs;
+       }
+
+       return gpio->get(gpio, 0, priv->func.func, priv->func.line) * 100;
+}
+
+static int
+nouveau_fanpwm_set(struct nouveau_therm *therm, int percent)
+{
+       struct nouveau_therm_priv *tpriv = (void *)therm;
+       struct nouveau_fanpwm_priv *priv = (void *)tpriv->fan;
+       int card_type = nv_device(therm)->card_type;
+       u32 divs, duty;
+       int ret;
+
+       divs = priv->base.perf.pwm_divisor;
+       if (priv->base.bios.pwm_freq) {
+               divs = 1;
+               if (therm->pwm_clock)
+                       divs = therm->pwm_clock(therm);
+               divs /= priv->base.bios.pwm_freq;
+       }
+
+       duty = ((divs * percent) + 99) / 100;
+       if (card_type <= NV_40 || (priv->func.log[0] & 1))
+               duty = divs - duty;
+
+       ret = therm->pwm_set(therm, priv->func.line, divs, duty);
+       if (ret == 0)
+               ret = therm->pwm_ctrl(therm, priv->func.line, true);
+       return ret;
+}
+
+int
+nouveau_fanpwm_create(struct nouveau_therm *therm, struct dcb_gpio_func *func)
+{
+       struct nouveau_device *device = nv_device(therm);
+       struct nouveau_therm_priv *tpriv = (void *)therm;
+       struct nouveau_fanpwm_priv *priv;
+       u32 divs, duty;
+
+       if (!nouveau_boolopt(device->cfgopt, "NvFanPWM", func->param) ||
+           !therm->pwm_ctrl ||
+            therm->pwm_get(therm, func->line, &divs, &duty) == -ENODEV)
+               return -ENODEV;
+
+       priv = kzalloc(sizeof(*priv), GFP_KERNEL);
+       tpriv->fan = &priv->base;
+       if (!priv)
+               return -ENOMEM;
+
+       priv->base.type = "PWM";
+       priv->base.get = nouveau_fanpwm_get;
+       priv->base.set = nouveau_fanpwm_set;
+       priv->func = *func;
+       return 0;
+}
index 47a15ecbe0087af99bcf25a35ad5784025ac0860..3f7c11500598c915f783647debacad867a5b9b88 100644 (file)
@@ -149,11 +149,11 @@ nv40_therm_ctor(struct nouveau_object *parent,
        if (ret)
                return ret;
 
-       priv->base.fan.pwm_ctrl = nv40_fan_pwm_ctrl;
-       priv->base.fan.pwm_get = nv40_fan_pwm_get;
-       priv->base.fan.pwm_set = nv40_fan_pwm_set;
+       priv->base.base.pwm_ctrl = nv40_fan_pwm_ctrl;
+       priv->base.base.pwm_get = nv40_fan_pwm_get;
+       priv->base.base.pwm_set = nv40_fan_pwm_set;
        priv->base.base.temp_get = nv40_temp_get;
-       return 0;
+       return nouveau_therm_preinit(&priv->base.base);
 }
 
 struct nouveau_oclass
index 6ebad82e4febc6723e79555d032a23b95023dbd4..8bb4c2a15efad30ec18feaddc9e859c416606380 100644 (file)
@@ -138,12 +138,12 @@ nv50_therm_ctor(struct nouveau_object *parent,
        if (ret)
                return ret;
 
-       priv->base.fan.pwm_ctrl = nv50_fan_pwm_ctrl;
-       priv->base.fan.pwm_get = nv50_fan_pwm_get;
-       priv->base.fan.pwm_set = nv50_fan_pwm_set;
-       priv->base.fan.pwm_clock = nv50_fan_pwm_clock;
+       priv->base.base.pwm_ctrl = nv50_fan_pwm_ctrl;
+       priv->base.base.pwm_get = nv50_fan_pwm_get;
+       priv->base.base.pwm_set = nv50_fan_pwm_set;
+       priv->base.base.pwm_clock = nv50_fan_pwm_clock;
        priv->base.base.temp_get = nv50_temp_get;
-       return 0;
+       return nouveau_therm_preinit(&priv->base.base);
 }
 
 struct nouveau_oclass
index 9a8daf4b36d5ac14cb3f326a2f114d9f971a174a..8625d219f5cad006aa79fcdc47295a45980f9ffe 100644 (file)
@@ -44,7 +44,7 @@ static int
 nva3_therm_init(struct nouveau_object *object)
 {
        struct nva3_therm_priv *priv = (void *)object;
-       struct dcb_gpio_func *tach = &priv->base.fan.tach;
+       struct dcb_gpio_func *tach = &priv->base.fan->tach;
        int ret;
 
        ret = nouveau_therm_init(&priv->base.base);
@@ -77,12 +77,13 @@ nva3_therm_ctor(struct nouveau_object *parent,
        if (ret)
                return ret;
 
-       priv->base.fan.pwm_get = nv50_fan_pwm_get;
-       priv->base.fan.pwm_set = nv50_fan_pwm_set;
-       priv->base.fan.pwm_clock = nv50_fan_pwm_clock;
+       priv->base.base.pwm_ctrl = nv50_fan_pwm_ctrl;
+       priv->base.base.pwm_get = nv50_fan_pwm_get;
+       priv->base.base.pwm_set = nv50_fan_pwm_set;
+       priv->base.base.pwm_clock = nv50_fan_pwm_clock;
        priv->base.base.temp_get = nv50_temp_get;
        priv->base.base.fan_sense = nva3_therm_fan_sense;
-       return 0;
+       return nouveau_therm_preinit(&priv->base.base);
 }
 
 struct nouveau_oclass
index ec06e895b6178be089fe82a1673df5832f5cf14c..e722dcd4e37bed188e4e990a9835078f27a830ad 100644 (file)
@@ -107,8 +107,8 @@ nvd0_therm_init(struct nouveau_object *object)
 
        /* enable fan tach, count revolutions per-second */
        nv_mask(priv, 0x00e720, 0x00000003, 0x00000002);
-       if (priv->base.fan.tach.func != DCB_GPIO_UNUSED) {
-               nv_mask(priv, 0x00d79c, 0x000000ff, priv->base.fan.tach.line);
+       if (priv->base.fan->tach.func != DCB_GPIO_UNUSED) {
+               nv_mask(priv, 0x00d79c, 0x000000ff, priv->base.fan->tach.line);
                nv_wr32(priv, 0x00e724, nv_device(priv)->crystal * 1000);
                nv_mask(priv, 0x00e720, 0x00000001, 0x00000001);
        }
@@ -131,13 +131,13 @@ nvd0_therm_ctor(struct nouveau_object *parent,
        if (ret)
                return ret;
 
-       priv->base.fan.pwm_ctrl = nvd0_fan_pwm_ctrl;
-       priv->base.fan.pwm_get = nvd0_fan_pwm_get;
-       priv->base.fan.pwm_set = nvd0_fan_pwm_set;
-       priv->base.fan.pwm_clock = nvd0_fan_pwm_clock;
+       priv->base.base.pwm_ctrl = nvd0_fan_pwm_ctrl;
+       priv->base.base.pwm_get = nvd0_fan_pwm_get;
+       priv->base.base.pwm_set = nvd0_fan_pwm_set;
+       priv->base.base.pwm_clock = nvd0_fan_pwm_clock;
        priv->base.base.temp_get = nv50_temp_get;
        priv->base.base.fan_sense = nva3_therm_fan_sense;
-       return 0;
+       return nouveau_therm_preinit(&priv->base.base);
 }
 
 struct nouveau_oclass
index a08ca85e43ffb30466fd0b01665cb7b253ca8f3b..fa939323a51279c027d2537e5bf07509ba56ce77 100644 (file)
 #include <subdev/bios/perf.h>
 #include <subdev/bios/therm.h>
 
+struct nouveau_fan {
+       const char *type;
+       enum nouveau_therm_fan_mode mode;
+       int percent;
+
+       struct nvbios_therm_fan bios;
+       struct nvbios_perf_fan perf;
+
+       int (*get)(struct nouveau_therm *therm);
+       int (*set)(struct nouveau_therm *therm, int percent);
+
+       struct dcb_gpio_func tach;
+};
+
 struct nouveau_therm_priv {
        struct nouveau_therm base;
 
        /* bios */
        struct nvbios_therm_sensor bios_sensor;
-       struct nvbios_therm_fan bios_fan;
-       struct nvbios_perf_fan bios_perf_fan;
 
        /* fan priv */
-       struct {
-               enum nouveau_therm_fan_mode mode;
-               int percent;
-
-               struct dcb_gpio_func tach;
-
-               int (*pwm_ctrl)(struct nouveau_therm *, int line, bool);
-               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 *);
-       } fan;
+       struct nouveau_fan *fan;
 
        /* ic */
        struct i2c_client *ic;
@@ -76,6 +78,9 @@ int nouveau_therm_fan_set_mode(struct nouveau_therm *therm,
 
 int nouveau_therm_fan_sense(struct nouveau_therm *therm);
 
+int nouveau_therm_preinit(struct nouveau_therm *);
+
+int nv50_fan_pwm_ctrl(struct nouveau_therm *, int, bool);
 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 *);
@@ -83,4 +88,7 @@ int nv50_temp_get(struct nouveau_therm *therm);
 
 int nva3_therm_fan_sense(struct nouveau_therm *);
 
+int nouveau_fanpwm_create(struct nouveau_therm *, struct dcb_gpio_func *);
+int nouveau_fannil_create(struct nouveau_therm *);
+
 #endif