October 2017 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [alsa-lib][PATCH] test/seq-decoder: enable timestamping for external subscribers
by Antonio Ospite 03 Oct '17

03 Oct '17

Events sent by external clients subscribed to the input port are not timestamped. This inconsistent behavior may surprise newbies who look at seq-decoder as a reference example. See the example below using "vkeybd --addr 128:0" to connect to seq-decoder, the events sent by vkeybd are on a different queue with no timestamps: ... EVENT>>> Type = 66, flags = 0x0, time = 0 ticks Source = 0.1, dest = 128.0, queue = 253 Event = Port Subscribed; 129:0 -> 128:0 EVENT>>> Type = 66, flags = 0x1, time = 4.829712627 Source = 0.1, dest = 128.0, queue = 0 Event = Port Subscribed; 129:0 -> 128:0 EVENT>>> Type = 10, flags = 0x0, time = 0 ticks Source = 129.0, dest = 128.0, queue = 253 Event = Controller; ch=0, param=0, value=0 EVENT>>> Type = 11, flags = 0x0, time = 0 ticks Source = 129.0, dest = 128.0, queue = 253 Event = Program Change; ch=0, program=0 ... After the change events are on the main queue and are timestamped: ... EVENT>>> Type = 66, flags = 0x1, time = 4.280907223 Source = 0.1, dest = 128.0, queue = 0 Event = Port Subscribed; 129:0 -> 128:0 EVENT>>> Type = 66, flags = 0x1, time = 4.280912063 Source = 0.1, dest = 128.0, queue = 0 Event = Port Subscribed; 129:0 -> 128:0 EVENT>>> Type = 10, flags = 0x1, time = 4.280990702 Source = 129.0, dest = 128.0, queue = 0 Event = Controller; ch=0, param=0, value=0 EVENT>>> Type = 11, flags = 0x1, time = 4.280994862 Source = 129.0, dest = 128.0, queue = 0 Event = Program Change; ch=0, program=0 ... Signed-off-by: Antonio Ospite <ao2(a)ao2.it> --- Hi, while looking into improving the alsamidisrc[1,2] GStreamer element, I took a better look at what the sequencer API could do and started using test/seq-decoder.c as a reference example. I noticed the issue discussed above and I tried to fix it in order to have a more consistent behavior of event timestamping. I think the new behavior is less surprising for newbies but I may still be missing something, please let me know if I am. Thanks, Antonio [1] https://cgit.freedesktop.org/gstreamer/gst-plugins-base/tree/ext/alsa/gstal… [2] https://bugzilla.gnome.org/show_bug.cgi?id=787683 test/seq-decoder.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/test/seq-decoder.c b/test/seq-decoder.c index b110e98d..38755553 100644 --- a/test/seq-decoder.c +++ b/test/seq-decoder.c @@ -283,6 +283,12 @@ void event_decoder(snd_seq_t *handle, int argc, char *argv[]) snd_seq_port_info_set_name(pinfo, "Input"); snd_seq_port_info_set_type(pinfo, SND_SEQ_PORT_TYPE_MIDI_GENERIC); snd_seq_port_info_set_capability(pinfo, SND_SEQ_PORT_CAP_WRITE | SND_SEQ_PORT_CAP_READ | SND_SEQ_PORT_CAP_SUBS_WRITE); + + /* Enable timestamping for events sent by external subscribers. */ + snd_seq_port_info_set_timestamping(pinfo, 1); + snd_seq_port_info_set_timestamp_real(pinfo, 1); + snd_seq_port_info_set_timestamp_queue(pinfo, queue); + if ((err = snd_seq_create_port(handle, pinfo)) < 0) { fprintf(stderr, "Cannot create input port: %s\n", snd_strerror(err)); return; -- 2.14.1

2 1

[alsa-devel] [alsa-lib][PATCH] seq: fix snd_seq_set_queue_tempo() usage example in the documentation
by Antonio Ospite 03 Oct '17

03 Oct '17

