FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-01-10 03:20:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

drm/nouveau/therm: always initialize alarm_program_lock

Browse Source 
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: Marcin Slusarz <marcin.slusarz@gmail.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Marcin Slusarz 2013-01-30 22:21:31 +01:00 committed by Ben Skeggs
parent b795016cd2
commit 3969f05bb8
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gpu/drm/nouveau/core/subdev/therm/base.c
View File

@ -299,6 +299,7 @@ nouveau_therm_create_(struct nouveau_object *parent,
nouveau_alarm_init(&priv->alarm, nouveau_therm_alarm);
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_set = nouveau_therm_fan_user_set;

1
drivers/gpu/drm/nouveau/core/subdev/therm/nv50.c
View File

@ -279,7 +279,6 @@ nv50_therm_ctor(struct nouveau_object *parent,
priv->base.base.pwm_clock = nv50_fan_pwm_clock;
priv->base.base.temp_get = nv50_temp_get;
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;
/* init the thresholds */