[Nouveau] [PATCH] subdev/volt/gk104: return error when read fails
Karol Herbst
karolherbst at gmail.com
Sun Jul 31 10:12:43 UTC 2016
While my gpu was powered off, hwmon returned 0.6V as the current voltage.
If nvkm_rd32 fails for any reason, return the error.
With that sensors will display a "N/A" instead of 0.6V.
Signed-off-by: Karol Herbst <karolherbst at gmail.com>
---
drm/nouveau/nvkm/subdev/volt/gk104.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drm/nouveau/nvkm/subdev/volt/gk104.c b/drm/nouveau/nvkm/subdev/volt/gk104.c
index 420bd84..1821626 100644
--- a/drm/nouveau/nvkm/subdev/volt/gk104.c
+++ b/drm/nouveau/nvkm/subdev/volt/gk104.c
@@ -39,10 +39,15 @@ gk104_volt_get(struct nvkm_volt *base)
{
struct nvbios_volt *bios = &gk104_volt(base)->bios;
struct nvkm_device *device = base->subdev.device;
- u32 div, duty;
+ int div, duty;
div = nvkm_rd32(device, 0x20340);
+ if (div < 0)
+ return div;
+
duty = nvkm_rd32(device, 0x20344);
+ if (duty < 0)
+ return duty;
return bios->base + bios->pwm_range * duty / div;
}
--
2.9.2
More information about the Nouveau
mailing list