Skip to content

Fix hd audio passthrough on 6ch sinks #31

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
linux4kix merged 2 commits into from
Jan 4, 2016
Merged

Fix hd audio passthrough on 6ch sinks #31

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6a3e46
video: mxc_hdmi: Mark 8ch/192kHz audio as supported when the sink is …
warped-rudi Nov 17, 2015
2310783
video: mxc_hdmi: Mask unused bits in EDID audio block parsing
warped-rudi Nov 18, 2015
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
16 changes: 12 additions & 4 deletions drivers/video/mxc/mxc_edid.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,30 +543,38 @@ int mxc_edid_parse_ext_blk(unsigned char *edid,
index += 3;
i += 3;

audio_format = byte1 >> 3;
audio_format = (byte1 & 0x7f) >> 3;

DPRINTK("Audio Format Descriptor : %2d\n", audio_format);
DPRINTK("Max Number of Channels : %2d\n", (byte1 & 0x07) + 1);
DPRINTK("Sample Rates : %02x\n", byte2);
DPRINTK("Sample Rates : %02x\n", byte2 & 0x7f);

/* ALSA can't specify specific compressed
* formats, so only care about PCM for now. */
if (audio_format == AUDIO_CODING_TYPE_LPCM) {
for (ch_idx = (byte1 & 0x07) / 2; ch_idx >= 0; ch_idx--) {
cfg->sample_rates[ch_idx] |= byte2;
cfg->sample_rates[ch_idx] |= byte2 & 0x7f;
cfg->sample_sizes[ch_idx] |= byte3 & 0x7;
}
DPRINTK("Sample Sizes : %02x\n",
byte3 & 0x7);
}

/* HD-audio: pretend to support 192kHz/16bit in 8ch mode to
* allow HD passthrough on sinks that report only 6ch LPCM */
if (audio_format == AUDIO_CODING_TYPE_MLP ||
audio_format == AUDIO_CODING_TYPE_DTS_HD) {
cfg->sample_rates[3] |= 0x40;
cfg->sample_sizes[3] |= 0x01;
}
}
break;
}
case 0x4: /*Speaker allocation block*/
{
i = 0;
while (i < blklen) {
cfg->speaker_alloc = edid[index + 1];
cfg->speaker_alloc = edid[index + 1] & 0x7f;
index += 3;
i += 3;
DPRINTK("Speaker Alloc : %02x\n", cfg->speaker_alloc);
Expand Down