2004-06-07 15:35:59

by Keith Duthie

Subject: [PATCH] Fix apm suspend with cs4231 based sound cards

The following patch (effectively a reversion of a change between alsa
0.9.4 and 0.9.5) fixes a problem whereby an APM suspend causes the
program which is using the PCM device to enter the uninterruptible sleep
state on resume and thus causes the sound device to be unusable.

--- linux-2.6.5/sound/isa/cs423x/cs4231_lib.c~ Tue Jun 8 03:24:49 2004
+++ linux-2.6.5/sound/isa/cs423x/cs4231_lib.c Tue Jun 8 03:24:52 2004
@@ -1402,7 +1402,7 @@
switch (rqst) {
case PM_SUSPEND:
if (chip->suspend) {
- snd_pcm_suspend_all(chip->pcm);
+ // snd_pcm_suspend_all(chip->pcm);
(*chip->suspend)(chip);
}
break;

I've cc'ed alsa-user instead of alsa-devel as I'm only subscribed to
alsa-user, and my attempt to report this in February (according to an
automated reply I received) "Is being held until the list moderator can
review it for approval."

--
Just because it isn't nice doesn't make it any less a miracle.
http://users.albatross.co.nz/~psycho/ O- -><-

2004-06-07 17:01:50

by Takashi Iwai

Subject: Re: [PATCH] Fix apm suspend with cs4231 based sound cards

At Tue, 8 Jun 2004 03:39:52 +1200 (NZST),
Keith Duthie wrote:
>
> The following patch (effectively a reversion of a change between alsa
> 0.9.4 and 0.9.5) fixes a problem whereby an APM suspend causes the
> program which is using the PCM device to enter the uninterruptible sleep
> state on resume and thus causes the sound device to be unusable.
>
> --- linux-2.6.5/sound/isa/cs423x/cs4231_lib.c~ Tue Jun 8 03:24:49 2004
> +++ linux-2.6.5/sound/isa/cs423x/cs4231_lib.c Tue Jun 8 03:24:52 2004
> @@ -1402,7 +1402,7 @@
> switch (rqst) {
> case PM_SUSPEND:
> if (chip->suspend) {
> - snd_pcm_suspend_all(chip->pcm);
> + // snd_pcm_suspend_all(chip->pcm);
> (*chip->suspend)(chip);
> }
> break;

Could you check whether the recent kernel works without this patch?
There was a mutex deadlock in the suspend code, and I guess it hit
you...


Takashi

2004-06-08 02:43:41

by Keith Duthie

Subject: Re: [PATCH] Fix apm suspend with cs4231 based sound cards

On Mon, 7 Jun 2004, Takashi Iwai wrote:

> Could you check whether the recent kernel works without this patch?
> There was a mutex deadlock in the suspend code, and I guess it hit
> you...

Ok, will do.

--
Just because it isn't nice doesn't make it any less a miracle.
http://users.albatross.co.nz/~psycho/ O- -><-

2004-06-08 17:01:56

by Keith Duthie

Subject: Re: [PATCH] Fix apm suspend with cs4231 based sound cards

On Mon, 7 Jun 2004, Takashi Iwai wrote:

> Could you check whether the recent kernel works without this patch?
> There was a mutex deadlock in the suspend code, and I guess it hit
> you...

I haven't actually tested it yet, but the 2.6.7-rc3 version is changed
enough that the patch I submitted doesn't apply anymore. I'll test it
within the next week or so.

--
Just because it isn't nice doesn't make it any less a miracle.
http://users.albatross.co.nz/~psycho/ O- -><-

2004-06-13 08:29:28

by Keith Duthie

Subject: Re: [PATCH] Fix apm suspend with cs4231 based sound cards

On Mon, 7 Jun 2004, Takashi Iwai wrote:

> Could you check whether the recent kernel works without this patch?
> There was a mutex deadlock in the suspend code, and I guess it hit
> you...

The bug is fixed in 2.6.7-rc3; that'll teach me to test the lastest
release candidate before posting patches...
--
Just because it isn't nice doesn't make it any less a miracle.
http://users.albatross.co.nz/~psycho/ O- -><-