diff options
| author | Takashi Iwai <tiwai@suse.de> | 2017-02-02 17:06:38 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2017-02-03 17:37:34 +0100 |
| commit | 36ed34662f1944ebf553b30fcba1abab1703d125 (patch) | |
| tree | a8b506e48e86bbadd6dd8ec9ca4e545f0d15a493 /sound/x86 | |
| parent | 4aedb9465f717a8393bb5f40581eb7942af12506 (diff) | |
| download | linux-36ed34662f1944ebf553b30fcba1abab1703d125.tar.gz linux-36ed34662f1944ebf553b30fcba1abab1703d125.tar.bz2 linux-36ed34662f1944ebf553b30fcba1abab1703d125.zip | |
ALSA: x86: Set CA bits for DisplayPort too
This is a guess work. Usually the DP audio info frame is just 8-bit
shifted from HDMI AI, so let's try to put CA in DIP frame 2 [24-31].
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/x86')
| -rw-r--r-- | sound/x86/intel_hdmi_audio.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/x86/intel_hdmi_audio.c b/sound/x86/intel_hdmi_audio.c index f49520117dd6..24a18b88c927 100644 --- a/sound/x86/intel_hdmi_audio.c +++ b/sound/x86/intel_hdmi_audio.c @@ -626,20 +626,20 @@ static void snd_intelhad_prog_dip(struct snd_pcm_substream *substream, u8 checksum = 0; u32 info_frame; int channels; + int ca; channels = substream->runtime->channels; had_write_register(intelhaddata, AUD_CNTL_ST, ctrl_state.regval); + ca = snd_intelhad_channel_allocation(intelhaddata, channels); if (intelhaddata->dp_output) { info_frame = DP_INFO_FRAME_WORD1; - frame2.regval = 1; + frame2.regval = (substream->runtime->channels - 1) | (ca << 24); } else { info_frame = HDMI_INFO_FRAME_WORD1; frame2.regx.chnl_cnt = substream->runtime->channels - 1; - - frame3.regx.chnl_alloc = snd_intelhad_channel_allocation( - intelhaddata, channels); + frame3.regx.chnl_alloc = ca; /* Calculte the byte wide checksum for all valid DIP words */ for (i = 0; i < BYTES_PER_WORD; i++) |