search for: nr_fan_trip

...m/nouveau/nvkm/subdev/bios/therm.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/therm.c @@ -180,6 +180,8 @@ nvbios_therm_fan_parse(struct nvkm_bios *bios, struct nvbios_therm_fan *fan) cur_trip->fan_duty = duty_lut[(value & 0xf000) >> 12]; break; case 0x25: + if (fan->nr_fan_trip == 0) + fan->nr_fan_trip++; cur_trip = &fan->trip[fan->nr_fan_trip - 1]; cur_trip->fan_duty = value; break; -- 2.30.2

From: Martin Peres <martin.peres at labri.fr> This should fix a deadlock that has been reported to us where fan_update() would hold the fan lock and try to grab the alarm_program_lock to reschedule an update. On an other CPU, the alarm_program_lock would have been taken before calling fan_update(), leading to a deadlock. We should Cc: <stable at vger.kernel.org> # 3.9+ Reported-by:

...rip = therm->last_trip; - u8 temp = therm->func->temp_get(therm); + int temp; u16 duty, i; + WARN_ON(nvkm_therm_temp_get(therm, &temp) < 0); + /* look for the trip point corresponding to the current temperature */ cur_trip = NULL; for (i = 0; i < therm->fan->bios.nr_fan_trip; i++) { @@ -70,9 +77,11 @@ static int nvkm_therm_compute_linear_duty(struct nvkm_therm *therm, u8 linear_min_temp, u8 linear_max_temp) { - u8 temp = therm->func->temp_get(therm); + int temp; u16 duty; + WARN_ON(nvkm_therm_temp_get(therm, &temp) <...

...s race is indeed real. I thought we did that, but maybe that's because I never send out the patch to use them. > > /* look for the trip point corresponding to the current temperature */ > > cur_trip = NULL; > > for (i = 0; i < therm->fan->bios.nr_fan_trip; i++) { > > @@ -70,9 +77,11 @@ static int > > nvkm_therm_compute_linear_duty(struct nvkm_therm *therm, u8 linear_min_temp, > > u8 linear_max_temp) > > { > > - u8 temp = therm->func->temp_get(therm); > > + int t...

...get(therm); > u16 duty, i; > > + ret = therm->func->temp_get(therm, &temp); > + if (ret < 0) > + return ret; > + > /* look for the trip point corresponding to the current temperature */ > cur_trip = NULL; > for (i = 0; i < therm->fan->bios.nr_fan_trip; i++) { > @@ -67,9 +71,13 @@ static int > nvkm_therm_compute_linear_duty(struct nvkm_therm *therm, u8 linear_min_temp, > u8 linear_max_temp) > { > - u8 temp = therm->func->temp_get(therm); > + int temp, ret; > u16 duty; > > + r...

...get(therm); > u16 duty, i; > > + ret = therm->func->temp_get(therm, &temp); > + if (ret < 0) > + return ret; > + > /* look for the trip point corresponding to the current temperature */ > cur_trip = NULL; > for (i = 0; i < therm->fan->bios.nr_fan_trip; i++) { > @@ -67,9 +71,13 @@ static int > nvkm_therm_compute_linear_duty(struct nvkm_therm *therm, u8 linear_min_temp, > u8 linear_max_temp) > { > - u8 temp = therm->func->temp_get(therm); > + int temp, ret; > u16 duty; > > + r...

...t_trip; - u8 temp = therm->func->temp_get(therm); u16 duty, i; + ret = therm->func->temp_get(therm, &temp); + if (ret < 0) + return ret; + /* look for the trip point corresponding to the current temperature */ cur_trip = NULL; for (i = 0; i < therm->fan->bios.nr_fan_trip; i++) { @@ -67,9 +71,13 @@ static int nvkm_therm_compute_linear_duty(struct nvkm_therm *therm, u8 linear_min_temp, u8 linear_max_temp) { - u8 temp = therm->func->temp_get(therm); + int temp, ret; u16 duty; + ret = therm->func->temp_get(therm, &...

..._get(therm, &temp); >>> + if (ret < 0) >>> + return ret; >>> + >>> /* look for the trip point corresponding to the current temperature */ >>> cur_trip = NULL; >>> for (i = 0; i < therm->fan->bios.nr_fan_trip; i++) { >>> @@ -67,9 +71,13 @@ static int >>> nvkm_therm_compute_linear_duty(struct nvkm_therm *therm, u8 linear_min_temp, >>> u8 linear_max_temp) >>> { >>> - u8 temp = therm->func->temp_get(therm); >>&g...

...thread stalls enough so it survives the entire suspend path. But in theory that could be causing random errors getting reported. > /* look for the trip point corresponding to the current temperature */ > cur_trip = NULL; > for (i = 0; i < therm->fan->bios.nr_fan_trip; i++) { > @@ -70,9 +77,11 @@ static int > nvkm_therm_compute_linear_duty(struct nvkm_therm *therm, u8 linear_min_temp, > u8 linear_max_temp) > { > - u8 temp = therm->func->temp_get(therm); > + int temp; > u16 duty; &g...

...t_trip; - u8 temp = therm->func->temp_get(therm); u16 duty, i; + ret = therm->func->temp_get(therm, &temp); + if (ret < 0) + return ret; + /* look for the trip point corresponding to the current temperature */ cur_trip = NULL; for (i = 0; i < therm->fan->bios.nr_fan_trip; i++) { @@ -67,9 +71,13 @@ static int nvkm_therm_compute_linear_duty(struct nvkm_therm *therm, u8 linear_min_temp, u8 linear_max_temp) { - u8 temp = therm->func->temp_get(therm); + int temp, ret; u16 duty; + ret = therm->func->temp_get(therm, &...

...the fan in cases where the temperature isn't readable? If so we can just return the error here. > > > /* look for the trip point corresponding to the current temperature */ > > > cur_trip = NULL; > > > for (i = 0; i < therm->fan->bios.nr_fan_trip; i++) { > > > @@ -70,9 +77,11 @@ static int > > > nvkm_therm_compute_linear_duty(struct nvkm_therm *therm, u8 linear_min_temp, > > > u8 linear_max_temp) > > > { > > > - u8 temp = therm->func->temp_get(therm)...

...therm->func->temp_get(therm, &temp); >> + if (ret < 0) >> + return ret; >> + >> /* look for the trip point corresponding to the current temperature */ >> cur_trip = NULL; >> for (i = 0; i < therm->fan->bios.nr_fan_trip; i++) { >> @@ -67,9 +71,13 @@ static int >> nvkm_therm_compute_linear_duty(struct nvkm_therm *therm, u8 linear_min_temp, >> u8 linear_max_temp) >> { >> - u8 temp = therm->func->temp_get(therm); >> + int temp, ret;...

We should simply return errors while the GPU is turned off, because the sensors aren't accessable and setting any kind of value doesn't make any sense. Fixes sensors values reported by "sensors" Before: nouveau-pci-0100 Adapter: PCI adapter GPU core: +0.60 V (min = +0.60 V, max = +1.20 V) temp1: -0.0°C (high = +95.0°C, hyst = +3.0°C) (crit

Last update here: https://lists.freedesktop.org/archives/nouveau/2017-September/028848.html Basically big cleanup, reordering, simplifications and some renaming to make the code easier to read and to review. I also moved some bugfixes to the front so they can be merged prior the other patches. There was also a bug related to the therm daemon triggering a pstate change leading to PMU lockups,

Just wanted to post updated versions of my last series/patches. Reviews welcomed. It would be also nice if we agree on features I should focus upstreaming, so that this work can be better splitted or reordered. Sadly most of my patches depend on the rather big clk subdev rework and I think those patches shows best, why I think this rework is actually needed and makes things much easier to add

Commit d32656373857 ("drm/nouveau/therm/gp100: initial implementation of new gp1xx temperature sensor") added support for reading finer-grain temperatures, but continued to report temperatures in 1 degree Celsius increments via nvkm_therm_temp_get(). Rather than altering nvkm_therm_temp_get() to report finer-grain temperatures, which would be inconvenient for other users of the