diff options
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/subdev/therm/base.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/subdev/therm/ic.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/core/subdev/therm/base.c b/drivers/gpu/drm/nouveau/core/subdev/therm/base.c index 321a55bc25a7..3f8083f41be8 100644 --- a/drivers/gpu/drm/nouveau/core/subdev/therm/base.c +++ b/drivers/gpu/drm/nouveau/core/subdev/therm/base.c | |||
| @@ -313,8 +313,8 @@ nouveau_therm_create_(struct nouveau_object *parent, | |||
| 313 | int | 313 | int |
| 314 | nouveau_therm_preinit(struct nouveau_therm *therm) | 314 | nouveau_therm_preinit(struct nouveau_therm *therm) |
| 315 | { | 315 | { |
| 316 | nouveau_therm_ic_ctor(therm); | ||
| 317 | nouveau_therm_sensor_ctor(therm); | 316 | nouveau_therm_sensor_ctor(therm); |
| 317 | nouveau_therm_ic_ctor(therm); | ||
| 318 | nouveau_therm_fan_ctor(therm); | 318 | nouveau_therm_fan_ctor(therm); |
| 319 | 319 | ||
| 320 | nouveau_therm_fan_mode(therm, NOUVEAU_THERM_CTRL_NONE); | 320 | nouveau_therm_fan_mode(therm, NOUVEAU_THERM_CTRL_NONE); |
diff --git a/drivers/gpu/drm/nouveau/core/subdev/therm/ic.c b/drivers/gpu/drm/nouveau/core/subdev/therm/ic.c index e24090bac195..8b3adec5fbb1 100644 --- a/drivers/gpu/drm/nouveau/core/subdev/therm/ic.c +++ b/drivers/gpu/drm/nouveau/core/subdev/therm/ic.c | |||
| @@ -32,6 +32,7 @@ probe_monitoring_device(struct nouveau_i2c_port *i2c, | |||
| 32 | struct i2c_board_info *info) | 32 | struct i2c_board_info *info) |
| 33 | { | 33 | { |
| 34 | struct nouveau_therm_priv *priv = (void *)nouveau_therm(i2c); | 34 | struct nouveau_therm_priv *priv = (void *)nouveau_therm(i2c); |
| 35 | struct nvbios_therm_sensor *sensor = &priv->bios_sensor; | ||
| 35 | struct i2c_client *client; | 36 | struct i2c_client *client; |
| 36 | 37 | ||
| 37 | request_module("%s%s", I2C_MODULE_PREFIX, info->type); | 38 | request_module("%s%s", I2C_MODULE_PREFIX, info->type); |
| @@ -46,8 +47,9 @@ probe_monitoring_device(struct nouveau_i2c_port *i2c, | |||
| 46 | } | 47 | } |
| 47 | 48 | ||
| 48 | nv_info(priv, | 49 | nv_info(priv, |
| 49 | "Found an %s at address 0x%x (controlled by lm_sensors)\n", | 50 | "Found an %s at address 0x%x (controlled by lm_sensors, " |
| 50 | info->type, info->addr); | 51 | "temp offset %+i C)\n", |
| 52 | info->type, info->addr, sensor->offset_constant); | ||
| 51 | priv->ic = client; | 53 | priv->ic = client; |
| 52 | 54 | ||
| 53 | return true; | 55 | return true; |
