drm/nouveau/therm: remove ineffective workarounds for alarm bugs

commit e4311ee51d1e2676001b2d8fcefd92bdd79aad85 upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

4 files changed, 4 insertions, 4 deletions

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c
index 8894fee30cbc..cbacbb673e54 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c
@@ -130,7 +130,7 @@ nvkm_therm_update(struct nvkm_therm *therm, int mode)
                 poll = false;
         }
 
-        if (list_empty(&therm->alarm.head) && poll)
+        if (poll)
                 nvkm_timer_alarm(tmr, 1000000000ULL, &therm->alarm);
         spin_unlock_irqrestore(&therm->lock, flags);
 
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/fan.c b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/fan.c
index 91198d79393a..e2feccec25f5 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/fan.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/fan.c
@@ -83,7 +83,7 @@ nvkm_fan_update(struct nvkm_fan *fan, bool immediate, int target)
         spin_unlock_irqrestore(&fan->lock, flags);
 
         /* schedule next fan update, if not at target speed already */
-        if (list_empty(&fan->alarm.head) && target != duty) {
+        if (target != duty) {
                 u16 bump_period = fan->bios.bump_period;
                 u16 slow_down_period = fan->bios.slow_down_period;
                 u64 delay;
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/fantog.c b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/fantog.c
index 59701b7a6597..ff9fbe7950e5 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/fantog.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/fantog.c
@@ -53,7 +53,7 @@ nvkm_fantog_update(struct nvkm_fantog *fan, int percent)
         duty = !nvkm_gpio_get(gpio, 0, DCB_GPIO_FAN, 0xff);
         nvkm_gpio_set(gpio, 0, DCB_GPIO_FAN, 0xff, duty);
 
-        if (list_empty(&fan->alarm.head) && percent != (duty * 100)) {
+        if (percent != (duty * 100)) {
                 u64 next_change = (percent * fan->period_us) / 100;
                 if (!duty)
                         next_change = fan->period_us - next_change;
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);
 }