ASoC: hdmi-codec: reorder channel allocation list

The ordering in hdmi_codec_get_ch_alloc_table_idx() results in
wrong channel allocation for a number of cases, e.g. when ELD
reports FL|FR|LFE|FC|RL|RR or FL|FR|LFE|FC|RL|RR|RC|RLC|RRC:

ca_id 0x01 with speaker mask FL|FR|LFE is selected instead of
ca_id 0x03 with speaker mask FL|FR|LFE|FC for 4 channels

and

ca_id 0x04 with speaker mask FL|FR|RC gets selected instead of
ca_id 0x0b with speaker mask FL|FR|LFE|FC|RL|RR for 6 channels

Fix this by reordering the channel allocation list with most
specific speaker masks at the top.

Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
Link: https://patch.msgid.link/20241115044344.3510979-1-christianshewitt@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/hdmi-codec.c b/sound/soc/codecs/hdmi-codec.c
index 74caae52e1273fda45ab8dd079ae800827f0231f..d9df29a26f4f213a30a2ebcdb63a593f9cf4b901 100644 (file)
--- a/sound/soc/codecs/hdmi-codec.c
+++ b/sound/soc/codecs/hdmi-codec.c
@@ -185,84 +185,97 @@ static const struct snd_pcm_chmap_elem hdmi_codec_8ch_chmaps[] = {
 /*
  * hdmi_codec_channel_alloc: speaker configuration available for CEA
  *
- * This is an ordered list that must match with hdmi_codec_8ch_chmaps struct
+ * This is an ordered list where ca_id must exist in hdmi_codec_8ch_chmaps
  * The preceding ones have better chances to be selected by
  * hdmi_codec_get_ch_alloc_table_idx().
  */
 static const struct hdmi_codec_cea_spk_alloc hdmi_codec_channel_alloc[] = {
        { .ca_id = 0x00, .n_ch = 2,
-         .mask = FL | FR},
-       /* 2.1 */
-       { .ca_id = 0x01, .n_ch = 4,
-         .mask = FL | FR | LFE},
-       /* Dolby Surround */
+         .mask = FL | FR },
+       { .ca_id = 0x03, .n_ch = 4,
+         .mask = FL | FR | LFE | FC },
        { .ca_id = 0x02, .n_ch = 4,
          .mask = FL | FR | FC },
-       /* surround51 */
+       { .ca_id = 0x01, .n_ch = 4,
+         .mask = FL | FR | LFE },
        { .ca_id = 0x0b, .n_ch = 6,
-         .mask = FL | FR | LFE | FC | RL | RR},
-       /* surround40 */
-       { .ca_id = 0x08, .n_ch = 6,
-         .mask = FL | FR | RL | RR },
-       /* surround41 */
-       { .ca_id = 0x09, .n_ch = 6,
-         .mask = FL | FR | LFE | RL | RR },
-       /* surround50 */
+         .mask = FL | FR | LFE | FC | RL | RR },
        { .ca_id = 0x0a, .n_ch = 6,
          .mask = FL | FR | FC | RL | RR },
-       /* 6.1 */
-       { .ca_id = 0x0f, .n_ch = 8,
-         .mask = FL | FR | LFE | FC | RL | RR | RC },
-       /* surround71 */
+       { .ca_id = 0x09, .n_ch = 6,
+         .mask = FL | FR | LFE | RL | RR },
+       { .ca_id = 0x08, .n_ch = 6,
+         .mask = FL | FR | RL | RR },
+       { .ca_id = 0x07, .n_ch = 6,
+         .mask = FL | FR | LFE | FC | RC },
+       { .ca_id = 0x06, .n_ch = 6,
+         .mask = FL | FR | FC | RC },
+       { .ca_id = 0x05, .n_ch = 6,
+         .mask = FL | FR | LFE | RC },
+       { .ca_id = 0x04, .n_ch = 6,
+         .mask = FL | FR | RC },
        { .ca_id = 0x13, .n_ch = 8,
          .mask = FL | FR | LFE | FC | RL | RR | RLC | RRC },
-       /* others */
-       { .ca_id = 0x03, .n_ch = 8,
-         .mask = FL | FR | LFE | FC },
-       { .ca_id = 0x04, .n_ch = 8,
-         .mask = FL | FR | RC},
-       { .ca_id = 0x05, .n_ch = 8,
-         .mask = FL | FR | LFE | RC },
-       { .ca_id = 0x06, .n_ch = 8,
-         .mask = FL | FR | FC | RC },
-       { .ca_id = 0x07, .n_ch = 8,
-         .mask = FL | FR | LFE | FC | RC },
-       { .ca_id = 0x0c, .n_ch = 8,
-         .mask = FL | FR | RC | RL | RR },
-       { .ca_id = 0x0d, .n_ch = 8,
-         .mask = FL | FR | LFE | RL | RR | RC },
-       { .ca_id = 0x0e, .n_ch = 8,
-         .mask = FL | FR | FC | RL | RR | RC },
-       { .ca_id = 0x10, .n_ch = 8,
-         .mask = FL | FR | RL | RR | RLC | RRC },
-       { .ca_id = 0x11, .n_ch = 8,
-         .mask = FL | FR | LFE | RL | RR | RLC | RRC },
+       { .ca_id = 0x1f, .n_ch = 8,
+         .mask = FL | FR | LFE | FC | RL | RR | FLC | FRC },
        { .ca_id = 0x12, .n_ch = 8,
          .mask = FL | FR | FC | RL | RR | RLC | RRC },
