[PATCH] wss_lib: Fix resume on Yamaha OPL3-SAx

[PATCH] wss_lib: Fix resume on Yamaha OPL3-SAx

[Ondrej Zary]

Yamaha OPL3-SAx chips don't resume properly when playback is running -
garbage is played after resume. Restoring the CS4231_PLAYBK_FORMAT register
last fixes the problem.

Signed-off-by: Ondrej Zary <linux@rainbow-software.org>

--- a/sound/isa/wss/wss_lib.c
+++ b/sound/isa/wss/wss_lib.c
@@ -1656,6 +1656,10 @@ static void snd_wss_resume(struct snd_wss *chip)
 			break;
 		}
 	}
+	/* Yamaha needs this to resume properly */
+	if (chip->hardware == WSS_HW_OPL3SA2)
+		snd_wss_out(chip, CS4231_PLAYBK_FORMAT,
+			    chip->image[CS4231_PLAYBK_FORMAT]);
 	spin_unlock_irqrestore(&chip->reg_lock, flags);
 #if 1
 	snd_wss_mce_down(chip);

-- 
Ondrej Zary

Re: [alsa-devel] [PATCH] wss_lib: Fix resume on Yamaha OPL3-SAx

[Takashi Iwai]

At Mon, 16 Jul 2012 08:30:18 +0200,
Ondrej Zary wrote:
> 
> Yamaha OPL3-SAx chips don't resume properly when playback is running -
> garbage is played after resume. Restoring the CS4231_PLAYBK_FORMAT register
> last fixes the problem.
> 
> Signed-off-by: Ondrej Zary <linux@rainbow-software.org>

Applied.  Thanks.


Takashi


> --- a/sound/isa/wss/wss_lib.c
> +++ b/sound/isa/wss/wss_lib.c
> @@ -1656,6 +1656,10 @@ static void snd_wss_resume(struct snd_wss *chip)
>  			break;
>  		}
>  	}
> +	/* Yamaha needs this to resume properly */
> +	if (chip->hardware == WSS_HW_OPL3SA2)
> +		snd_wss_out(chip, CS4231_PLAYBK_FORMAT,
> +			    chip->image[CS4231_PLAYBK_FORMAT]);
>  	spin_unlock_irqrestore(&chip->reg_lock, flags);
>  #if 1
>  	snd_wss_mce_down(chip);
> 
> -- 
> Ondrej Zary
> _______________________________________________
> Alsa-devel mailing list
> Alsa-devel@alsa-project.org
> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
>