Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 20608731 authored by Anssi Hannula's avatar Anssi Hannula Committed by Takashi Iwai
Browse files

ALSA: hda - Fix default multichannel HDMI mapping regression 



Commit d45e6889 ("ALSA: hda - Provide
the proper channel mapping for generic HDMI driver") added support for
custom channel maps in the HDA HDMI driver. Due to a mistake in an
'if' condition the custom map is always used even when no such map has
been set. This causes incorrect channel mapping for multichannel audio
by default.

Pass per_pin->chmap_set to hdmi_setup_channel_mapping() as a parameter
so that it can use it for detecting if a custom map has been set instead
of checking if map is NULL (which is never the case).

Reported-by: default avatarStaffan Lindberg <pike@xbmc.org>
Signed-off-by: default avatarAnssi Hannula <anssi.hannula@iki.fi>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 8058e142

sound/pci/hda/patch_hdmi.c

+7 −4
Original line number Diff line number Diff line
@@ -714,9 +714,10 @@ static void hdmi_setup_fake_chmap(unsigned char *map, int ca) 


static void hdmi_setup_channel_mapping(struct hda_codec *codec,

				       hda_nid_t pin_nid, bool non_pcm, int ca,

				       int channels, unsigned char *map)

				       int channels, unsigned char *map,

				       bool chmap_set)

{

	if (!non_pcm && map) {

	if (!non_pcm && chmap_set) {

		hdmi_manual_setup_channel_mapping(codec, pin_nid,

						  channels, map);

	} else {
@@ -905,7 +906,8 @@ static void hdmi_setup_audio_infoframe(struct hda_codec *codec, int pin_idx, 
			    pin_nid,

			    channels);

		hdmi_setup_channel_mapping(codec, pin_nid, non_pcm, ca,

					   channels, per_pin->chmap);

					   channels, per_pin->chmap,

					   per_pin->chmap_set);

		hdmi_stop_infoframe_trans(codec, pin_nid);

		hdmi_fill_audio_infoframe(codec, pin_nid,

					    ai.bytes, sizeof(ai));
@@ -915,7 +917,8 @@ static void hdmi_setup_audio_infoframe(struct hda_codec *codec, int pin_idx, 
		 * accordingly */

		if (per_pin->non_pcm != non_pcm)

			hdmi_setup_channel_mapping(codec, pin_nid, non_pcm, ca,

						   channels, per_pin->chmap);

						   channels, per_pin->chmap,

						   per_pin->chmap_set);

	}



	per_pin->non_pcm = non_pcm;