diff options
| author | Martin Peres | 2013-08-31 01:58:50 +0200 |
|---|---|---|
| committer | Ben Skeggs | 2013-09-04 05:48:52 +0200 |
| commit | c072470f4e9abdde7cdf1c850b8826f32f9e79e3 (patch) | |
| tree | 9a92326853deb2e0e1adcd024c427284278aa760 | |
| parent | drm/nouveau: use MSI interrupts (diff) | |
| download | kernel-qcow2-linux-c072470f4e9abdde7cdf1c850b8826f32f9e79e3.tar.gz kernel-qcow2-linux-c072470f4e9abdde7cdf1c850b8826f32f9e79e3.tar.xz kernel-qcow2-linux-c072470f4e9abdde7cdf1c850b8826f32f9e79e3.zip | |
drm/nouveau/bios/therm: handle vbioses with duplicate entries (mostly nva5)
Some vbioses have extra useless entries after "the end" of the table. This is
problematic since all of the vbios I found with this issue redefine the
pwm freq divider to insane levels (52750 Hz instead of 2500), thus breaking
fan management.
The first solution to solve this mess would be to change the length of the
table. The solution I choose was simply to avoid setting the pwm freq twice
as the other redefinitions are harmless with our current parser.
Signed-off-by: Martin Peres <martin.peres@labri.fr>
Reported-by: Mariusz Bialonczyk <manio@skyboo.net>
Tested-by: Mariusz Bialonczyk <manio@skyboo.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/subdev/bios/therm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/core/subdev/bios/therm.c b/drivers/gpu/drm/nouveau/core/subdev/bios/therm.c index 22a20573ed1b..22ac6dbd6c8f 100644 --- a/drivers/gpu/drm/nouveau/core/subdev/bios/therm.c +++ b/drivers/gpu/drm/nouveau/core/subdev/bios/therm.c @@ -184,7 +184,8 @@ nvbios_therm_fan_parse(struct nouveau_bios *bios, cur_trip->fan_duty = value; break; case 0x26: - fan->pwm_freq = value; + if (!fan->pwm_freq) + fan->pwm_freq = value; break; case 0x3b: fan->bump_period = value; |