Karol Herbst
2016-Jul-31 10:12 UTC
[Nouveau] [PATCH] subdev/volt/gk104: return error when read fails
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
Apparently Analagous Threads
- [RFC PATCH 03/29] subdev/volt/gk104: return error when read fails
- [RFC PATCH 03/29] subdev/volt/gk104: return error when read fails
- [PATCH 2/3] drm/nouveau: mark symbols static where possible
- [PATCH] drm/nouveau: silence warnings reported during builds with W=1
- [PATCH v4 36/37] WIP volt/gk104: readout speedo