diff options
| author |   Ben Skeggs <bskeggs@redhat.com> | 2017-05-11 17:33:39 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2017-05-12 08:32:58 +1000 |
| commit | e4311ee51d1e2676001b2d8fcefd92bdd79aad85 (patch) | |
| tree | 8a5259194de1a737e39b7220213ab2bd2157f9d7 /drivers/gpu/drm/nouveau/nvkm/subdev/therm/temp.c | |
| parent | drm/nouveau/tmr: avoid processing completed alarms when adding a new one (diff) | |
| download | linux-dev-e4311ee51d1e2676001b2d8fcefd92bdd79aad85.tar.xz linux-dev-e4311ee51d1e2676001b2d8fcefd92bdd79aad85.zip | |
drm/nouveau/therm: remove ineffective workarounds for alarm bugs
These were ineffective due to touching the list without the alarm lock,
but should no longer be required.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Cc: stable@vger.kernel.org
Diffstat (limited to '')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/therm/temp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/temp.c b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/temp.c index b9703c02d8ca..9a79e91fdfdc 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/temp.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/temp.c @@ -185,7 +185,7 @@ alarm_timer_callback(struct nvkm_alarm *alarm) spin_unlock_irqrestore(&therm->sensor.alarm_program_lock, flags); /* schedule the next poll in one second */ - if (therm->func->temp_get(therm) >= 0 && list_empty(&alarm->head)) + if (therm->func->temp_get(therm) >= 0) nvkm_timer_alarm(tmr, 1000000000ULL, alarm); } |