[alsa-devel] [PATCH] hdmi - fix surround41 channel mapping

[Takashi Iwai]

At Tue, 21 Sep 2010 14:44:51 +0800,
Wu Fengguang wrote:
> 
> From: Jerry Zhou <jerry.zhou at intel.com>
> 
> Channel 2 and channel 3 were all wrongly mapped to HDMI slot 4.
> This shows up as a bug that one channel is "lost" when playing in
> surround41 mode.
> 
> Signed-off-by: Jerry Zhou <jerry.zhou at intel.com>
> Signed-off-by: Wu Fengguang <fengguang.wu at intel.com>

Applied now.  Thanks.


Takashi

> ---
>  sound/pci/hda/patch_hdmi.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> --- sound-2.6.orig/sound/pci/hda/patch_hdmi.c	2010-09-21 11:20:59.000000000 +0800
> +++ sound-2.6/sound/pci/hda/patch_hdmi.c	2010-09-21 14:26:55.000000000 +0800
> @@ -191,11 +191,11 @@ static int hdmi_channel_mapping[0x32][8]
>  	/* surround40 */
>  	[0x08] = { 0x00, 0x11, 0x24, 0x35, 0xf3, 0xf2, 0xf6, 0xf7 },
>  	/* 4ch */
>  	[0x03] = { 0x00, 0x11, 0x23, 0x32, 0x44, 0xf5, 0xf6, 0xf7 },
>  	/* surround41 */
> -	[0x09] = { 0x00, 0x11, 0x24, 0x34, 0x43, 0xf2, 0xf6, 0xf7 },
> +	[0x09] = { 0x00, 0x11, 0x24, 0x35, 0x42, 0xf3, 0xf6, 0xf7 },
>  	/* surround50 */
>  	[0x0a] = { 0x00, 0x11, 0x24, 0x35, 0x43, 0xf2, 0xf6, 0xf7 },
>  	/* surround51 */
>  	[0x0b] = { 0x00, 0x11, 0x24, 0x35, 0x43, 0x52, 0xf6, 0xf7 },
>  	/* 7.1 */
>