search for: nouveau_fan_upd

https://bugs.freedesktop.org/show_bug.cgi?id=65554 Priority: medium Bug ID: 65554 Assignee: nouveau at lists.freedesktop.org Summary: CPU lock with nouveau_fan_update QA Contact: xorg-team at lists.x.org Severity: major Classification: Unclassified OS: Linux (All) Reporter: ddamienn at gmail.com Hardware: Other Status: NEW Version: unspecified Component: Driver/nouveau...

...n.peres at free.fr> --- nvkm/subdev/therm/fan.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/nvkm/subdev/therm/fan.c b/nvkm/subdev/therm/fan.c index 95f6129..29d4c41 100644 --- a/nvkm/subdev/therm/fan.c +++ b/nvkm/subdev/therm/fan.c @@ -54,8 +54,10 @@ nouveau_fan_update(struct nouveau_fan *fan, bool immediate, int target) /* check that we're not already at the target duty cycle */ duty = fan->get(therm); - if (duty == target) - goto done; + if (duty == target) { + spin_unlock_irqrestore(&fan->lock, flags); + return 0; + } /* smooth ou...

...ffffff817b0f1a>] ? _raw_spin_lock_irqsave+0x4a/0x90 [ 9227.509814] <<EOE>> <IRQ> [<ffffffffc070e564>] nouveau_fantog_update+0x94/0x180 [nouveau] [ 9227.509838] [<ffffffffc070e6a5>] nouveau_fantog_set+0x35/0x40 [nouveau] [ 9227.509847] [<ffffffffc070d9f1>] nouveau_fan_update+0x101/0x220 [nouveau] [ 9227.509855] [<ffffffffc070db69>] nouveau_therm_fan_set+0x19/0x20 [nouveau] [ 9227.509863] [<ffffffffc070d1cd>] nouveau_therm_update+0xbd/0x340 [nouveau] [ 9227.509871] [<ffffffffc06cdd28>] ? dcb_gpio_match+0x38/0x130 [nouveau] [ 9227.509879] [<ff...

...n.peres at free.fr> --- nvkm/subdev/therm/fan.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/nvkm/subdev/therm/fan.c b/nvkm/subdev/therm/fan.c index 95f6129..29d4c41 100644 --- a/nvkm/subdev/therm/fan.c +++ b/nvkm/subdev/therm/fan.c @@ -54,8 +54,10 @@ nouveau_fan_update(struct nouveau_fan *fan, bool immediate, int target) /* check that we're not already at the target duty cycle */ duty = fan->get(therm); - if (duty == target) - goto done; + if (duty == target) { + spin_unlock_irqrestore(&fan->lock, flags); + return 0; + } /* smooth ou...

...etected ] > [ 326.168496] 3.13.6 #1270 Not tainted > [ 326.168500] ------------------------------------------------------- > [ 326.168504] ldconfig/22297 is trying to acquire lock: > [ 326.168507] (&(&priv->fan->lock)->rlock){-.-...}, at: [<ffffffffa00d5363>] nouveau_fan_update+0xeb/0x252 [nouveau] > [ 326.168551] > but task is already holding lock: > [ 326.168555] (&(&priv->sensor.alarm_program_lock)->rlock){-.-...}, at: [<ffffffffa00d6a8a>] alarm_timer_callback+0xf1/0x179 [nouveau] > [ 326.168587] > which lock already depends on...

...ile.subdev diff --git a/nvkm/subdev/therm/fan.c b/nvkm/subdev/therm/fan.c index 016990a..402c9be 100644 --- a/nvkm/subdev/therm/fan.c +++ b/nvkm/subdev/therm/fan.c @@ -31,6 +31,8 @@ #include <subdev/gpio.h> #include <subdev/timer.h> +#include <subdev/bios/fan.h> + static int nouveau_fan_update(struct nouveau_fan *fan, bool immediate, int target) { @@ -275,8 +277,11 @@ nouveau_therm_fan_ctor(struct nouveau_therm *therm) /* other random init... */ nouveau_therm_fan_set_defaults(therm); nvbios_perf_fan_parse(bios, &priv->fan->perf); - if (nvbios_therm_fan_parse(bios, &am...

From: Martin Peres <martin.peres at labri.fr> Re-use the therm-exported fan structure with only two minor modifications: - pwm_freq: u16 -> u32; - add fan_type (toggle or PWM) Signed-off-by: Martin Peres <martin.peres at free.fr> --- drm/Kbuild | 1 + drm/core/include/subdev/bios/fan.h | 1 + drm/core/subdev/bios/fan.c | 1 +

Re-use the therm-exported fan structure with only two minor modifications: - pwm_freq: u16 -> u32; - add fan_type (toggle or PWM) v2: - Do not memset the table to 0 as it erases the pre-set default values Signed-off-by: Martin Peres <martin.peres at free.fr> --- drm/Kbuild | 1 + drm/core/include/subdev/bios/fan.h | 1 + drm/core/subdev/bios/fan.c | 1