Răsfoiți Sursa

ALSA: hda - hdmi: Fix available channel maps missing from TLV

Currently the available channel maps TLV only contains channel maps that
are limited to the traditional 7.1 speakers.

Since the other HDMI channel mapping functions have been fixed to
properly handle all CEA-861-E specified speakers, allow them to be
listed.

Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Anssi Hannula 12 ani în urmă
părinte
comite
bb731f2100
1 a modificat fișierele cu 0 adăugiri și 4 ștergeri
  1. 0 4
      sound/pci/hda/patch_hdmi.c

+ 0 - 4
sound/pci/hda/patch_hdmi.c

@@ -1658,8 +1658,6 @@ static int hdmi_chmap_ctl_tlv(struct snd_kcontrol *kcontrol, int op_flag,
 	struct snd_pcm_chmap *info = snd_kcontrol_chip(kcontrol);
 	struct snd_pcm_chmap *info = snd_kcontrol_chip(kcontrol);
 	struct hda_codec *codec = info->private_data;
 	struct hda_codec *codec = info->private_data;
 	struct hdmi_spec *spec = codec->spec;
 	struct hdmi_spec *spec = codec->spec;
-	const unsigned int valid_mask =
-		FL | FR | RL | RR | LFE | FC | RLC | RRC;
 	unsigned int __user *dst;
 	unsigned int __user *dst;
 	int chs, count = 0;
 	int chs, count = 0;
 
 
@@ -1677,8 +1675,6 @@ static int hdmi_chmap_ctl_tlv(struct snd_kcontrol *kcontrol, int op_flag,
 			int chs_bytes = chs * 4;
 			int chs_bytes = chs * 4;
 			if (cap->channels != chs)
 			if (cap->channels != chs)
 				continue;
 				continue;
-			if (cap->spk_mask & ~valid_mask)
-				continue;
 			if (size < 8)
 			if (size < 8)
 				return -ENOMEM;
 				return -ENOMEM;
 			if (put_user(SNDRV_CTL_TLVT_CHMAP_VAR, dst) ||
 			if (put_user(SNDRV_CTL_TLVT_CHMAP_VAR, dst) ||