-       { .ca_id = 0x14, .n_ch = 8,
-         .mask = FL | FR | FLC | FRC },
-       { .ca_id = 0x15, .n_ch = 8,
-         .mask = FL | FR | LFE | FLC | FRC },
-       { .ca_id = 0x16, .n_ch = 8,
-         .mask = FL | FR | FC | FLC | FRC },
-       { .ca_id = 0x17, .n_ch = 8,
-         .mask = FL | FR | LFE | FC | FLC | FRC },
-       { .ca_id = 0x18, .n_ch = 8,
-         .mask = FL | FR | RC | FLC | FRC },
-       { .ca_id = 0x19, .n_ch = 8,
-         .mask = FL | FR | LFE | RC | FLC | FRC },
-       { .ca_id = 0x1a, .n_ch = 8,
-         .mask = FL | FR | RC | FC | FLC | FRC },
-       { .ca_id = 0x1b, .n_ch = 8,
-         .mask = FL | FR | LFE | RC | FC | FLC | FRC },
-       { .ca_id = 0x1c, .n_ch = 8,
-         .mask = FL | FR | RL | RR | FLC | FRC },
-       { .ca_id = 0x1d, .n_ch = 8,
-         .mask = FL | FR | LFE | RL | RR | FLC | FRC },
        { .ca_id = 0x1e, .n_ch = 8,
          .mask = FL | FR | FC | RL | RR | FLC | FRC },
-       { .ca_id = 0x1f, .n_ch = 8,
-         .mask = FL | FR | LFE | FC | RL | RR | FLC | FRC },
+       { .ca_id = 0x11, .n_ch = 8,
+         .mask = FL | FR | LFE | RL | RR | RLC | RRC },
+       { .ca_id = 0x1d, .n_ch = 8,
+         .mask = FL | FR | LFE | RL | RR | FLC | FRC },
+       { .ca_id = 0x10, .n_ch = 8,
+         .mask = FL | FR | RL | RR | RLC | RRC },
+       { .ca_id = 0x1c, .n_ch = 8,
+         .mask = FL | FR | RL | RR | FLC | FRC },
+       { .ca_id = 0x0f, .n_ch = 8,
+         .mask = FL | FR | LFE | FC | RL | RR | RC },
+       { .ca_id = 0x1b, .n_ch = 8,
+         .mask = FL | FR | LFE | RC | FC | FLC | FRC },
+       { .ca_id = 0x0e, .n_ch = 8,
+         .mask = FL | FR | FC | RL | RR | RC },
+       { .ca_id = 0x1a, .n_ch = 8,
+         .mask = FL | FR | RC | FC | FLC | FRC },
+       { .ca_id = 0x0d, .n_ch = 8,
+         .mask = FL | FR | LFE | RL | RR | RC },
+       { .ca_id = 0x19, .n_ch = 8,
+         .mask = FL | FR | LFE | RC | FLC | FRC },
+       { .ca_id = 0x0c, .n_ch = 8,
+         .mask = FL | FR | RC | RL | RR },
+       { .ca_id = 0x18, .n_ch = 8,
+         .mask = FL | FR | RC | FLC | FRC },
+       { .ca_id = 0x17, .n_ch = 8,
+         .mask = FL | FR | LFE | FC | FLC | FRC },
+       { .ca_id = 0x16, .n_ch = 8,
+         .mask = FL | FR | FC | FLC | FRC },
+       { .ca_id = 0x15, .n_ch = 8,
+         .mask = FL | FR | LFE | FLC | FRC },
+       { .ca_id = 0x14, .n_ch = 8,
+         .mask = FL | FR | FLC | FRC },
+       { .ca_id = 0x0b, .n_ch = 8,
+         .mask = FL | FR | LFE | FC | RL | RR },
+       { .ca_id = 0x0a, .n_ch = 8,
+         .mask = FL | FR | FC | RL | RR },
+       { .ca_id = 0x09, .n_ch = 8,
+         .mask = FL | FR | LFE | RL | RR },
+       { .ca_id = 0x08, .n_ch = 8,
+         .mask = FL | FR | RL | RR },
+       { .ca_id = 0x07, .n_ch = 8,
+         .mask = FL | FR | LFE | FC | RC },
+       { .ca_id = 0x06, .n_ch = 8,
+         .mask = FL | FR | FC | RC },
+       { .ca_id = 0x05, .n_ch = 8,
+         .mask = FL | FR | LFE | RC },
+       { .ca_id = 0x04, .n_ch = 8,
+         .mask = FL | FR | RC },
+       { .ca_id = 0x03, .n_ch = 8,
+         .mask = FL | FR | LFE | FC },
+       { .ca_id = 0x02, .n_ch = 8,
+         .mask = FL | FR | FC },
+       { .ca_id = 0x01, .n_ch = 8,
+         .mask = FL | FR | LFE },
 };
 
 struct hdmi_codec_priv {
@@ -371,7 +384,8 @@ static int hdmi_codec_chmap_ctl_get(struct snd_kcontrol *kcontrol,
        struct snd_pcm_chmap *info = snd_kcontrol_chip(kcontrol);
        struct hdmi_codec_priv *hcp = info->private_data;
 
-       map = info->chmap[hcp->chmap_idx].map;
+       if (hcp->chmap_idx != HDMI_CODEC_CHMAP_IDX_UNKNOWN)
+               map = info->chmap[hcp->chmap_idx].map;
 
        for (i = 0; i < info->max_channels; i++) {
                if (hcp->chmap_idx == HDMI_CODEC_CHMAP_IDX_UNKNOWN)