projects
/
cascardo
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c5b4865
)
drm/nouveau/therm/nv84+: do not expose non-calibrated internal temp sensor
author
Martin Peres
<martin.peres@free.fr>
Sun, 24 Aug 2014 21:15:11 +0000
(23:15 +0200)
committer
Ben Skeggs
<bskeggs@redhat.com>
Mon, 15 Sep 2014 12:25:02 +0000
(22:25 +1000)
Signed-off-by: Martin Peres <martin.peres@free.fr>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/core/subdev/therm/nv84.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/nouveau/core/subdev/therm/nv84.c
b/drivers/gpu/drm/nouveau/core/subdev/therm/nv84.c
index
38b16d9
..
14e2e09
100644
(file)
--- a/
drivers/gpu/drm/nouveau/core/subdev/therm/nv84.c
+++ b/
drivers/gpu/drm/nouveau/core/subdev/therm/nv84.c
@@
-33,7
+33,12
@@
struct nv84_therm_priv {
int
nv84_temp_get(struct nouveau_therm *therm)
{
- return nv_rd32(therm, 0x20400);
+ struct nouveau_fuse *fuse = nouveau_fuse(therm);
+
+ if (nv_ro32(fuse, 0x1a8) == 1)
+ return nv_rd32(therm, 0x20400);
+ else
+ return -ENODEV;
}
void