summaryrefslogtreecommitdiffstats
path: root/include/sound/hda_chmap.h
diff options
context:
space:
mode:
authorSubhransu S. Prusty <subhransu.s.prusty@intel.com>2016-04-04 15:53:54 +0200
committerTakashi Iwai <tiwai@suse.de>2016-04-04 16:04:24 +0200
commit44fde3b89ba1e154b3cec7d711703fff53852983 (patch)
tree5798bfdde03fa87a7b51a1ef10cfe3ea8415040b /include/sound/hda_chmap.h
parentMerge branch 'for-linus' into for-next (diff)
downloadlinux-44fde3b89ba1e154b3cec7d711703fff53852983.tar.xz
linux-44fde3b89ba1e154b3cec7d711703fff53852983.zip
ALSA: hda - Update chmap tlv to report sink's capability
The existing TLV callback implementation copies all of the cea_channel_speaker_allocation map table to the TLV container irrespective of what is reported by sink. This is of little use to the userspace application. With this patch, it parses the spk_alloc block as queried from the ELD, and copies only the corresponding mapping channel allocation entries from the cea channel speaker allocation table. Thus the user can parse the TLV container to identify sink's capability and set the channel map accordingly. It shouldn't impact the behavior in AMD chipset, as this makes use of already parsed spk alloc block to calculate the channel map. Signed-off-by: Subhransu S. Prusty <subhransu.s.prusty@intel.com> Signed-off-by: Vinod Koul <vinod.koul@intel.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include/sound/hda_chmap.h')
-rw-r--r--include/sound/hda_chmap.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/sound/hda_chmap.h b/include/sound/hda_chmap.h
index e20d219a0304..babd445c7505 100644
--- a/include/sound/hda_chmap.h
+++ b/include/sound/hda_chmap.h
@@ -36,6 +36,8 @@ struct hdac_chmap_ops {
int (*chmap_validate)(struct hdac_chmap *hchmap, int ca,
int channels, unsigned char *chmap);
+ int (*get_spk_alloc)(struct hdac_device *hdac, int pcm_idx);
+
void (*get_chmap)(struct hdac_device *hdac, int pcm_idx,
unsigned char *chmap);
void (*set_chmap)(struct hdac_device *hdac, int pcm_idx,