ALSA: hda - hdmi: Fix available channel maps missing from TLV
authorAnssi Hannula <anssi.hannula@iki.fi>
Fri, 4 Oct 2013 23:25:43 +0000 (02:25 +0300)
committerTakashi Iwai <tiwai@suse.de>
Mon, 7 Oct 2013 10:49:13 +0000 (12:49 +0200)
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>
sound/pci/hda/patch_hdmi.c

index dab2af762d94168af03cb571b3c218f3fe355869..62b1e852d0026e579a1f56f6c5675febf8d1c2e4 100644 (file)
@@ -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) ||
This page took 0.043271 seconds and 5 git commands to generate.