Commit 3969f05b authored by Marcin Slusarz's avatar Marcin Slusarz Committed by Ben Skeggs

drm/nouveau/therm: always initialize alarm_program_lock

Fixes "BUG: spinlock bad magic" on module load for nva3+ cards.

Introduced in commit "drm/nouveau/therm: implement support for temperature
alarms".
Signed-off-by: default avatarMarcin Slusarz <marcin.slusarz@gmail.com>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent b795016c
...@@ -299,6 +299,7 @@ nouveau_therm_create_(struct nouveau_object *parent, ...@@ -299,6 +299,7 @@ nouveau_therm_create_(struct nouveau_object *parent,
nouveau_alarm_init(&priv->alarm, nouveau_therm_alarm); nouveau_alarm_init(&priv->alarm, nouveau_therm_alarm);
spin_lock_init(&priv->lock); spin_lock_init(&priv->lock);
spin_lock_init(&priv->sensor.alarm_program_lock);
priv->base.fan_get = nouveau_therm_fan_user_get; priv->base.fan_get = nouveau_therm_fan_user_get;
priv->base.fan_set = nouveau_therm_fan_user_set; priv->base.fan_set = nouveau_therm_fan_user_set;
......
...@@ -279,7 +279,6 @@ nv50_therm_ctor(struct nouveau_object *parent, ...@@ -279,7 +279,6 @@ nv50_therm_ctor(struct nouveau_object *parent,
priv->base.base.pwm_clock = nv50_fan_pwm_clock; priv->base.base.pwm_clock = nv50_fan_pwm_clock;
priv->base.base.temp_get = nv50_temp_get; priv->base.base.temp_get = nv50_temp_get;
priv->base.sensor.program_alarms = nv50_therm_program_alarms; priv->base.sensor.program_alarms = nv50_therm_program_alarms;
spin_lock_init(&priv->base.sensor.alarm_program_lock);
nv_subdev(priv)->intr = nv50_therm_intr; nv_subdev(priv)->intr = nv50_therm_intr;
/* init the thresholds */ /* init the thresholds */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment