These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / gpu / drm / nouveau / nvkm / subdev / therm / gm107.c

diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gm107.c b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gm107.c
index 2fd110f..86848ec 100644 (file)
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gm107.c
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/therm/gm107.c
@@ -23,12 +23,6 @@
  */
 #include "priv.h"
 
-#include <core/device.h>
-
-struct gm107_therm_priv {
-       struct nvkm_therm_priv base;
-};
-
 static int
 gm107_fan_pwm_ctrl(struct nvkm_therm *therm, int line, bool enable)
 {
@@ -39,55 +33,43 @@ gm107_fan_pwm_ctrl(struct nvkm_therm *therm, int line, bool enable)
 static int
 gm107_fan_pwm_get(struct nvkm_therm *therm, int line, u32 *divs, u32 *duty)
 {
-       *divs = nv_rd32(therm, 0x10eb20) & 0x1fff;
-       *duty = nv_rd32(therm, 0x10eb24) & 0x1fff;
+       struct nvkm_device *device = therm->subdev.device;
+       *divs = nvkm_rd32(device, 0x10eb20) & 0x1fff;
+       *duty = nvkm_rd32(device, 0x10eb24) & 0x1fff;
        return 0;
 }
 
 static int
 gm107_fan_pwm_set(struct nvkm_therm *therm, int line, u32 divs, u32 duty)
 {
-       nv_mask(therm, 0x10eb10, 0x1fff, divs); /* keep the high bits */
-       nv_wr32(therm, 0x10eb14, duty | 0x80000000);
+       struct nvkm_device *device = therm->subdev.device;
+       nvkm_mask(device, 0x10eb10, 0x1fff, divs); /* keep the high bits */
+       nvkm_wr32(device, 0x10eb14, duty | 0x80000000);
        return 0;
 }
 
 static int
 gm107_fan_pwm_clock(struct nvkm_therm *therm, int line)
 {
-       return nv_device(therm)->crystal * 1000;
+       return therm->subdev.device->crystal * 1000;
 }
 
-static int
-gm107_therm_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
-                struct nvkm_oclass *oclass, void *data, u32 size,
-                struct nvkm_object **pobject)
-{
-       struct gm107_therm_priv *priv;
-       int ret;
-
-       ret = nvkm_therm_create(parent, engine, oclass, &priv);
-       *pobject = nv_object(priv);
-       if (ret)
-               return ret;
+static const struct nvkm_therm_func
+gm107_therm = {
+       .init = gf119_therm_init,
+       .fini = g84_therm_fini,
+       .pwm_ctrl = gm107_fan_pwm_ctrl,
+       .pwm_get = gm107_fan_pwm_get,
+       .pwm_set = gm107_fan_pwm_set,
+       .pwm_clock = gm107_fan_pwm_clock,
+       .temp_get = g84_temp_get,
+       .fan_sense = gt215_therm_fan_sense,
+       .program_alarms = nvkm_therm_program_alarms_polling,
+};
 
-       priv->base.base.pwm_ctrl = gm107_fan_pwm_ctrl;
-       priv->base.base.pwm_get = gm107_fan_pwm_get;
-       priv->base.base.pwm_set = gm107_fan_pwm_set;
-       priv->base.base.pwm_clock = gm107_fan_pwm_clock;
-       priv->base.base.temp_get = g84_temp_get;
-       priv->base.base.fan_sense = gt215_therm_fan_sense;
-       priv->base.sensor.program_alarms = nvkm_therm_program_alarms_polling;
-       return nvkm_therm_preinit(&priv->base.base);
+int
+gm107_therm_new(struct nvkm_device *device, int index,
+               struct nvkm_therm **ptherm)
+{
+       return nvkm_therm_new_(&gm107_therm, device, index, ptherm);
 }
-
-struct nvkm_oclass
-gm107_therm_oclass = {
-       .handle = NV_SUBDEV(THERM, 0x117),
-       .ofuncs = &(struct nvkm_ofuncs) {
-               .ctor = gm107_therm_ctor,
-               .dtor = _nvkm_therm_dtor,
-               .init = gf110_therm_init,
-               .fini = g84_therm_fini,
-       },
-};