p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

drm/nouveau/therm: make sure the temperature settings are sane on nv84+ 

One of my nv92 has a calibrated internal sensor but it displays 0°C
as the default values use sw calibration values to force the temperature
to 0.

Since we cannot read the temperature from the adt7473 present on this board,
let's re-enable the internal reading!

Signed-off-by: Martin Peres <martin.peres@free.fr>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Martin Peres 2014-08-24 23:15:10 +02:00 committed by Ben Skeggs
parent 3ca6cd435e
commit c5b4865e20
4 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/gpu/drm/nouveau/core/subdev/therm/nv84.c
View File

@ -24,6 +24,7 @@
*/
#include "priv.h"
#include <subdev/fuse.h>
struct nv84_therm_priv {
struct nouveau_therm_priv base;
@ -35,6 +36,19 @@ nv84_temp_get(struct nouveau_therm *therm)
return nv_rd32(therm, 0x20400);
}
void
nv84_sensor_setup(struct nouveau_therm *therm)
{
struct nouveau_fuse *fuse = nouveau_fuse(therm);
/* enable temperature reading for cards with insane defaults */
if (nv_ro32(fuse, 0x1a8) == 1) {
nv_mask(therm, 0x20008, 0x80008000, 0x80000000);
nv_mask(therm, 0x2000c, 0x80000003, 0x00000000);
mdelay(20); /* wait for the temperature to stabilize */
}
}
static void
nv84_therm_program_alarms(struct nouveau_therm *therm)
{
@ -170,6 +184,21 @@ nv84_therm_intr(struct nouveau_subdev *subdev)
spin_unlock_irqrestore(&priv->sensor.alarm_program_lock, flags);
}
static int
nv84_therm_init(struct nouveau_object *object)
{
struct nv84_therm_priv *priv = (void *)object;
int ret;
ret = nouveau_therm_init(&priv->base.base);
if (ret)
return ret;
nv84_sensor_setup(&priv->base.base);
return 0;
}
static int
nv84_therm_ctor(struct nouveau_object *parent,
struct nouveau_object *engine,
@ -228,7 +257,7 @@ nv84_therm_oclass = {
.ofuncs = &(struct nouveau_ofuncs) {
.ctor = nv84_therm_ctor,
.dtor = _nouveau_therm_dtor,
.init = _nouveau_therm_init,
.init = nv84_therm_init,
.fini = nv84_therm_fini,
},
};

2
drivers/gpu/drm/nouveau/core/subdev/therm/nva3.c
View File

@ -51,6 +51,8 @@ nva3_therm_init(struct nouveau_object *object)
if (ret)
return ret;
nv84_sensor_setup(&priv->base.base);
/* enable fan tach, count revolutions per-second */
nv_mask(priv, 0x00e720, 0x00000003, 0x00000002);
if (tach->func != DCB_GPIO_UNUSED) {

2
drivers/gpu/drm/nouveau/core/subdev/therm/nvd0.c
View File

@ -150,6 +150,8 @@ nvd0_therm_ctor(struct nouveau_object *parent,
if (ret)
return ret;
nv84_sensor_setup(&priv->base.base);
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;

1
drivers/gpu/drm/nouveau/core/subdev/therm/priv.h
View File

@ -145,6 +145,7 @@ 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);
int nv84_temp_get(struct nouveau_therm *therm);
void nv84_sensor_setup(struct nouveau_therm *therm);
int nv84_therm_fini(struct nouveau_object *object, bool suspend);
int nva3_therm_fan_sense(struct nouveau_therm *);