aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/hda_local.h
diff options
context:
space:
mode:
authorWu Fengguang <fengguang.wu@intel.com>2009-10-30 06:44:26 -0400
committerTakashi Iwai <tiwai@suse.de>2009-10-30 06:44:26 -0400
commit54a25f87e943fc77f57e86849897ad6602519286 (patch)
tree669440adf0fa4342f250fb68937a23a879c19a89 /sound/pci/hda/hda_local.h
parentddb8152b054e357907f57fb5ae65d494a3c79065 (diff)
ALSA: hda - vectorize intelhdmi
The Intel IbexPeak HDMI codec supports 2 converters and 3 pins, which requires converting the cvt_nid/pin_nid to arrays. The active pin number (the one connected with a live HDMI monitor/sink) will be dynamically identified on hotplug events. It exports two HDMI devices, so that user space can choose the A/V pipe for sending the audio samples. It's still undefined behavior when there are two active monitors connected and routed to the same audio converter. Signed-off-by: Wu Fengguang <fengguang.wu@intel.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/hda_local.h')
-rw-r--r--sound/pci/hda/hda_local.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/pci/hda/hda_local.h b/sound/pci/hda/hda_local.h
index 5f1dcc59002b..461e0c15c77a 100644
--- a/sound/pci/hda/hda_local.h
+++ b/sound/pci/hda/hda_local.h
@@ -541,11 +541,13 @@ int snd_hdmi_get_eld(struct hdmi_eld *, struct hda_codec *, hda_nid_t);
541void snd_hdmi_show_eld(struct hdmi_eld *eld); 541void snd_hdmi_show_eld(struct hdmi_eld *eld);
542 542
543#ifdef CONFIG_PROC_FS 543#ifdef CONFIG_PROC_FS
544int snd_hda_eld_proc_new(struct hda_codec *codec, struct hdmi_eld *eld); 544int snd_hda_eld_proc_new(struct hda_codec *codec, struct hdmi_eld *eld,
545 int index);
545void snd_hda_eld_proc_free(struct hda_codec *codec, struct hdmi_eld *eld); 546void snd_hda_eld_proc_free(struct hda_codec *codec, struct hdmi_eld *eld);
546#else 547#else
547static inline int snd_hda_eld_proc_new(struct hda_codec *codec, 548static inline int snd_hda_eld_proc_new(struct hda_codec *codec,
548 struct hdmi_eld *eld) 549 struct hdmi_eld *eld,
550 int index)
549{ 551{
550 return 0; 552 return 0;
551} 553}