[PATCH] opti93x: fix sound ouput for Opti930

[PATCH] opti93x: fix sound ouput for Opti930

[Krzysztof Helt]

From: Krzysztof Helt <krzysztof.h1@wp.pl>

This patch fixes silenced output from the Opti930.

Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>

---
The bug was introduced by me in the patch which added 
QS1000 wavetable support:

http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=f81b953d43c2c12f617da3ecec25e04b5c9e6eb2

Simply do not change digital input bits on Opti930.

diff -urp linux-rc2/sound/isa/opti9xx/opti92x-ad1848.c linux-rc5/sound/isa/opti9xx/opti92x-ad1848.c
--- linux-rc2/sound/isa/opti9xx/opti92x-ad1848.c	2008-04-17 04:49:44.000000000 +0200
+++ linux-rc5/sound/isa/opti9xx/opti92x-ad1848.c	2008-06-07 23:59:27.218950875 +0200
@@ -491,16 +491,9 @@ static int __devinit snd_opti9xx_configu
 		break;
 
 #else	/* OPTi93X */
-	case OPTi9XX_HW_82C930:
 	case OPTi9XX_HW_82C931:
 	case OPTi9XX_HW_82C933:
-		snd_opti9xx_write_mask(chip, OPTi9XX_MC_REG(6), 0x02, 0x03);
-		snd_opti9xx_write_mask(chip, OPTi9XX_MC_REG(3), 0x00, 0xff);
-		snd_opti9xx_write_mask(chip, OPTi9XX_MC_REG(4), 0x10 |
-			(chip->hardware == OPTi9XX_HW_82C930 ? 0x00 : 0x04),
-			0x34);
-		snd_opti9xx_write_mask(chip, OPTi9XX_MC_REG(5), 0x20, 0xbf);
-		/* 
+		/*
 		 * The BTC 1817DW has QS1000 wavetable which is connected
 		 * to the serial digital input of the OPTI931.
 		 */
@@ -510,6 +503,13 @@ static int __devinit snd_opti9xx_configu
 		 * or digital input signal.
 		 */
 		snd_opti9xx_write_mask(chip, OPTi9XX_MC_REG(26), 0x01, 0x01);
+	case OPTi9XX_HW_82C930: /* FALL THROUGH */
+		snd_opti9xx_write_mask(chip, OPTi9XX_MC_REG(6), 0x02, 0x03);
+		snd_opti9xx_write_mask(chip, OPTi9XX_MC_REG(3), 0x00, 0xff);
+		snd_opti9xx_write_mask(chip, OPTi9XX_MC_REG(4), 0x10 |
+			(chip->hardware == OPTi9XX_HW_82C930 ? 0x00 : 0x04),
+			0x34);
+		snd_opti9xx_write_mask(chip, OPTi9XX_MC_REG(5), 0x20, 0xbf);
 		break;
 #endif	/* OPTi93X */
 

---------------------------------------------------------------
Sprawdz jak zdobyc zdrowy usmiech!
Kliknij >> http://link.interia.pl/f1e26

Re: [PATCH] opti93x: fix sound ouput for Opti930

[Rene Herman]

On 08-06-08 07:57, Krzysztof Helt wrote:

> From: Krzysztof Helt <krzysztof.h1@wp.pl>
> 
> This patch fixes silenced output from the Opti930.
> 
> Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
> 
> ---
> The bug was introduced by me in the patch which added 
> QS1000 wavetable support:
> 
> http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=f81b953d43c2c12f617da3ecec25e04b5c9e6eb2
> 
> Simply do not change digital input bits on Opti930.

Oh, right, that was it:

http://mailman.alsa-project.org/pipermail/alsa-devel/2008-February/005898.html

I've tested that sound is back after this patch on my 930 as well:

Acked-by: Rene Herman <rene.herman@gmail.com>

I did experience a few instances where the 930 produced nothing but 
static after adjusting its mixer down but this is not going to have 
anything to do with this patch. Mentioned just in case you're now 
looking at a 930 and seeing similar things -- it's not just your card in 
that case...

Rene.

Re: [PATCH] opti93x: fix sound ouput for Opti930

[Takashi Iwai]

At Sun, 08 Jun 2008 22:29:03 +0200,
Rene Herman wrote:
> 
> On 08-06-08 07:57, Krzysztof Helt wrote:
> 
> > From: Krzysztof Helt <krzysztof.h1@wp.pl>
> > 
> > This patch fixes silenced output from the Opti930.
> > 
> > Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
> > 
> > ---
> > The bug was introduced by me in the patch which added 
> > QS1000 wavetable support:
> > 
> > http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=f81b953d43c2c12f617da3ecec25e04b5c9e6eb2
> > 
> > Simply do not change digital input bits on Opti930.
> 
> Oh, right, that was it:
> 
> http://mailman.alsa-project.org/pipermail/alsa-devel/2008-February/005898.html
> 
> I've tested that sound is back after this patch on my 930 as well:
> 
> Acked-by: Rene Herman <rene.herman@gmail.com>

OK, I took it now.

thanks,

Takashi