snd_seq_set_queue_tempo() requires a queue id as the second argument, fix the example in documentation to reflect that. Also add the queue id as an argument of the set_tempo() function, just to keep the whole example compilable. Signed-off-by: Antonio Ospite <ao2(a)ao2.it> --- src/seq/seq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/seq/seq.c b/src/seq/seq.c index d5ed1c6a..808c7915 100644 --- a/src/seq/seq.c +++ b/src/seq/seq.c @@ -452,13 +452,13 @@ For setting these tempo parameters, use #snd_seq_queue_tempo_t record. For example, to set the tempo of the queue <code>q</code> to 48 PPQ, 60 BPM, \code -void set_tempo(snd_seq_t *handle) +void set_tempo(snd_seq_t *handle, int queue) { snd_seq_queue_tempo_t *tempo; snd_seq_queue_tempo_alloca(&tempo); snd_seq_queue_tempo_set_tempo(tempo, 1000000); // 60 BPM snd_seq_queue_tempo_set_ppq(tempo, 48); // 48 PPQ - snd_seq_set_queue_tempo(handle, tempo); + snd_seq_set_queue_tempo(handle, queue, tempo); } \endcode -- 2.14.2

3 3

[alsa-devel] ASoC Sound Driver I2S over LPE, Intel Baytrail SoC. MinnowBoard Max
by Michael Pogrebinsky 02 Oct '17

02 Oct '17

Hi all, I have the MinnowBoard Max with Baytrail Atom (ValleyView) SoC. I'm attempting to write an Alsa (ASoC) driver for my sound card to work with this board. PCM should work through I2S for this sound card I have. >From my understanding Baytrail's I2S goes over LPE. I read this thread:https://www.mail-archive.com/elinux-minnowboard@lists.elinux.org/msg… So I understand that I need the 3 components for my ASoC driver. However I am having trouble at understanding how to communicate with the LPE to get the I2S working. Here is what I have done so far: I am running Ubuntu 14.04 LTS, kernel : 4.3.0-040300rc4 First of all I downloaded the firmware fw_sst_0f28.bin-48kHz_i2s_master fromhttps://kernel.googlesource.com/pub/scm/linux/kernel/git/firmware/linux… And put it /lib/firmware/intel/. Later I went to the Bios and enabled LPE in PCI mode. I do see the LPE controller now, but it shows as UNCLAIMED. Later I looked at the sound/soc/inte/baytrail/ and from my understanding in order for me to get the I2S working I need to load this module so I did modprobe snd-soc-sst-baytrail-pcm. Later I wrote a simple codec and machine driver (looking at the example of sound/soc/intel/boards/byt_max98090) however everytime I attempt to register the sound card with snd_soc_register_card, I get the following error message in dmesg : "ASoC: CPU DAI baytrail-pcm-audio not registered". >From this I deduct that although I loaded the snd-soc-sst-baytrail-pcm module, the driver has not actually been loaded. I'm clueless on how to proceed from here. I would highly appreciate your help.

3 7

[alsa-devel] usb/sound/usx2y: warning in usb_stream_new/__alloc_pages_slowpath
by Andrey Konovalov 02 Oct '17

02 Oct '17

