[Nouveau] [RFC PATCH 03/29] subdev/volt/gk104: return error when read fails

Pierre Moreau
2017-10-08T10:29:06Z

On 2017-09-15 — 17:11, Karol Herbst wrote:
> 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.

Small nitpick, add a comma between “that” and “sensors”.
Otherwise,

Reviewed-by: Pierre Moreau <pierre.morrow at free.fr>

>
> 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 1c744e02..53a7af9d 100644
> --- a/drm/nouveau/nvkm/subdev/volt/gk104.c
> +++ b/drm/nouveau/nvkm/subdev/volt/gk104.c
> @@ -40,10 +40,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.14.1
>
> _______________________________________________
> Nouveau mailing list
> Nouveau at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/nouveau
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL:
<https://lists.freedesktop.org/archives/nouveau/attachments/20171008/461f05a5/attachment-0001.sig>