2015-11-01 19:53:32

by Ondrej Zary

Subject: [PATCH] snd-maestro3: Fix Allegro mute until master volume/mute is touched

ESS Allegro (marked ES1989S), [125d:1988] (rev 10) is mute after
loading snd-maestro3 and running alsactl restore. Touching master
volume or mute makes it work.

Looks like a bug in the AC'97 codec integrated into the chip.

Write AC97_MASTER register twice to work-around the problem.

Signed-off-by: Ondrej Zary <[email protected]>
---
sound/pci/maestro3.c | 10 ++++++++++
1 file changed, 10 insertions(+)

diff --git a/sound/pci/maestro3.c b/sound/pci/maestro3.c
index 965d5c6..17ae926 100644
--- a/sound/pci/maestro3.c
+++ b/sound/pci/maestro3.c
@@ -1929,6 +1929,16 @@ snd_m3_ac97_write(struct snd_ac97 *ac97, unsigned short reg, unsigned short val)
return;
snd_m3_outw(chip, val, CODEC_DATA);
snd_m3_outb(chip, reg & 0x7f, CODEC_COMMAND);
+ /*
+ * Workaround for buggy ES1988 integrated AC'97 codec. It remains silent
+ * until the MASTER volume or mute is touched (alsactl restore does not
+ * work).
+ */
+ if (ac97->id == 0x45838308 && reg == AC97_MASTER) {
+ snd_m3_ac97_wait(chip);
+ snd_m3_outw(chip, val, CODEC_DATA);
+ snd_m3_outb(chip, reg & 0x7f, CODEC_COMMAND);
+ }
}


--
Ondrej Zary

2015-11-02 07:46:52

by Takashi Iwai

Subject: Re: [PATCH] snd-maestro3: Fix Allegro mute until master volume/mute is touched

On Sun, 01 Nov 2015 20:53:14 +0100,
Ondrej Zary wrote:
>
> ESS Allegro (marked ES1989S), [125d:1988] (rev 10) is mute after
> loading snd-maestro3 and running alsactl restore. Touching master
> volume or mute makes it work.
>
> Looks like a bug in the AC'97 codec integrated into the chip.
>
> Write AC97_MASTER register twice to work-around the problem.
>
> Signed-off-by: Ondrej Zary <[email protected]>

Applied, thanks.


Takashi

> ---
> sound/pci/maestro3.c | 10 ++++++++++
> 1 file changed, 10 insertions(+)
>
> diff --git a/sound/pci/maestro3.c b/sound/pci/maestro3.c
> index 965d5c6..17ae926 100644
> --- a/sound/pci/maestro3.c
> +++ b/sound/pci/maestro3.c
> @@ -1929,6 +1929,16 @@ snd_m3_ac97_write(struct snd_ac97 *ac97, unsigned short reg, unsigned short val)
> return;
> snd_m3_outw(chip, val, CODEC_DATA);
> snd_m3_outb(chip, reg & 0x7f, CODEC_COMMAND);
> + /*
> + * Workaround for buggy ES1988 integrated AC'97 codec. It remains silent
> + * until the MASTER volume or mute is touched (alsactl restore does not
> + * work).
> + */
> + if (ac97->id == 0x45838308 && reg == AC97_MASTER) {
> + snd_m3_ac97_wait(chip);
> + snd_m3_outw(chip, val, CODEC_DATA);
> + snd_m3_outb(chip, reg & 0x7f, CODEC_COMMAND);
> + }
> }
>
>
> --
> Ondrej Zary
>
> .
>