Skip to content

Fix HDMI audio passthrough issues #5518

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 25, 2023
Merged

Fix HDMI audio passthrough issues #5518

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
225fa79
ALSA: pcm: fix ELD constraints for (E)AC3, DTS(-HD) and MLP formats
HiassofT Jun 24, 2023
883730c
ASoC: hdmi-codec: fix channel info for compressed formats
HiassofT Jun 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 70 additions & 3 deletions sound/core/pcm_drm_eld.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,25 @@
/*
* PCM DRM helpers
*/
#include <linux/bitfield.h>
#include <linux/export.h>
#include <linux/hdmi.h>
#include <drm/drm_edid.h>
#include <sound/pcm.h>
#include <sound/pcm_drm_eld.h>

#define SAD0_CHANNELS_MASK GENMASK(2, 0) /* max number of channels - 1 */
#define SAD0_FORMAT_MASK GENMASK(6, 3) /* audio format */

#define SAD1_RATE_MASK GENMASK(6, 0) /* bitfield of supported rates */
#define SAD1_RATE_32000_MASK BIT(0)
#define SAD1_RATE_44100_MASK BIT(1)
#define SAD1_RATE_48000_MASK BIT(2)
#define SAD1_RATE_88200_MASK BIT(3)
#define SAD1_RATE_96000_MASK BIT(4)
#define SAD1_RATE_176400_MASK BIT(5)
#define SAD1_RATE_192000_MASK BIT(6)

static const unsigned int eld_rates[] = {
32000,
44100,
Expand All @@ -17,9 +31,62 @@ static const unsigned int eld_rates[] = {
192000,
};

static unsigned int map_rate_families(const u8 *sad,
unsigned int mask_32000,
unsigned int mask_44100,
unsigned int mask_48000)
{
unsigned int rate_mask = 0;

if (sad[1] & SAD1_RATE_32000_MASK)
rate_mask |= mask_32000;
if (sad[1] & (SAD1_RATE_44100_MASK | SAD1_RATE_88200_MASK | SAD1_RATE_176400_MASK))
rate_mask |= mask_44100;
if (sad[1] & (SAD1_RATE_48000_MASK | SAD1_RATE_96000_MASK | SAD1_RATE_192000_MASK))
rate_mask |= mask_48000;
return rate_mask;
}

static unsigned int sad_rate_mask(const u8 *sad)
{
switch (FIELD_GET(SAD0_FORMAT_MASK, sad[0])) {
case HDMI_AUDIO_CODING_TYPE_PCM:
return sad[1] & SAD1_RATE_MASK;
case HDMI_AUDIO_CODING_TYPE_AC3:
case HDMI_AUDIO_CODING_TYPE_DTS:
return map_rate_families(sad,
SAD1_RATE_32000_MASK,
SAD1_RATE_44100_MASK,
SAD1_RATE_48000_MASK);
case HDMI_AUDIO_CODING_TYPE_EAC3:
case HDMI_AUDIO_CODING_TYPE_DTS_HD:
case HDMI_AUDIO_CODING_TYPE_MLP:
return map_rate_families(sad,
0,
SAD1_RATE_176400_MASK,
SAD1_RATE_192000_MASK);
default:
/* TODO adjust for other compressed formats as well */
return sad[1] & SAD1_RATE_MASK;
}
}

static unsigned int sad_max_channels(const u8 *sad)
{
return 1 + (sad[0] & 7);
switch (FIELD_GET(SAD0_FORMAT_MASK, sad[0])) {
case HDMI_AUDIO_CODING_TYPE_PCM:
return 1 + FIELD_GET(SAD0_CHANNELS_MASK, sad[0]);
case HDMI_AUDIO_CODING_TYPE_AC3:
case HDMI_AUDIO_CODING_TYPE_DTS:
case HDMI_AUDIO_CODING_TYPE_EAC3:
return 2;
case HDMI_AUDIO_CODING_TYPE_DTS_HD:
case HDMI_AUDIO_CODING_TYPE_MLP:
return 8;
default:
/* TODO adjust for other compressed formats as well */
return 1 + FIELD_GET(SAD0_CHANNELS_MASK, sad[0]);
}
}

static int eld_limit_rates(struct snd_pcm_hw_params *params,
Expand All @@ -42,7 +109,7 @@ static int eld_limit_rates(struct snd_pcm_hw_params *params,
* requested number of channels.
*/
if (c->min <= max_channels)
rate_mask |= sad[1];
rate_mask |= sad_rate_mask(sad);
}
}

Expand Down Expand Up @@ -70,7 +137,7 @@ static int eld_limit_channels(struct snd_pcm_hw_params *params,
rate_mask |= BIT(i);

for (i = drm_eld_sad_count(eld); i > 0; i--, sad += 3)
if (rate_mask & sad[1])
if (rate_mask & sad_rate_mask(sad))
t.max = max(t.max, sad_max_channels(sad));
}

Expand Down
36 changes: 24 additions & 12 deletions sound/soc/codecs/hdmi-codec.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,31 +484,43 @@ static int hdmi_codec_fill_codec_params(struct snd_soc_dai *dai,
struct hdmi_codec_params *hp)
{
struct hdmi_codec_priv *hcp = snd_soc_dai_get_drvdata(dai);
int idx;

/* Select a channel allocation that matches with ELD and pcm channels */
idx = hdmi_codec_get_ch_alloc_table_idx(hcp, channels);
if (idx < 0) {
dev_err(dai->dev, "Not able to map channels to speakers (%d)\n",
idx);
hcp->chmap_idx = HDMI_CODEC_CHMAP_IDX_UNKNOWN;
return idx;
int idx = HDMI_CODEC_CHMAP_IDX_UNKNOWN;
u8 ca_id = 0;
bool pcm_audio = !(hcp->iec_status[0] & IEC958_AES0_NONAUDIO);

if (pcm_audio) {
/* Select a channel allocation that matches with ELD and pcm channels */
idx = hdmi_codec_get_ch_alloc_table_idx(hcp, channels);

if (idx < 0) {
dev_err(dai->dev, "Not able to map channels to speakers (%d)\n",
idx);
hcp->chmap_idx = HDMI_CODEC_CHMAP_IDX_UNKNOWN;
return idx;
}

ca_id = hdmi_codec_channel_alloc[idx].ca_id;
}

memset(hp, 0, sizeof(*hp));

hdmi_audio_infoframe_init(&hp->cea);
hp->cea.channels = channels;

if (pcm_audio)
hp->cea.channels = channels;
else
hp->cea.channels = 0;

hp->cea.coding_type = HDMI_AUDIO_CODING_TYPE_STREAM;
hp->cea.sample_size = HDMI_AUDIO_SAMPLE_SIZE_STREAM;
hp->cea.sample_frequency = HDMI_AUDIO_SAMPLE_FREQUENCY_STREAM;
hp->cea.channel_allocation = hdmi_codec_channel_alloc[idx].ca_id;
hp->cea.channel_allocation = ca_id;

hp->sample_width = sample_width;
hp->sample_rate = sample_rate;
hp->channels = channels;

hcp->chmap_idx = hdmi_codec_channel_alloc[idx].ca_id;
hcp->chmap_idx = idx;

return 0;
}
Expand Down