korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2025-01-08 23:04:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

ALSA: HDMI - Enable HBR feature on Intel chips

Browse Source 
HDMI channel remapping apparently effects HBR packets on Intel's chips.
For compressed non-PCM audio, use "straight-through" channel mapping.
For uncompressed multi-channel pcm audio, use normal channel mapping.

Signed-off-by: Wang Xingchao <xingchao.wang@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Wang Xingchao 2012-09-06 10:02:37 +08:00 committed by Takashi Iwai
parent 72357c78b7
commit 433968da4d
1 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
sound/pci/hda/patch_hdmi.c
View File

@ -34,6 +34,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <sound/core.h> #include <sound/core.h>
#include <sound/jack.h> #include <sound/jack.h>
#include <sound/asoundef.h>
#include "hda_codec.h" #include "hda_codec.h"
#include "hda_local.h" #include "hda_local.h"
#include "hda_jack.h" #include "hda_jack.h"
@ -60,6 +61,7 @@ struct hdmi_spec_per_cvt {
u32 rates; u32 rates;
u64 formats; u64 formats;
unsigned int maxbps; unsigned int maxbps;
bool non_pcm;
}; };
struct hdmi_spec_per_pin { struct hdmi_spec_per_pin {
@ -548,13 +550,17 @@ static void hdmi_debug_channel_mapping(struct hda_codec *codec,
static void hdmi_setup_channel_mapping(struct hda_codec *codec, static void hdmi_setup_channel_mapping(struct hda_codec *codec,
hda_nid_t pin_nid, hda_nid_t pin_nid,
hda_nid_t cvt_nid,
bool non_pcm,
int ca) int ca)
{ {
int i; int i;
int err; int err;
int order; int order;
int non_pcm_mapping[8];
order = get_channel_allocation_order(ca); order = get_channel_allocation_order(ca);
if (hdmi_channel_mapping[ca][1] == 0) { if (hdmi_channel_mapping[ca][1] == 0) {
for (i = 0; i < channel_allocations[order].channels; i++) for (i = 0; i < channel_allocations[order].channels; i++)
hdmi_channel_mapping[ca][i] = i | (i << 4); hdmi_channel_mapping[ca][i] = i | (i << 4);
@ -562,10 +568,17 @@ static void hdmi_setup_channel_mapping(struct hda_codec *codec,
hdmi_channel_mapping[ca][i] = 0xf | (i << 4); hdmi_channel_mapping[ca][i] = 0xf | (i << 4);
} }
if (non_pcm) {
for (i = 0; i < channel_allocations[order].channels; i++)
non_pcm_mapping[i] = i | (i << 4);
for (; i < 8; i++)
non_pcm_mapping[i] = 0xf | (i << 4);
}
for (i = 0; i < 8; i++) { for (i = 0; i < 8; i++) {
err = snd_hda_codec_write(codec, pin_nid, 0, err = snd_hda_codec_write(codec, pin_nid, 0,
AC_VERB_SET_HDMI_CHAN_SLOT, AC_VERB_SET_HDMI_CHAN_SLOT,
hdmi_channel_mapping[ca][i]); non_pcm ? non_pcm_mapping[i] : hdmi_channel_mapping[ca][i]);
if (err) { if (err) {
snd_printdd(KERN_NOTICE snd_printdd(KERN_NOTICE
"HDMI: channel mapping failed\n"); "HDMI: channel mapping failed\n");
@ -699,15 +712,27 @@ static bool hdmi_infoframe_uptodate(struct hda_codec *codec, hda_nid_t pin_nid,
} }
static void hdmi_setup_audio_infoframe(struct hda_codec *codec, int pin_idx, static void hdmi_setup_audio_infoframe(struct hda_codec *codec, int pin_idx,
struct snd_pcm_substream *substream) hda_nid_t cvt_nid, struct snd_pcm_substream *substream)
{ {
struct hdmi_spec *spec = codec->spec; struct hdmi_spec *spec = codec->spec;
struct hdmi_spec_per_pin *per_pin = &spec->pins[pin_idx]; struct hdmi_spec_per_pin *per_pin = &spec->pins[pin_idx];
struct hdmi_spec_per_cvt *per_cvt;
struct hda_spdif_out *spdif;
hda_nid_t pin_nid = per_pin->pin_nid; hda_nid_t pin_nid = per_pin->pin_nid;
int channels = substream->runtime->channels; int channels = substream->runtime->channels;
struct hdmi_eld *eld; struct hdmi_eld *eld;
int ca; int ca;
int cvt_idx;
union audio_infoframe ai; union audio_infoframe ai;
bool non_pcm = false;
cvt_idx = cvt_nid_to_cvt_index(spec, cvt_nid);
per_cvt = &spec->cvts[cvt_idx];
mutex_lock(&codec->spdif_mutex);
spdif = snd_hda_spdif_out_of_nid(codec, cvt_nid);
non_pcm = !!(spdif->status & IEC958_AES0_NONAUDIO);
mutex_unlock(&codec->spdif_mutex);
eld = &spec->pins[pin_idx].sink_eld; eld = &spec->pins[pin_idx].sink_eld;
if (!eld->monitor_present) if (!eld->monitor_present)
@ -750,12 +775,14 @@ static void hdmi_setup_audio_infoframe(struct hda_codec *codec, int pin_idx,
"pin=%d channels=%d\n", "pin=%d channels=%d\n",
pin_nid, pin_nid,
channels); channels);
hdmi_setup_channel_mapping(codec, pin_nid, ca); hdmi_setup_channel_mapping(codec, pin_nid, cvt_nid, non_pcm, ca);
hdmi_stop_infoframe_trans(codec, pin_nid); hdmi_stop_infoframe_trans(codec, pin_nid);
hdmi_fill_audio_infoframe(codec, pin_nid, hdmi_fill_audio_infoframe(codec, pin_nid,
ai.bytes, sizeof(ai)); ai.bytes, sizeof(ai));
hdmi_start_infoframe_trans(codec, pin_nid); hdmi_start_infoframe_trans(codec, pin_nid);
} }
per_cvt->non_pcm = non_pcm;
} }
@ -1077,6 +1104,7 @@ static int hdmi_add_cvt(struct hda_codec *codec, hda_nid_t cvt_nid)
per_cvt->cvt_nid = cvt_nid; per_cvt->cvt_nid = cvt_nid;
per_cvt->channels_min = 2; per_cvt->channels_min = 2;
per_cvt->non_pcm = false;
if (chans <= 16) if (chans <= 16)
per_cvt->channels_max = chans; per_cvt->channels_max = chans;
@ -1164,7 +1192,7 @@ static int generic_hdmi_playback_pcm_prepare(struct hda_pcm_stream *hinfo,
hdmi_set_channel_count(codec, cvt_nid, substream->runtime->channels); hdmi_set_channel_count(codec, cvt_nid, substream->runtime->channels);
hdmi_setup_audio_infoframe(codec, pin_idx, substream); hdmi_setup_audio_infoframe(codec, pin_idx, cvt_nid, substream);
pinctl = snd_hda_codec_read(codec, pin_nid, 0, pinctl = snd_hda_codec_read(codec, pin_nid, 0,
AC_VERB_GET_PIN_WIDGET_CONTROL, 0); AC_VERB_GET_PIN_WIDGET_CONTROL, 0);