Hi! I've got the following report while fuzzing the kernel with syzkaller. On commit ebb2c2437d8008d46796902ff390653822af6cc4 (Sep 18). ------------[ cut here ]------------ WARNING: CPU: 1 PID: 1846 at mm/page_alloc.c:3883 __alloc_pages_slowpath+0x1ef2/0x2d70 Modules linked in: CPU: 1 PID: 1846 Comm: kworker/1:2 Not tainted 4.14.0-rc1-42251-gebb2c2437d80 #215 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS Bochs 01/01/2011 Workqueue: usb_hub_wq hub_event task: ffff8800643c18c0 task.stack: ffff88006b658000 RIP: 0010:trace_reclaim_retry_zone ./include/trace/events/oom.h:31 RIP: 0010:should_reclaim_retry mm/page_alloc.c:3783 RIP: 0010:__alloc_pages_slowpath+0x1ef2/0x2d70 mm/page_alloc.c:4039 RSP: 0018:ffff88006b65d938 EFLAGS: 00010246 RAX: 00000000ffffa666 RBX: 00000000014000c0 RCX: 0000000000000000 RDX: 0000000000000000 RSI: 0000000000000034 RDI: 000000000140c0c0 RBP: ffff88006b65e088 R08: 0000000000000000 R09: fffffffffff00f88 R10: 0000000000000000 R11: 0000000000000085 R12: ffff88006b65e130 R13: ffff88006b65e270 R14: ffff88006b65e0f0 R15: 000000000140c0c0 FS: 0000000000000000(0000) GS:ffff88006c900000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000020829000 CR3: 0000000063cce000 CR4: 00000000000006e0 Call Trace: __alloc_pages_nodemask+0x921/0xf70 mm/page_alloc.c:4217 alloc_pages_current+0xbb/0x1f0 mm/mempolicy.c:2035 alloc_pages ./include/linux/gfp.h:505 __get_free_pages+0x14/0x50 mm/page_alloc.c:4248 usb_stream_new+0x50f/0x9f0 sound/usb/usx2y/usb_stream.c:214 us122l_start+0xb0/0x250 sound/usb/usx2y/us122l.c:355 us122l_create_card sound/usb/usx2y/us122l.c:502 us122l_usb_probe sound/usb/usx2y/us122l.c:588 snd_us122l_probe+0xa62/0x15d0 sound/usb/usx2y/us122l.c:623 usb_probe_interface+0x35d/0x8e0 drivers/usb/core/driver.c:361 really_probe drivers/base/dd.c:413 driver_probe_device+0x610/0xa00 drivers/base/dd.c:557 __device_attach_driver+0x230/0x290 drivers/base/dd.c:653 bus_for_each_drv+0x161/0x210 drivers/base/bus.c:463 __device_attach+0x26e/0x3d0 drivers/base/dd.c:710 device_initial_probe+0x1f/0x30 drivers/base/dd.c:757 bus_probe_device+0x1eb/0x290 drivers/base/bus.c:523 device_add+0xd0b/0x1660 drivers/base/core.c:1835 usb_set_configuration+0x104e/0x1870 drivers/usb/core/message.c:1932 generic_probe+0x73/0xe0 drivers/usb/core/generic.c:174 usb_probe_device+0xaf/0xe0 drivers/usb/core/driver.c:266 really_probe drivers/base/dd.c:413 driver_probe_device+0x610/0xa00 drivers/base/dd.c:557 __device_attach_driver+0x230/0x290 drivers/base/dd.c:653 bus_for_each_drv+0x161/0x210 drivers/base/bus.c:463 __device_attach+0x26e/0x3d0 drivers/base/dd.c:710 device_initial_probe+0x1f/0x30 drivers/base/dd.c:757 bus_probe_device+0x1eb/0x290 drivers/base/bus.c:523 device_add+0xd0b/0x1660 drivers/base/core.c:1835 usb_new_device+0x7b8/0x1020 drivers/usb/core/hub.c:2457 hub_port_connect drivers/usb/core/hub.c:4903 hub_port_connect_change drivers/usb/core/hub.c:5009 port_event drivers/usb/core/hub.c:5115 hub_event+0x194d/0x3740 drivers/usb/core/hub.c:5195 process_one_work+0xc7f/0x1db0 kernel/workqueue.c:2119 worker_thread+0x221/0x1850 kernel/workqueue.c:2253 kthread+0x3a1/0x470 kernel/kthread.c:231 ret_from_fork+0x2a/0x40 arch/x86/entry/entry_64.S:431 Code: be 47 00 00 00 48 c7 c7 20 42 8b 85 c6 05 5e 35 99 05 01 e8 91 1f cb ff 48 8b 8d d8 f8 ff ff 44 8b 9d 50 f9 ff ff e9 57 fc ff ff <0f> ff e9 79 e3 ff ff 0f ff c7 85 e8 f8 ff ff 00 00 00 00 89 d8 ---[ end trace 78800971cbd5f94f ]---

2 4

[alsa-devel] [PATCH] ASoC: rockchip: Fix wrong allocation size of dapm routes
by Jeffy Chen 02 Oct '17

02 Oct '17

