November 2019 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH -next] ASoC: rt5677: Fix build error without CONFIG_SPI
by YueHaibing 28 Nov '19

28 Nov '19

If CONFIG_SPI is n, SND_SOC_RT5677_SPI also is n, building fails: sound/soc/codecs/rt5677.o: In function `rt5677_irq': rt5677.c:(.text+0x2dbf): undefined reference to `rt5677_spi_hotword_detected' sound/soc/codecs/rt5677.o: In function `rt5677_dsp_work': rt5677.c:(.text+0x3709): undefined reference to `rt5677_spi_write' This adds stub helpers to fix this. Reported-by: Hulk Robot <hulkci(a)huawei.com> Fixes: 461c623270e4 ("ASoC: rt5677: Load firmware via SPI using delayed work") Signed-off-by: YueHaibing <yuehaibing(a)huawei.com> --- sound/soc/codecs/rt5677-spi.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/sound/soc/codecs/rt5677-spi.h b/sound/soc/codecs/rt5677-spi.h index 3af36ec..088b779 100644 --- a/sound/soc/codecs/rt5677-spi.h +++ b/sound/soc/codecs/rt5677-spi.h @@ -9,9 +9,25 @@ #ifndef __RT5677_SPI_H__ #define __RT5677_SPI_H__ +#if IS_ENABLED(CONFIG_SND_SOC_RT5677_SPI) int rt5677_spi_read(u32 addr, void *rxbuf, size_t len); int rt5677_spi_write(u32 addr, const void *txbuf, size_t len); int rt5677_spi_write_firmware(u32 addr, const struct firmware *fw); void rt5677_spi_hotword_detected(void); +#else +static inline int rt5677_spi_read(u32 addr, void *rxbuf, size_t len) +{ + return -EINVAL; +} +static inline int rt5677_spi_write(u32 addr, const void *txbuf, size_t len) +{ + return -EINVAL; +} +static inline int rt5677_spi_write_firmware(u32 addr, const struct firmware *fw) +{ + return -EINVAL; +} +static inline void rt5677_spi_hotword_detected(void){} +#endif #endif /* __RT5677_SPI_H__ */ -- 2.7.4

3 2

[alsa-devel] [PATCH] ASoC: wm8904: fix automatic sysclk configuration
by Michael Walle 28 Nov '19

28 Nov '19

The simple-card tries to signal the codec to disable rate constraints, see commit 2458adb8f92a ("SoC: simple-card-utils: set 0Hz to sysclk when shutdown"). This wasn't handled by the codec, instead it would set the FLL frequency to 0Hz which isn't working. Since we don't have any rate constraints just ignore this request. Fixes: 13409d27cb39 ("ASoC: wm8904: configure sysclk/FLL automatically") Signed-off-by: Michael Walle <michael(a)walle.cc> --- sound/soc/codecs/wm8904.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sound/soc/codecs/wm8904.c b/sound/soc/codecs/wm8904.c index 7d7ea15d73e0..5ffbaddd6e49 100644 --- a/sound/soc/codecs/wm8904.c +++ b/sound/soc/codecs/wm8904.c @@ -1806,6 +1806,12 @@ static int wm8904_set_sysclk(struct snd_soc_dai *dai, int clk_id, switch (clk_id) { case WM8904_CLK_AUTO: + /* We don't have any rate constraints, so just ignore the + * request to disable constraining. + */ + if (!freq) + return 0; + mclk_freq = clk_get_rate(priv->mclk); /* enable FLL if a different sysclk is desired */ if (mclk_freq != freq) { -- 2.20.1

3 2

[alsa-devel] [PATCH v2 0/3] ASoC: max98090: fix PLL unlocked workaround-related
by Tzung-Bi Shih 28 Nov '19

28 Nov '19

This series is a follow up fix for the question: https://mailman.alsa-project.org/pipermail/alsa-devel/2019-October/157364.h… Changes from v1: ASoC: max98090: remove msleep in PLL unlocked workaround - add more comments https://mailman.alsa-project.org/pipermail/alsa-devel/2019-November/158969.… ASoC: max98090: exit workaround earlier if PLL is locked - "sleep first and then check the status" https://mailman.alsa-project.org/pipermail/alsa-devel/2019-November/158998.… ASoC: max98090: fix possible race conditions - fix typo https://mailman.alsa-project.org/pipermail/alsa-devel/2019-November/158966.… - add more descriptions in commit message Tzung-Bi Shih (3): ASoC: max98090: remove msleep in PLL unlocked workaround ASoC: max98090: exit workaround earlier if PLL is locked ASoC: max98090: fix possible race conditions sound/soc/codecs/max98090.c | 30 +++++++++++++++++++++--------- sound/soc/codecs/max98090.h | 1 - 2 files changed, 21 insertions(+), 10 deletions(-) -- 2.24.0.432.g9d3f5f5b63-goog

3 7

[alsa-devel] [PATCHv2 0/6] ASoC: da7213: support for usage with simple-card
by Sebastian Reichel 28 Nov '19

28 Nov '19

Hi, This extends the da7213 driver to be used with simple-audio-card in combination with a fixed clock. Here is a snippet of the downstream board's DT, that is supposed to be supported by this patchset. --------------------------------------------------------------------- / { sound { compatible = "simple-audio-card"; simple-audio-card,name = "audio-card"; simple-audio-card,format = "i2s"; simple-audio-card,bitclock-master = <&dailink_master>; simple-audio-card,frame-master = <&dailink_master>; simple-audio-card,widgets = "Speaker", "Ext Spk"; simple-audio-card,audio-routing = "Ext Spk", "LINE"; simple-audio-card,cpu { sound-dai = <&ssi1>; }; dailink_master: simple-audio-card,codec { sound-dai = <&codec>; }; }; clk_ext_audio_codec: clock-codec { compatible = "fixed-clock"; #clock-cells = <0>; clock-frequency = <12288000>; }; }; &i2c1 { codec: audio-codec@1a { compatible = "dlg,da7212"; reg = <0x1a>; #sound-dai-cells = <0>; VDDA-supply = <&reg_2v5_audio>; VDDSP-supply = <&reg_5v0_audio>; VDDMIC-supply = <&reg_3v3_audio>; VDDIO-supply = <&reg_3v3_audio>; clocks = <&clk_ext_audio_codec>; clock-names = "mclk"; }; }; --------------------------------------------------------------------- Changes since PATCHv1: * https://lore.kernel.org/alsa-devel/20191108174843.11227-1-sebastian.reichel… * add patch adding da7212 compatible to DT bindings * update regulator patch, so that VDDA is enabled together with VDDIO while the device is enabled to avoid device reset * update clock patch, so that automatic PLL handling is not enabled when PLL is configured manually * update clock patch, so that automatic PLL is disabled when the device is suspended * update clock patch, so that automatic PLL is configured into bypass mode when possible -- Sebastian Sebastian Reichel (6): ASoC: da7213: Add da7212 DT compatible ASoC: da7213: Add regulator support ASoC: da7213: Provide selectable option ASoC: da7213: Move set_sysclk to codec level ASoC: da7213: Move set_pll to codec level ASoC: da7213: Add default clock handling .../devicetree/bindings/sound/da7213.txt | 8 +- sound/soc/codecs/Kconfig | 3 +- sound/soc/codecs/da7213.c | 171 ++++++++++++++++-- sound/soc/codecs/da7213.h | 11 ++ 4 files changed, 177 insertions(+), 16 deletions(-) -- 2.24.0

3 27

[alsa-devel] Dell headphone has noise on unmute state for ALC236
by Kailang 28 Nov '19

28 Nov '19

Hi Takashi, headphone have noise even the volume is very small. Let it fill up pcbeep hidden register to default value. The issue was gone. The patch as attach file. Many thanks. BR, Kailang

2 1

[alsa-devel] [PATCH v3] ALSA: hda: hdmi - fix regression in connect list handling
by Kai Vehmanen 28 Nov '19

28 Nov '19

Fix regression in how intel_haswell_fixup_connect_list() results are used in hda_read_pin_conn(). Use of snd_hda_get_raw_connections() in hda_read_pin_conn() bypasses the cache and thus also bypasses the overridden pin connection list. On platforms that require the connection list fixup, mux list will be empty and HDMI playback will fail to -EBUSY at open. Fix the regression in hda_read_pinn_conn(). Simplify code as suggested by Takashi Iwai to remove old intel_haswell_fixup_connect_list() and copy the cvt_nid list directly and not use snd_hda_override_conn_list() at all. Fixes: 9c32fea83692 ("ALSA: hda - Add DP-MST support for non-acomp codecs") BugLink: https://github.com/thesofproject/linux/issues/1537 Cc: Nikhil Mahale <nmahale(a)nvidia.com> Signed-off-by: Kai Vehmanen <kai.vehmanen(a)linux.intel.com> --- sound/pci/hda/patch_hdmi.c | 38 ++++++++++++-------------------------- 1 file changed, 12 insertions(+), 26 deletions(-) diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 55d20e40a195..373ca99b7a2f 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -1302,6 +1302,7 @@ static int hdmi_read_pin_conn(struct hda_codec *codec, int pin_idx) struct hdmi_spec_per_pin *per_pin = get_pin(spec, pin_idx); hda_nid_t pin_nid = per_pin->pin_nid; int dev_id = per_pin->dev_id; + int conns; if (!(get_wcaps(codec, pin_nid) & AC_WCAP_CONN_LIST)) { codec_warn(codec, @@ -1312,10 +1313,18 @@ static int hdmi_read_pin_conn(struct hda_codec *codec, int pin_idx) snd_hda_set_dev_select(codec, pin_nid, dev_id); + if (spec->intel_hsw_fixup) { + conns = spec->num_cvts; + memcpy(per_pin->mux_nids, spec->cvt_nids, + sizeof(hda_nid_t) * conns); + } else { + conns = snd_hda_get_raw_connections(codec, pin_nid, + per_pin->mux_nids, + HDA_MAX_CONNECTIONS); + } + /* all the device entries on the same pin have the same conn list */ - per_pin->num_mux_nids = - snd_hda_get_raw_connections(codec, pin_nid, per_pin->mux_nids, - HDA_MAX_CONNECTIONS); + per_pin->num_mux_nids = conns; return 0; } @@ -1713,9 +1722,6 @@ static void hdmi_repoll_eld(struct work_struct *work) mutex_unlock(&spec->pcm_lock); } -static void intel_haswell_fixup_connect_list(struct hda_codec *codec, - hda_nid_t nid); - static int hdmi_add_pin(struct hda_codec *codec, hda_nid_t pin_nid) { struct hdmi_spec *spec = codec->spec; @@ -1790,8 +1796,6 @@ static int hdmi_add_pin(struct hda_codec *codec, hda_nid_t pin_nid) per_pin->dev_id = i; per_pin->non_pcm = false; snd_hda_set_dev_select(codec, pin_nid, i); - if (spec->intel_hsw_fixup) - intel_haswell_fixup_connect_list(codec, pin_nid); err = hdmi_read_pin_conn(codec, pin_idx); if (err < 0) return err; @@ -2603,24 +2607,6 @@ static void generic_acomp_init(struct hda_codec *codec, * Intel codec parsers and helpers */ -static void intel_haswell_fixup_connect_list(struct hda_codec *codec, - hda_nid_t nid) -{ - struct hdmi_spec *spec = codec->spec; - hda_nid_t conns[4]; - int nconns; - - nconns = snd_hda_get_raw_connections(codec, nid, conns, - ARRAY_SIZE(conns)); - if (nconns == spec->num_cvts && - !memcmp(conns, spec->cvt_nids, spec->num_cvts * sizeof(hda_nid_t))) - return; - - /* override pins connection list */ - codec_dbg(codec, "hdmi: haswell: override pin connection 0x%x\n", nid); - snd_hda_override_conn_list(codec, nid, spec->num_cvts, spec->cvt_nids); -} - #define INTEL_GET_VENDOR_VERB 0xf81 #define INTEL_SET_VENDOR_VERB 0x781 #define INTEL_EN_DP12 0x02 /* enable DP 1.2 features */ -- 2.17.1

3 2

[alsa-devel] [PATCH v2 00/12] treewide: break dependencies on x86's RM header
by Sean Christopherson 27 Nov '19

27 Nov '19

x86's asm/realmode.h, which defines low level structures, variables and helpers used to bring up APs during SMP boot, ends up getting included in practically every nook and cranny of the kernel because the address used by ACPI for resuming from S3 also happens to be stored in the real mode header, and ACPI bleeds the dependency into its widely included headers. As a result, modifying realmode.h for even the most trivial change to the boot code triggers a full kernel rebuild, which is frustrating to say the least as it some of the most difficult code to get exactly right *and* is also some of the most functionally isolated code in the kernel. To break the kernel's widespread dependency on realmode.h, add a wrapper in the aforementioned ACPI S3 code to access the real mode header instead of derefencing the header directly in asm/acpi.h and thereby exposing it to the world via linux/acpi.h. v2: - Rebased on tip/x86/cleanups, commit b74374fef924 ("x86/setup: Enhance the comments"). - Use acpi_get_wakeup_address() as new function name. [Boris and Pavel] - Capture acpi_get_wakeup_address() in a local address. [Pavel] - Collect acks. I didn't add Rafael's acks on patches 11 and 12 due to the above changes. - Explicitly call out the removal of <asm/realmode.h> from <asm/acpi.h> in patch 12. [Ingo] - Remove superfluous Fixes: tags. [Ard] Patch Synopsis: - Patches 01-09 fix a variety of build errors that arise when patch 12 drops realmode.h from asm/acpi.h. Most of the errors are quite absurb as they have no relation whatsoever to x86's RM boot code, but occur because realmode.h happens to include asm/io.h. - Patch 10 removes a spurious include of realmode.h from an ACPI header. - Patches 11 and 12 implement the wrapper and move it out of acpi.h. Sean Christopherson (12): x86/efi: Explicitly include realmode.h to handle RM trampoline quirk x86/boot: Explicitly include realmode.h to handle RM reservations x86/ftrace: Explicitly include vmalloc.h for set_vm_flush_reset_perms() x86/kprobes: Explicitly include vmalloc.h for set_vm_flush_reset_perms() perf/x86/intel: Explicitly include asm/io.h to use virt_to_phys() efi/capsule-loader: Explicitly include linux/io.h for page_to_phys() virt: vbox: Explicitly include linux/io.h to pick up various defs vmw_balloon: Explicitly include linux/io.h for virt_to_phys() ASoC: Intel: Skylake: Explicitly include linux/io.h for virt_to_phys() x86/ACPI/sleep: Remove an unnecessary include of asm/realmode.h ACPI/sleep: Convert acpi_wakeup_address into a function x86/ACPI/sleep: Move acpi_get_wakeup_address() into sleep.c, remove <asm/realmode.h> from <asm/acpi.h> arch/ia64/include/asm/acpi.h | 5 ++++- arch/ia64/kernel/acpi.c | 2 -- arch/x86/events/intel/ds.c | 1 + arch/x86/include/asm/acpi.h | 3 +-- arch/x86/kernel/acpi/sleep.c | 11 +++++++++++ arch/x86/kernel/acpi/sleep.h | 2 +- arch/x86/kernel/ftrace.c | 1 + arch/x86/kernel/kprobes/core.c | 1 + arch/x86/kernel/setup.c | 1 + arch/x86/platform/efi/quirks.c | 1 + drivers/acpi/sleep.c | 3 +++ drivers/firmware/efi/capsule-loader.c | 1 + drivers/misc/vmw_balloon.c | 1 + drivers/virt/vboxguest/vboxguest_core.c | 1 + drivers/virt/vboxguest/vboxguest_utils.c | 1 + sound/soc/intel/skylake/skl-sst-cldma.c | 1 + 16 files changed, 30 insertions(+), 6 deletions(-) -- 2.24.0

3 16

[alsa-devel] kernel oops related to the new HDA audio handling for DP MST
by Michał Matysiak 27 Nov '19

27 Nov '19

Hi Recently I've encountered this error and as Hans de Goede's request I'm reporting this back to you. This happens while booting my laptop connected to docking station and without using one. kernel: WARNING: CPU: 1 PID: 330 at sound/hda/hdac_component.c:290 snd_hdac_acomp_init+0xde/0x130 [snd_hda_core] There are 2 more "cut here", but they're almost identical so I've only included one in this email. Don't know what will be valuable to you, but I'm willing to help test this and do what I'm told. So, how can I help? More info about this particular kernel and issue, that led to this is at: https://bugzilla.redhat.com/show_bug.cgi?id=1757891 dmesg output: Nov 26 18:05:45 kernel: microcode: microcode updated early to revision 0x2f, date = 2019-02-17 Nov 26 18:05:45 kernel: Linux version 5.4.0-0.rc8.git0.1.rhbz1757891.fc31.x86_64 (mockbuild(a)buildhw-10.phx2.fedoraproject.org) (gcc version 9.2.1 20190827 (Red Hat 9.2.1-1) (GCC)) #1 SMP Wed Nov 20 14:50:34 UTC 2019 Nov 26 18:05:45 kernel: Command line: BOOT_IMAGE=(hd0,gpt2)/vmlinuz-5.4.0-0.rc8.git0.1.rhbz1757891.fc31.x86_64 root=/dev/mapper/fedora-root ro resume=/dev/mapper/fedora-swap rd.lvm.lv=fedora/root rd.luks.uuid=luks-efd8b438-8f56-405a-8cea-88f83ca38d2b rd.lvm.lv=fedora/swap rhgb quiet ... ... ... Nov 26 18:06:16 kernel: ------------[ cut here ]------------ Nov 26 18:06:16 kernel: WARNING: CPU: 0 PID: 461 at sound/hda/hdac_component.c:290 snd_hdac_acomp_init+0xde/0x130 [snd_hda_core] Nov 26 18:06:16 kernel: Modules linked in: intel_rapl_msr intel_rapl_common iwldvm x86_pkg_temp_thermal intel_powerclamp snd_hda_codec_hdmi coretemp mac80211 snd_hda_codec_conexant snd_hda_codec_generic kvm_intel snd_hda_intel libarc4 snd_intel_nhlt kvm mei_wdt iTCO_wdt snd_hda_codec mei_hdcp iwlwifi irqbypass iTCO_vendor_support snd_hda_core intel_cstate snd_hwdep snd_seq intel_uncore snd_seq_device thinkpad_acpi joydev i2c_i801 wmi_bmof intel_rapl_perf snd_pcm pcspkr ledtrig_audio cfg80211 snd_timer mei_me snd mei soundcore lpc_ich rfkill binfmt_misc ip_tables dm_crypt i915 nouveau crct10dif_pclmul crc32_pclmul mxm_wmi crc32c_intel ttm i2c_algo_bit drm_kms_helper ghash_clmulni_intel sdhci_pci cqhci drm sdhci serio_raw e1000e firewire_ohci mmc_core firewire_core crc_itu_t wmi video fuse Nov 26 18:06:16 kernel: CPU: 0 PID: 461 Comm: kworker/0:2 Tainted: G W 5.4.0-0.rc8.git0.1.rhbz1757891.fc31.x86_64 #1 Nov 26 18:06:16 kernel: Hardware name: LENOVO 42844DG/42844DG, BIOS 8BET66WW (1.46 ) 06/14/2018 Nov 26 18:06:16 kernel: Workqueue: events azx_probe_work [snd_hda_intel] Nov 26 18:06:16 kernel: RIP: 0010:snd_hdac_acomp_init+0xde/0x130 [snd_hda_core] Nov 26 18:06:16 kernel: Code: 41 89 c4 85 c0 78 3a 45 31 e4 48 8b 44 24 08 65 48 33 04 25 28 00 00 00 75 22 48 83 c4 10 44 89 e0 5b 5d 41 5c 41 5d 41 5e c3 <0f> 0b 41 bc f0 ff ff ff eb d6 41 bc f4 ff ff ff eb ce e8 6b 7c 5f Nov 26 18:06:16 kernel: RSP: 0018:ffffa5e4002a3c28 EFLAGS: 00010286 Nov 26 18:06:16 kernel: RAX: ffff984ae816a7e8 RBX: ffff984aebf91000 RCX: ffff984aeb50c338 Nov 26 18:06:16 kernel: RDX: 0000000000000001 RSI: 0000000000000282 RDI: 0000000000000282 Nov 26 18:06:16 kernel: RBP: ffff984ae53e4df0 R08: 0000000000000282 R09: ffff984aebe4e738 Nov 26 18:06:16 kernel: R10: ffff984ae778a180 R11: ffffa5e4002a3c0f R12: ffffffffc0c270c0 Nov 26 18:06:16 kernel: R13: ffff984aeb50c0b0 R14: 0000000000000000 R15: 0000000000000001 Nov 26 18:06:16 kernel: FS: 0000000000000000(0000) GS:ffff984aee000000(0000) knlGS:0000000000000000 Nov 26 18:06:16 kernel: CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 Nov 26 18:06:16 kernel: CR2: 00007f3a343e8000 CR3: 000000035360a006 CR4: 00000000000606f0 Nov 26 18:06:16 kernel: Call Trace: Nov 26 18:06:16 kernel: generic_acomp_init+0x71/0x90 [snd_hda_codec_hdmi] Nov 26 18:06:16 kernel: patch_nvhdmi+0x58/0x60 [snd_hda_codec_hdmi] Nov 26 18:06:16 kernel: hda_codec_driver_probe+0x92/0x150 [snd_hda_codec] Nov 26 18:06:16 kernel: really_probe+0x298/0x3c0 Nov 26 18:06:16 kernel: driver_probe_device+0xb6/0x100 Nov 26 18:06:16 kernel: ? driver_allows_async_probing+0x50/0x50 Nov 26 18:06:16 kernel: bus_for_each_drv+0x7e/0xc0 Nov 26 18:06:16 kernel: __device_attach+0xdf/0x160 Nov 26 18:06:16 kernel: bus_probe_device+0x8e/0xa0 Nov 26 18:06:16 kernel: device_add+0x3a2/0x670 Nov 26 18:06:16 kernel: snd_hdac_device_register+0x12/0x60 [snd_hda_core] Nov 26 18:06:16 kernel: snd_hda_codec_configure+0x45/0x150 [snd_hda_codec] Nov 26 18:06:16 kernel: azx_codec_configure+0x2f/0x60 [snd_hda_codec] Nov 26 18:06:16 kernel: azx_probe_continue+0x48c/0x700 [snd_hda_intel] Nov 26 18:06:16 kernel: process_one_work+0x1b0/0x350 Nov 26 18:06:16 kernel: worker_thread+0x50/0x3b0 Nov 26 18:06:16 kernel: kthread+0xfb/0x130 Nov 26 18:06:16 kernel: ? process_one_work+0x350/0x350 Nov 26 18:06:16 kernel: ? kthread_park+0x90/0x90 Nov 26 18:06:16 kernel: ret_from_fork+0x35/0x40 Nov 26 18:06:16 kernel: ---[ end trace 3c8d65bedba62849 ]--- Nov 26 18:06:16 kernel: input: HDA NVidia HDMI/DP,pcm=3 as /devices/pci0000:00/0000:00:01.0/0000:01:00.1/sound/card1/input15 Nov 26 18:06:16 kernel: input: HDA NVidia HDMI/DP,pcm=7 as /devices/pci0000:00/0000:00:01.0/0000:01:00.1/sound/card1/input16 Nov 26 18:06:16 kernel: input: HDA NVidia HDMI/DP,pcm=8 as /devices/pci0000:00/0000:00:01.0/0000:01:00.1/sound/card1/input17 Nov 26 18:06:16 kernel: input: HDA NVidia HDMI/DP,pcm=9 as /devices/pci0000:00/0000:00:01.0/0000:01:00.1/sound/card1/input18 -- Regards, Michał Matysiak

3 13

[alsa-devel] [PATCH v2] ALSA: hda: hdmi - fix regression in connect list handling
by Kai Vehmanen 27 Nov '19

27 Nov '19

Fix regression in how intel_haswell_fixup_connect_list() results are used in hda_read_pin_conn(). Use of snd_hda_get_raw_connections() in hda_read_pin_conn() bypasses the cache and thus also bypasses the overridden pin connection list. On platforms that require the connection list fixup, mux list will be empty and HDMI playback will fail to -EBUSY at open. Fix the regression in hda_read_pinn_conn(). Simplify code as suggested by Takashi Iwai to remove old intel_haswell_fixup_connect_list() and copy the cvt_nid list directly and not use snd_hda_override_conn_list() at all. Fixes: 9c32fea83692 ("ALSA: hda - Add DP-MST support for non-acomp codecs") BugLink: https://github.com/thesofproject/linux/issues/1537 Cc: Nikhil Mahale <nmahale(a)nvidia.com> Signed-off-by: Kai Vehmanen <kai.vehmanen(a)linux.intel.com> --- sound/pci/hda/patch_hdmi.c | 42 +++++++++++--------------------------- 1 file changed, 12 insertions(+), 30 deletions(-) diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 55d20e40a195..cad99e1f9222 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -1302,6 +1302,7 @@ static int hdmi_read_pin_conn(struct hda_codec *codec, int pin_idx) struct hdmi_spec_per_pin *per_pin = get_pin(spec, pin_idx); hda_nid_t pin_nid = per_pin->pin_nid; int dev_id = per_pin->dev_id; + int conns; if (!(get_wcaps(codec, pin_nid) & AC_WCAP_CONN_LIST)) { codec_warn(codec, @@ -1312,10 +1313,18 @@ static int hdmi_read_pin_conn(struct hda_codec *codec, int pin_idx) snd_hda_set_dev_select(codec, pin_nid, dev_id); + if (spec->intel_hsw_fixup) { + conns = spec->num_cvts; + memcpy(per_pin->mux_nids, spec->cvt_nids, + sizeof(hda_nid_t) * conns); + } else { + conns = snd_hda_get_raw_connections(codec, pin_nid, + per_pin->mux_nids, + HDA_MAX_CONNECTIONS); + } + /* all the device entries on the same pin have the same conn list */ - per_pin->num_mux_nids = - snd_hda_get_raw_connections(codec, pin_nid, per_pin->mux_nids, - HDA_MAX_CONNECTIONS); + per_pin->num_mux_nids = conns; return 0; } @@ -1713,9 +1722,6 @@ static void hdmi_repoll_eld(struct work_struct *work) mutex_unlock(&spec->pcm_lock); } -static void intel_haswell_fixup_connect_list(struct hda_codec *codec, - hda_nid_t nid); - static int hdmi_add_pin(struct hda_codec *codec, hda_nid_t pin_nid) { struct hdmi_spec *spec = codec->spec; @@ -1790,8 +1796,6 @@ static int hdmi_add_pin(struct hda_codec *codec, hda_nid_t pin_nid) per_pin->dev_id = i; per_pin->non_pcm = false; snd_hda_set_dev_select(codec, pin_nid, i); - if (spec->intel_hsw_fixup) - intel_haswell_fixup_connect_list(codec, pin_nid); err = hdmi_read_pin_conn(codec, pin_idx); if (err < 0) return err; @@ -2599,28 +2603,6 @@ static void generic_acomp_init(struct hda_codec *codec, } } -/* - * Intel codec parsers and helpers - */ - -static void intel_haswell_fixup_connect_list(struct hda_codec *codec, - hda_nid_t nid) -{ - struct hdmi_spec *spec = codec->spec; - hda_nid_t conns[4]; - int nconns; - - nconns = snd_hda_get_raw_connections(codec, nid, conns, - ARRAY_SIZE(conns)); - if (nconns == spec->num_cvts && - !memcmp(conns, spec->cvt_nids, spec->num_cvts * sizeof(hda_nid_t))) - return; - - /* override pins connection list */ - codec_dbg(codec, "hdmi: haswell: override pin connection 0x%x\n", nid); - snd_hda_override_conn_list(codec, nid, spec->num_cvts, spec->cvt_nids); -} - #define INTEL_GET_VENDOR_VERB 0xf81 #define INTEL_SET_VENDOR_VERB 0x781 #define INTEL_EN_DP12 0x02 /* enable DP 1.2 features */ -- 2.17.1

1 0

[alsa-devel] [PATCH] ALSA: hda: hdmi - fix regression in connect list handling
by Kai Vehmanen 27 Nov '19

27 Nov '19

Fix regression in how intel_haswell_fixup_connect_list() results are used in hda_read_pin_conn(). Use of snd_hda_get_raw_connections() in hda_read_pin_conn() bypasses the cache and thus also bypasses the overridden pin connection list. On platforms that require the connection list fixup, mux list will be empty and HDMI playback will fail to -EBUSY at open. Move intel_haswell_fixup_connect_list() call to hda_read_pin_conn() as it's not used elsewhere. Fixes: 9c32fea83692 ("ALSA: hda - Add DP-MST support for non-acomp codecs") BugLink: https://github.com/thesofproject/linux/issues/1537 Cc: Nikhil Mahale <nmahale(a)nvidia.com> Signed-off-by: Kai Vehmanen <kai.vehmanen(a)linux.intel.com> --- sound/pci/hda/patch_hdmi.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 55d20e40a195..c111bdd566c9 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -1293,6 +1293,9 @@ static int hdmi_pcm_open(struct hda_pcm_stream *hinfo, return err; } +static void intel_haswell_fixup_connect_list(struct hda_codec *codec, + hda_nid_t nid); + /* * HDA/HDMI auto parsing */ @@ -1302,6 +1305,7 @@ static int hdmi_read_pin_conn(struct hda_codec *codec, int pin_idx) struct hdmi_spec_per_pin *per_pin = get_pin(spec, pin_idx); hda_nid_t pin_nid = per_pin->pin_nid; int dev_id = per_pin->dev_id; + int conns; if (!(get_wcaps(codec, pin_nid) & AC_WCAP_CONN_LIST)) { codec_warn(codec, @@ -1312,10 +1316,19 @@ static int hdmi_read_pin_conn(struct hda_codec *codec, int pin_idx) snd_hda_set_dev_select(codec, pin_nid, dev_id); + if (spec->intel_hsw_fixup) { + intel_haswell_fixup_connect_list(codec, pin_nid); + conns = snd_hda_get_connections(codec, pin_nid, + per_pin->mux_nids, + HDA_MAX_CONNECTIONS); + } else { + conns = snd_hda_get_raw_connections(codec, pin_nid, + per_pin->mux_nids, + HDA_MAX_CONNECTIONS); + } + /* all the device entries on the same pin have the same conn list */ - per_pin->num_mux_nids = - snd_hda_get_raw_connections(codec, pin_nid, per_pin->mux_nids, - HDA_MAX_CONNECTIONS); + per_pin->num_mux_nids = conns; return 0; } @@ -1713,9 +1726,6 @@ static void hdmi_repoll_eld(struct work_struct *work) mutex_unlock(&spec->pcm_lock); } -static void intel_haswell_fixup_connect_list(struct hda_codec *codec, - hda_nid_t nid); - static int hdmi_add_pin(struct hda_codec *codec, hda_nid_t pin_nid) { struct hdmi_spec *spec = codec->spec; @@ -1790,8 +1800,6 @@ static int hdmi_add_pin(struct hda_codec *codec, hda_nid_t pin_nid) per_pin->dev_id = i; per_pin->non_pcm = false; snd_hda_set_dev_select(codec, pin_nid, i); - if (spec->intel_hsw_fixup) - intel_haswell_fixup_connect_list(codec, pin_nid); err = hdmi_read_pin_conn(codec, pin_idx); if (err < 0) return err; -- 2.17.1

2 3