search for: nvbios_therm_fan

...1 + 1 file changed, 1 insertion(+) diff --git a/drm/nouveau/nvkm/subdev/bios/fan.c b/drm/nouveau/nvkm/subdev/bios/fan.c index 43006db..80fed7e 100644 --- a/drm/nouveau/nvkm/subdev/bios/fan.c +++ b/drm/nouveau/nvkm/subdev/bios/fan.c @@ -83,6 +83,7 @@ nvbios_fan_parse(struct nvkm_bios *bios, struct nvbios_therm_fan *fan) fan->type = NVBIOS_THERM_FAN_UNK; } + fan->fan_mode = NVBIOS_THERM_FAN_LINEAR; fan->min_duty = nvbios_rd08(bios, data + 0x02); fan->max_duty = nvbios_rd08(bios, data + 0x03); -- 2.6.2

...uveau/nvkm/subdev/bios/fan.c >> b/drm/nouveau/nvkm/subdev/bios/fan.c >> index 43006db..80fed7e 100644 >> --- a/drm/nouveau/nvkm/subdev/bios/fan.c >> +++ b/drm/nouveau/nvkm/subdev/bios/fan.c >> @@ -83,6 +83,7 @@ nvbios_fan_parse(struct nvkm_bios *bios, struct >> nvbios_therm_fan *fan) >> fan->type = NVBIOS_THERM_FAN_UNK; >> } >> >> + fan->fan_mode = NVBIOS_THERM_FAN_LINEAR; >> fan->min_duty = nvbios_rd08(bios, data + 0x02); >> fan->max_duty = nvbios_rd08(bios, data + 0x03); &...

...b/drm/nouveau/nvkm/subdev/bios/fan.c >>>> index 43006db..80fed7e 100644 >>>> --- a/drm/nouveau/nvkm/subdev/bios/fan.c >>>> +++ b/drm/nouveau/nvkm/subdev/bios/fan.c >>>> @@ -83,6 +83,7 @@ nvbios_fan_parse(struct nvkm_bios *bios, struct >>>> nvbios_therm_fan *fan) >>>> fan->type = NVBIOS_THERM_FAN_UNK; >>>> } >>>> >>>> + fan->fan_mode = NVBIOS_THERM_FAN_LINEAR; >>>> fan->min_duty = nvbios_rd08(bios, data + 0x02); >>>>...

...fan.h b/nvkm/include/subdev/bios/fan.h new file mode 100644 index 0000000..119d087 --- /dev/null +++ b/nvkm/include/subdev/bios/fan.h @@ -0,0 +1,8 @@ +#ifndef __NVBIOS_FAN_H__ +#define __NVBIOS_FAN_H__ + +#include <subdev/bios/therm.h> + +u16 nvbios_fan_parse(struct nouveau_bios *bios, struct nvbios_therm_fan *fan); + +#endif diff --git a/nvkm/include/subdev/bios/therm.h b/nvkm/include/subdev/bios/therm.h index 8dc5051..295d093 100644 --- a/nvkm/include/subdev/bios/therm.h +++ b/nvkm/include/subdev/bios/therm.h @@ -23,6 +23,12 @@ struct nvbios_therm_sensor { struct nvbios_therm_threshold thrs_shutdown...

...ion(+) > > diff --git a/drm/nouveau/nvkm/subdev/bios/fan.c b/drm/nouveau/nvkm/subdev/bios/fan.c > index 43006db..80fed7e 100644 > --- a/drm/nouveau/nvkm/subdev/bios/fan.c > +++ b/drm/nouveau/nvkm/subdev/bios/fan.c > @@ -83,6 +83,7 @@ nvbios_fan_parse(struct nvkm_bios *bios, struct nvbios_therm_fan *fan) > fan->type = NVBIOS_THERM_FAN_UNK; > } > > + fan->fan_mode = NVBIOS_THERM_FAN_LINEAR; > fan->min_duty = nvbios_rd08(bios, data + 0x02); > fan->max_duty = nvbios_rd08(bios, data + 0x03); > > Ben, can you merge this patch? It is kind of cr...

.../fan.c >>> b/drm/nouveau/nvkm/subdev/bios/fan.c >>> index 43006db..80fed7e 100644 >>> --- a/drm/nouveau/nvkm/subdev/bios/fan.c >>> +++ b/drm/nouveau/nvkm/subdev/bios/fan.c >>> @@ -83,6 +83,7 @@ nvbios_fan_parse(struct nvkm_bios *bios, struct >>> nvbios_therm_fan *fan) >>> fan->type = NVBIOS_THERM_FAN_UNK; >>> } >>> >>> + fan->fan_mode = NVBIOS_THERM_FAN_LINEAR; >>> fan->min_duty = nvbios_rd08(bios, data + 0x02); >>> fan->max_duty = nvbios_rd...

...ubdev/bios/fan.c >>>>> index 43006db..80fed7e 100644 >>>>> --- a/drm/nouveau/nvkm/subdev/bios/fan.c >>>>> +++ b/drm/nouveau/nvkm/subdev/bios/fan.c >>>>> @@ -83,6 +83,7 @@ nvbios_fan_parse(struct nvkm_bios *bios, struct >>>>> nvbios_therm_fan *fan) >>>>> fan->type = NVBIOS_THERM_FAN_UNK; >>>>> } >>>>> >>>>> + fan->fan_mode = NVBIOS_THERM_FAN_LINEAR; >>>>> fan->min_duty = nvbios_rd08(bios, data + 0x02); >>...

...2 insertions(+) diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/therm.c b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/therm.c index 5babc5a7c7d5..78387053f214 100644 --- a/drivers/gpu/drm/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_...

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:

https://bugs.freedesktop.org/show_bug.cgi?id=78116 Priority: medium Bug ID: 78116 Assignee: nouveau at lists.freedesktop.org Summary: Auto fan speed management doesn't do anything in non critical temperature range (NVC0) QA Contact: xorg-team at lists.x.org Severity: enhancement Classification: Unclassified

...fan.h b/nvkm/include/subdev/bios/fan.h new file mode 100644 index 0000000..119d087 --- /dev/null +++ b/nvkm/include/subdev/bios/fan.h @@ -0,0 +1,8 @@ +#ifndef __NVBIOS_FAN_H__ +#define __NVBIOS_FAN_H__ + +#include <subdev/bios/therm.h> + +u16 nvbios_fan_parse(struct nouveau_bios *bios, struct nvbios_therm_fan *fan); + +#endif diff --git a/nvkm/include/subdev/bios/therm.h b/nvkm/include/subdev/bios/therm.h index 8dc5051..295d093 100644 --- a/nvkm/include/subdev/bios/therm.h +++ b/nvkm/include/subdev/bios/therm.h @@ -23,6 +23,12 @@ struct nvbios_therm_sensor { struct nvbios_therm_threshold thrs_shutdown...