The allocation size of dapm routes is wrong, correct it. Fixes: d9f9c167edae ("ASoC: rockchip: Init dapm routes dynamically") Signed-off-by: Jeffy Chen <jeffy.chen(a)rock-chips.com> --- sound/soc/rockchip/rk3399_gru_sound.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sound/soc/rockchip/rk3399_gru_sound.c b/sound/soc/rockchip/rk3399_gru_sound.c index 30eed83e8a13..008452e55ef8 100644 --- a/sound/soc/rockchip/rk3399_gru_sound.c +++ b/sound/soc/rockchip/rk3399_gru_sound.c @@ -493,14 +493,18 @@ static int rockchip_sound_of_parse_dais(struct device *dev, struct device_node *np_codec; struct snd_soc_dai_link *dai; struct snd_soc_dapm_route *routes; - int i, index; + int i, index, max_num_routes; card->dai_link = devm_kzalloc(dev, sizeof(rockchip_dais), GFP_KERNEL); if (!card->dai_link) return -ENOMEM; - routes = devm_kzalloc(dev, sizeof(rockchip_routes), + max_num_routes = 0; + for (i = 0; i < ARRAY_SIZE(rockchip_dais); i++) + max_num_routes += rockchip_routes[i].num_routes; + + routes = devm_kzalloc(dev, max_num_routes * sizeof(*routes), GFP_KERNEL); if (!routes) return -ENOMEM; -- 2.11.0

2 1

[alsa-devel] [PATCH] ALSA: line6: make snd_pcm_ops const
by Bhumika Goyal 02 Oct '17

02 Oct '17

Make these const as they are only passed to a const argument of the function snd_pcm_set_ops in the file referencing them. Also, add const to the declaration in the headers. Structures found using Coccinelle and changes done by hand. Signed-off-by: Bhumika Goyal <bhumirks(a)gmail.com> --- sound/usb/line6/capture.c | 2 +- sound/usb/line6/capture.h | 2 +- sound/usb/line6/playback.c | 2 +- sound/usb/line6/playback.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/usb/line6/capture.c b/sound/usb/line6/capture.c index 7c81256..947d616 100644 --- a/sound/usb/line6/capture.c +++ b/sound/usb/line6/capture.c @@ -248,7 +248,7 @@ static int snd_line6_capture_close(struct snd_pcm_substream *substream) } /* capture operators */ -struct snd_pcm_ops snd_line6_capture_ops = { +const struct snd_pcm_ops snd_line6_capture_ops = { .open = snd_line6_capture_open, .close = snd_line6_capture_close, .ioctl = snd_pcm_lib_ioctl, diff --git a/sound/usb/line6/capture.h b/sound/usb/line6/capture.h index 890b21b..b67ccc3 100644 --- a/sound/usb/line6/capture.h +++ b/sound/usb/line6/capture.h @@ -17,7 +17,7 @@ #include "driver.h" #include "pcm.h" -extern struct snd_pcm_ops snd_line6_capture_ops; +extern const struct snd_pcm_ops snd_line6_capture_ops; extern void line6_capture_copy(struct snd_line6_pcm *line6pcm, char *fbuf, int fsize); diff --git a/sound/usb/line6/playback.c b/sound/usb/line6/playback.c index 812d181..819e9b2 100644 --- a/sound/usb/line6/playback.c +++ b/sound/usb/line6/playback.c @@ -393,7 +393,7 @@ static int snd_line6_playback_close(struct snd_pcm_substream *substream) } /* playback operators */ -struct snd_pcm_ops snd_line6_playback_ops = { +const struct snd_pcm_ops snd_line6_playback_ops = { .open = snd_line6_playback_open, .close = snd_line6_playback_close, .ioctl = snd_pcm_lib_ioctl, diff --git a/sound/usb/line6/playback.h b/sound/usb/line6/playback.h index 51fce29..d8d3b8a 100644 --- a/sound/usb/line6/playback.h +++ b/sound/usb/line6/playback.h @@ -27,7 +27,7 @@ */ #define USE_CLEAR_BUFFER_WORKAROUND 1 -extern struct snd_pcm_ops snd_line6_playback_ops; +extern const struct snd_pcm_ops snd_line6_playback_ops; extern int line6_create_audio_out_urbs(struct snd_line6_pcm *line6pcm); extern int line6_submit_audio_out_all_urbs(struct snd_line6_pcm *line6pcm); -- 1.9.1

3 2

[alsa-devel] [PATCH] Revert "ALSA: echoaudio: purge contradictions between dimension matrix members and total number of members"
by Takashi Sakamoto 02 Oct '17

02 Oct '17

This reverts commit 275353bb684e to fix a regression which can abort 'alsactl' program in alsa-utils due to assertion in alsa-lib. alsactl: control.c:2513: snd_ctl_elem_value_get_integer: Assertion `idx < sizeof(obj->value.integer.value) / sizeof(obj->value.integer.value[0])' failed. alsactl: control.c:2976: snd_ctl_elem_value_get_integer: Assertion `idx < ARRAY_SIZE(obj->value.integer.value)' failed. This commit is a band-aid. In a point of usage of ALSA control interface, the drivers still bring an issue that they prevent userspace applications to have a consistent way to parse each levels of the dimension information via ALSA control interface. Let me investigate this issue. Current implementation of the drivers have three control element sets with dimension information: * 'Monitor Mixer Volume' (type: integer) * 'VMixer Volume' (type: integer) * 'VU-meters' (type: boolean) Although the number of elements named as 'Monitor Mixer Volume' differs depending on drivers in this group, it can be calculated by macros defined by each driver (= (BX_NUM - BX_ANALOG_IN) * BX_ANALOG_IN). Each of the elements has one member for value and has dimension information with 2 levels (= BX_ANALOG_IN * (BX_NUM - BX_ANALOG_IN)). For these elements, userspace applications are expected to handle the dimension information so that all of the elements construct a matrix where the number of rows and columns are represented by the dimension information. The same way is applied to elements named as 'VMixer Volume'. The number of these elements can also be calculated by macros defined by each drivers (= PX_ANALOG_IN * BX_ANALOG_IN). Each of the element has one member for value and has dimension information with 2 levels (= BX_ANALOG_IN * PX_ANALOG_IN). All of the elements construct a matrix with the dimension information. An element named as 'VU-meters' gets a different way in a point of dimension information. The element includes 96 members for value. The element has dimension information with 3 levels (= 3 or 2 * 16 * 2). For this element, userspace applications are expected to handle the dimension information so that all of the members for value construct a matrix where the number of rows and columns are represented by the dimension information. This is different from the way for the former. As a summary, the drivers were not designed to produce a consistent way to parse the dimension information. This makes it hard for general userspace applications such as amixer to parse the information by a consistent way, and actually no userspace applications except for 'echomixer' utilize the dimension information. Additionally, no drivers excluding this group use the information. The reverted commit was written based on the latter way. A commit 860c1994a70a ('ALSA: control: add dimension validator for userspace elements') is written based on the latter way, too. The patch should be reconsider too in the same time to re-define a consistent way to parse the dimension information. Reported-by: Mark Hills <mark(a)xwax.org> Reported-by: S. Christian Collins <s.chriscollins(a)gmail.com> Fixes: 275353bb684e ('ALSA: echoaudio: purge contradictions between dimension matrix members and total number of members') Cc: <stable(a)vger.kernel.org> # v4.8+ Signed-off-by: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> --- sound/pci/echoaudio/echoaudio.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/pci/echoaudio/echoaudio.c b/sound/pci/echoaudio/echoaudio.c index 7326695bca33..d68f99e076a8 100644 --- a/sound/pci/echoaudio/echoaudio.c +++ b/sound/pci/echoaudio/echoaudio.c @@ -1272,11 +1272,11 @@ static int snd_echo_mixer_info(struct snd_kcontrol *kcontrol, chip = snd_kcontrol_chip(kcontrol); uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; + uinfo->count = 1; uinfo->value.integer.min = ECHOGAIN_MINOUT; uinfo->value.integer.max = ECHOGAIN_MAXOUT; uinfo->dimen.d[0] = num_busses_out(chip); uinfo->dimen.d[1] = num_busses_in(chip); - uinfo->count = uinfo->dimen.d[0] * uinfo->dimen.d[1]; return 0; } @@ -1344,11 +1344,11 @@ static int snd_echo_vmixer_info(struct snd_kcontrol *kcontrol, chip = snd_kcontrol_chip(kcontrol); uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; + uinfo->count = 1; uinfo->value.integer.min = ECHOGAIN_MINOUT; uinfo->value.integer.max = ECHOGAIN_MAXOUT; uinfo->dimen.d[0] = num_busses_out(chip); uinfo->dimen.d[1] = num_pipes_out(chip); - uinfo->count = uinfo->dimen.d[0] * uinfo->dimen.d[1]; return 0; } @@ -1728,6 +1728,7 @@ static int snd_echo_vumeters_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) { uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; + uinfo->count = 96; uinfo->value.integer.min = ECHOGAIN_MINOUT; uinfo->value.integer.max = 0; #ifdef ECHOCARD_HAS_VMIXER @@ -1737,7 +1738,6 @@ static int snd_echo_vumeters_info(struct snd_kcontrol *kcontrol, #endif uinfo->dimen.d[1] = 16; /* 16 channels */ uinfo->dimen.d[2] = 2; /* 0=level, 1=peak */ - uinfo->count = uinfo->dimen.d[0] * uinfo->dimen.d[1] * uinfo->dimen.d[2]; return 0; } -- 2.11.0

2 1

[alsa-devel] [PATCH 0/2] ASoC: img-spdif-in: Add power management
by Ed Blake 02 Oct '17

02 Oct '17

This patch set adds power managment to the img-spdif-in driver. The first patch adds system PM suspend / resume handling and the second patch adds runtime PM. Ed Blake (2): ASoC: img-spdif-in: Add suspend / resume handling ASoC: img-spdif-in: Add runtime PM sound/soc/img/img-spdif-in.c | 111 ++++++++++++++++++++++++++++++++++++++----- 1 file changed, 99 insertions(+), 12 deletions(-) -- 1.9.1

1 2

[alsa-devel] [PATCH v1 0/2] Fix first detection issue with headset
by Damien Riegel 02 Oct '17

02 Oct '17

This series fix an issue with headset being misidentified on the very first time a device is plugged in by calling the function that configures the bias when the MBHC is setup. I've split this series into two patches because pm8916_wcd_setup_mbhc needs to be moved a few lines below to avoid forward declaring it. It is overkill but that was not part of the code snippet that Srinivas acked, and I wanted to be extra sure not to misattribute an Acked-by. Damien Riegel (2): ASoC: codecs: msm8916-wcd-analog: move pm8916_wcd_setup_mbhc ASoC: codecs: msm8916-wcd-analog: configure micbias in mbhc setup sound/soc/codecs/msm8916-wcd-analog.c | 94 +++++++++++++++++++---------------- 1 file changed, 50 insertions(+), 44 deletions(-) -- 2.14.1

2 3

[alsa-devel] [PATCH v2] ALSA: hda - program ICT bits to support HBR audio
by Pierre-Louis Bossart 02 Oct '17

02 Oct '17

From: Sriram Periyasamy <sriramx.periyasamy(a)intel.com> On recent Intel platforms (Haswell, Broadwell, Skylake, ApolloLake, KabyLake, ...), the IEC Coding Type (ICT) bitfield in the Digital Converter Control #3 needs to be set explicitly for HDMI/DisplayPort High Bit Rate (HBR) audio playback to work. This was not required in earlier platforms when HBR was first introduced. The ICT bits are defined in Section 7.3.3.9 of the HDaudio 1.0a specification. Since the ICT bitfield was not specified for HDAudio 1.0 devices (before 2009), we only program it on machines more recent than Haswell. We tested that this fix is not needed on Baytrail-I (MinnowBoard Turbot) and believe by extension it also does not apply to Braswell. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98797 Signed-off-by: Sriram Periyasamy <sriramx.periyasamy(a)intel.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Signed-off-by: Subhransu S. Prusty <subhransu.s.prusty(a)intel.com> --- v2: move digi3 verb in Set section, only set ICT for haswell and newer include/sound/hda_verbs.h | 1 + sound/pci/hda/patch_hdmi.c | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/include/sound/hda_verbs.h b/include/sound/hda_verbs.h index d0509db6d0ec..d2004d7feb2b 100644 --- a/include/sound/hda_verbs.h +++ b/include/sound/hda_verbs.h @@ -54,6 +54,7 @@ enum { #define AC_VERB_GET_EAPD_BTLENABLE 0x0f0c #define AC_VERB_GET_DIGI_CONVERT_1 0x0f0d #define AC_VERB_GET_DIGI_CONVERT_2 0x0f0e /* unused */ +#define AC_VERB_SET_DIGI_CONVERT_3 0x73e #define AC_VERB_GET_VOLUME_KNOB_CONTROL 0x0f0f /* f10-f1a: GPIO */ #define AC_VERB_GET_GPIO_DATA 0x0f15 diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 53f9311370de..8566de298ea3 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -906,6 +906,7 @@ static int hdmi_setup_stream(struct hda_codec *codec, hda_nid_t cvt_nid, hda_nid_t pin_nid, u32 stream_tag, int format) { struct hdmi_spec *spec = codec->spec; + unsigned int param; int err; err = spec->ops.pin_hbr_setup(codec, pin_nid, is_hbr_format(format)); @@ -915,6 +916,26 @@ static int hdmi_setup_stream(struct hda_codec *codec, hda_nid_t cvt_nid, return err; } + if (is_haswell_plus(codec)) { + + /* + * on recent platforms IEC Coding Type is required for HBR + * support, read current Digital Converter settings and set + * ICT bitfield if needed. + */ + param = snd_hda_codec_read(codec, cvt_nid, 0, + AC_VERB_GET_DIGI_CONVERT_1, 0); + + param = (param >> 16) & ~(AC_DIG3_ICT); + + /* on recent platforms ICT mode is required for HBR support */ + if (is_hbr_format(format)) + param |= 0x1; + + snd_hda_codec_write(codec, cvt_nid, 0, + AC_VERB_SET_DIGI_CONVERT_3, param); + } + snd_hda_codec_setup_stream(codec, cvt_nid, stream_tag, 0, format); return 0; } -- 2.11.0

3 4