From: Martin Peres Date: Sun, 24 Aug 2014 21:15:11 +0000 (+0200) Subject: drm/nouveau/therm/nv84+: do not expose non-calibrated internal temp sensor X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3a405258b2baa71e8f042f0b55392d40e3f99f3e;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git drm/nouveau/therm/nv84+: do not expose non-calibrated internal temp sensor Signed-off-by: Martin Peres Signed-off-by: Ben Skeggs --- diff --git a/drivers/gpu/drm/nouveau/core/subdev/therm/nv84.c b/drivers/gpu/drm/nouveau/core/subdev/therm/nv84.c index 38b16d92f420..14e2e09bfc24 100644 --- 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