forked from Minki/linux
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>
This commit is contained in:
parent
a5b7d510b2
commit
bb731f2100
@ -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 hda_codec *codec = info->private_data;
|
||||
struct hdmi_spec *spec = codec->spec;
|
||||
const unsigned int valid_mask =
|
||||
FL | FR | RL | RR | LFE | FC | RLC | RRC;
|
||||
unsigned int __user *dst;
|
||||
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;
|
||||
if (cap->channels != chs)
|
||||
continue;
|
||||
if (cap->spk_mask & ~valid_mask)
|
||||
continue;
|
||||
if (size < 8)
|
||||
return -ENOMEM;
|
||||
if (put_user(SNDRV_CTL_TLVT_CHMAP_VAR, dst) ||
|
||||
|
Loading…
Reference in New Issue
Block a user