Re: [GIT PULL] sound fixes for 5.0
The pull request you sent on Wed, 20 Feb 2019 11:42:46 +0100: > git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git tags/sound-5.0 has been merged into torvalds/linux.git: https://git.kernel.org/torvalds/c/2137397c92aec3713fa10be3c9b830f9a1674e60 Thank you! -- Deet-doot-dot, I am a bot. https://korg.wiki.kernel.org/userdoc/prtracker
[GIT PULL] sound fixes for 5.0
Linus, please pull sound fixes for v5.0 from: git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git tags/sound-5.0 The topmost commit is 268836649c07e0d38866006b5e94294b5bbc9806 sound fixes for 5.0 Here are a few last-minute fixes for 5.0. The most significant one is the OF-node refcount fix for ASoC simple-card, which could be triggered on many boards. Another fix for ASoC core is for the error handling in topology, while others are device-specific fixes for Samsung and HD-audio. Bard liao (1): ASoC: topology: free created components in tplg load error Hui Wang (1): ALSA: hda/realtek: Disable PC beep in passthrough on alc285 Jeremy Soller (1): ALSA: hda/realtek - Headset microphone and internal speaker support for System76 oryp5 Kuninori Morimoto (1): ASoC: simple-card: fixup refcount_t underflow Sylwester Nawrocki (1): ASoC: samsung: i2s: Fix prescaler setting for the secondary DAI --- sound/pci/hda/patch_realtek.c | 42 - sound/soc/generic/simple-card.c | 2 +- sound/soc/samsung/i2s.c | 8 +++- sound/soc/soc-topology.c| 8 +++- 4 files changed, 56 insertions(+), 4 deletions(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 6df758adff84..1ffa36e987b4 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -1855,6 +1855,8 @@ enum { ALC887_FIXUP_BASS_CHMAP, ALC1220_FIXUP_GB_DUAL_CODECS, ALC1220_FIXUP_CLEVO_P950, + ALC1220_FIXUP_SYSTEM76_ORYP5, + ALC1220_FIXUP_SYSTEM76_ORYP5_PINS, }; static void alc889_fixup_coef(struct hda_codec *codec, @@ -2056,6 +2058,17 @@ static void alc1220_fixup_clevo_p950(struct hda_codec *codec, snd_hda_override_conn_list(codec, 0x1b, 1, conn1); } +static void alc_fixup_headset_mode_no_hp_mic(struct hda_codec *codec, + const struct hda_fixup *fix, int action); + +static void alc1220_fixup_system76_oryp5(struct hda_codec *codec, +const struct hda_fixup *fix, +int action) +{ + alc1220_fixup_clevo_p950(codec, fix, action); + alc_fixup_headset_mode_no_hp_mic(codec, fix, action); +} + static const struct hda_fixup alc882_fixups[] = { [ALC882_FIXUP_ABIT_AW9D_MAX] = { .type = HDA_FIXUP_PINS, @@ -2300,6 +2313,19 @@ static const struct hda_fixup alc882_fixups[] = { .type = HDA_FIXUP_FUNC, .v.func = alc1220_fixup_clevo_p950, }, + [ALC1220_FIXUP_SYSTEM76_ORYP5] = { + .type = HDA_FIXUP_FUNC, + .v.func = alc1220_fixup_system76_oryp5, + }, + [ALC1220_FIXUP_SYSTEM76_ORYP5_PINS] = { + .type = HDA_FIXUP_PINS, + .v.pins = (const struct hda_pintbl[]) { + { 0x19, 0x01a1913c }, /* use as headset mic, without its own jack detect */ + {} + }, + .chained = true, + .chain_id = ALC1220_FIXUP_SYSTEM76_ORYP5, + }, }; static const struct snd_pci_quirk alc882_fixup_tbl[] = { @@ -2376,6 +2402,8 @@ static const struct snd_pci_quirk alc882_fixup_tbl[] = { SND_PCI_QUIRK(0x1558, 0x9501, "Clevo P950HR", ALC1220_FIXUP_CLEVO_P950), SND_PCI_QUIRK(0x1558, 0x95e1, "Clevo P95xER", ALC1220_FIXUP_CLEVO_P950), SND_PCI_QUIRK(0x1558, 0x95e2, "Clevo P950ER", ALC1220_FIXUP_CLEVO_P950), + SND_PCI_QUIRK(0x1558, 0x96e1, "System76 Oryx Pro (oryp5)", ALC1220_FIXUP_SYSTEM76_ORYP5_PINS), + SND_PCI_QUIRK(0x1558, 0x97e1, "System76 Oryx Pro (oryp5)", ALC1220_FIXUP_SYSTEM76_ORYP5_PINS), SND_PCI_QUIRK_VENDOR(0x1558, "Clevo laptop", ALC882_FIXUP_EAPD), SND_PCI_QUIRK(0x161f, 0x2054, "Medion laptop", ALC883_FIXUP_EAPD), SND_PCI_QUIRK(0x17aa, 0x3a0d, "Lenovo Y530", ALC882_FIXUP_LENOVO_Y530), @@ -5632,6 +5660,7 @@ enum { ALC294_FIXUP_ASUS_SPK, ALC225_FIXUP_HEADSET_JACK, ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE, + ALC285_FIXUP_LENOVO_PC_BEEP_IN_NOISE, }; static const struct hda_fixup alc269_fixups[] = { @@ -6587,6 +6616,17 @@ static const struct hda_fixup alc269_fixups[] = { .chained = true, .chain_id = ALC269_FIXUP_HEADSET_MODE_NO_HP_MIC }, + [ALC285_FIXUP_LENOVO_PC_BEEP_IN_NOISE] = { + .type = HDA_FIXUP_VERBS, + .v.verbs = (const struct hda_verb[]) { + /* Disable PCBEEP-IN passthrough */ + { 0x20, AC_VERB_SET_COEF_INDEX, 0x36 }, + { 0x20, AC_VERB_SET_PROC_COEF, 0x57d7 }, + { } + }, + .chained = true, + .chain_id =
Re: [GIT PULL] sound fixes for 5.0-rc7
The pull request you sent on Tue, 12 Feb 2019 15:38:23 +0100: > git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git > tags/sound-5.0-rc7 has been merged into torvalds/linux.git: https://git.kernel.org/torvalds/c/1d110257c290a2c825d83ff6d12fef9732429dd2 Thank you! -- Deet-doot-dot, I am a bot. https://korg.wiki.kernel.org/userdoc/prtracker
[GIT PULL] sound fixes for 5.0-rc7
Linus, please pull sound fixes for v5.0-rc7 from: git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git tags/sound-5.0-rc7 The topmost commit is 00a399cad1a063e7665f06b6497a807db20441fd sound fixes for 5.0-rc7 It's a bit of surprising that we've got more changes than hoped at this late stage, but the all don't look too scaring but small fixes. One change in ALSA core side is again the PCM regression fix that was partially addressed for OSS, but now the all relevant change is reverted instead. Also, a few ASoC core fixes for UAF and OOB are included, while the rest are usual random device-specific fixes. Charles Keepax (1): ASoC: core: Allow soc_find_component lookups to match parent of_node Fabio Estevam (1): ASoC: MAINTAINERS: fsl: Change Fabio's email address Guennadi Liakhovetski (1): ASoC: topology: fix oops/use-after-free case with dai driver Jiada Wang (1): ASoC: rsnd: ssiu: correct shift bit for ssiu9 Jurica Vukadin (1): ALSA: hda - Add quirk for HP EliteBook 840 G5 Kuninori Morimoto (2): ASoC: rsnd: fixup MIX kctrl registration ASoC: rsnd: fixup rsnd_ssi_master_clk_start() user count check Manuel Reinhardt (1): ALSA: usb-audio: Fix implicit fb endpoint setup by quirk Pierre-Louis Bossart (1): ASoC: dapm: fix out-of-bounds accesses to DAPM lookup tables Russell King (1): ASoC: hdmi-codec: fix oops on re-probe Shuming Fan (1): ASoC: rt5682: Correct the setting while select ASRC clk for AD/DA filter Sylwester Nawrocki (1): ASoC: samsung: Prevent clk_get_rate() calls in atomic context Takashi Iwai (1): ALSA: pcm: Revert capture stream behavior change in blocking mode --- MAINTAINERS| 4 ++-- sound/core/pcm_lib.c | 20 sound/pci/hda/patch_conexant.c | 1 + sound/soc/codecs/hdmi-codec.c | 4 ++-- sound/soc/codecs/rt5682.c | 2 ++ sound/soc/samsung/i2s.c| 10 +- sound/soc/sh/rcar/core.c | 8 sound/soc/sh/rcar/ssi.c| 2 +- sound/soc/sh/rcar/ssiu.c | 2 +- sound/soc/soc-core.c | 9 +++-- sound/soc/soc-dapm.c | 24 sound/soc/soc-topology.c | 5 + sound/usb/pcm.c| 9 - 13 files changed, 66 insertions(+), 34 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 9919840d54cd..41ce5f4ad838 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6151,7 +6151,7 @@ FREESCALE SOC SOUND DRIVERS M: Timur Tabi M: Nicolin Chen M: Xiubo Li -R: Fabio Estevam +R: Fabio Estevam L: alsa-de...@alsa-project.org (moderated for non-subscribers) L: linuxppc-...@lists.ozlabs.org S: Maintained @@ -10898,7 +10898,7 @@ F: include/linux/nvmem-consumer.h F: include/linux/nvmem-provider.h NXP SGTL5000 DRIVER -M: Fabio Estevam +M: Fabio Estevam L: alsa-de...@alsa-project.org (moderated for non-subscribers) S: Maintained F: Documentation/devicetree/bindings/sound/sgtl5000.txt diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c index 6c99fa8ac5fa..6c0b30391ba9 100644 --- a/sound/core/pcm_lib.c +++ b/sound/core/pcm_lib.c @@ -2112,13 +2112,6 @@ int pcm_lib_apply_appl_ptr(struct snd_pcm_substream *substream, return 0; } -/* allow waiting for a capture stream that hasn't been started */ -#if IS_ENABLED(CONFIG_SND_PCM_OSS) -#define wait_capture_start(substream) ((substream)->oss.oss) -#else -#define wait_capture_start(substream) false -#endif - /* the common loop for read/write data */ snd_pcm_sframes_t __snd_pcm_lib_xfer(struct snd_pcm_substream *substream, void *data, bool interleaved, @@ -2184,16 +2177,11 @@ snd_pcm_sframes_t __snd_pcm_lib_xfer(struct snd_pcm_substream *substream, snd_pcm_update_hw_ptr(substream); if (!is_playback && - runtime->status->state == SNDRV_PCM_STATE_PREPARED) { - if (size >= runtime->start_threshold) { - err = snd_pcm_start(substream); - if (err < 0) - goto _end_unlock; - } else if (!wait_capture_start(substream)) { - /* nothing to do */ - err = 0; + runtime->status->state == SNDRV_PCM_STATE_PREPARED && + size >= runtime->start_threshold) { + err = snd_pcm_start(substream); + if (err < 0) goto _end_unlock; - } } avail = snd_pcm_avail(substream); diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c index 152f54137082..a4ee7656d9ee 100644 --- a/sound/pci/hda/patch_conexant.c +++ b/sound/pci/hda/patch_conexant.c @@ -924,6 +924,7 @@ static const
Re: [GIT PULL] sound fixes for 5.0-rc6
The pull request you sent on Thu, 07 Feb 2019 09:28:22 +0100: > git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git > tags/sound-5.0-rc6 has been merged into torvalds/linux.git: https://git.kernel.org/torvalds/c/6f64e3a4de749575e4705fa53dd49aed28f92623 Thank you! -- Deet-doot-dot, I am a bot. https://korg.wiki.kernel.org/userdoc/prtracker
[GIT PULL] sound fixes for 5.0-rc6
Linus, please pull sound fixes for v5.0-rc6 from: git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git tags/sound-5.0-rc6 The topmost commit is c97617a81a7616d49bc3700959e08c6c6f447093 sound fixes for 5.0-rc6 A collection of a few small fixes. The most significant one is the fix for the possible race at loading HD-audio drivers. This has been present for long time and surfaced only in a rare occasion, but finally spotted out. The rest are usual device-specific fixes for HD-audio and USB-audio. Charles Keepax (1): ALSA: compress: Fix stop handling on compressed capture streams Jeremy Soller (1): ALSA: hda/realtek - Headset microphone support for System76 darp5 Kailang Yang (1): ALSA: hda/realtek - Fix lose hp_pins for disable auto mute Takashi Iwai (3): ALSA: hda/realtek - Use a common helper for hp pin reference ALSA: hda - Serialize codec registrations ALSA: hda/ca0132 - Fix build error without CONFIG_PCI Udo Eberhardt (1): ALSA: usb-audio: Add support for new T+A USB DAC --- include/sound/compress_driver.h | 6 +++- include/sound/hda_codec.h | 1 + sound/pci/hda/hda_bind.c| 3 +- sound/pci/hda/hda_intel.c | 2 ++ sound/pci/hda/patch_ca0132.c| 4 ++- sound/pci/hda/patch_realtek.c | 62 +++-- sound/usb/quirks.c | 1 + 7 files changed, 49 insertions(+), 30 deletions(-) diff --git a/include/sound/compress_driver.h b/include/sound/compress_driver.h index 0cdc3999ecfa..c5188ff724d1 100644 --- a/include/sound/compress_driver.h +++ b/include/sound/compress_driver.h @@ -173,7 +173,11 @@ static inline void snd_compr_drain_notify(struct snd_compr_stream *stream) if (snd_BUG_ON(!stream)) return; - stream->runtime->state = SNDRV_PCM_STATE_SETUP; + if (stream->direction == SND_COMPRESS_PLAYBACK) + stream->runtime->state = SNDRV_PCM_STATE_SETUP; + else + stream->runtime->state = SNDRV_PCM_STATE_PREPARED; + wake_up(>runtime->sleep); } diff --git a/include/sound/hda_codec.h b/include/sound/hda_codec.h index 7fa48b100936..cc7c8d42d4fd 100644 --- a/include/sound/hda_codec.h +++ b/include/sound/hda_codec.h @@ -68,6 +68,7 @@ struct hda_bus { unsigned int response_reset:1; /* controller was reset */ unsigned int in_reset:1;/* during reset operation */ unsigned int no_response_fallback:1; /* don't fallback at RIRB error */ + unsigned int bus_probing :1;/* during probing process */ int primary_dig_out_type; /* primary digital out PCM type */ unsigned int mixer_assigned;/* codec addr for mixer name */ diff --git a/sound/pci/hda/hda_bind.c b/sound/pci/hda/hda_bind.c index 9174f1b3a987..1ec706ced75c 100644 --- a/sound/pci/hda/hda_bind.c +++ b/sound/pci/hda/hda_bind.c @@ -115,7 +115,8 @@ static int hda_codec_driver_probe(struct device *dev) err = snd_hda_codec_build_controls(codec); if (err < 0) goto error_module; - if (codec->card->registered) { + /* only register after the bus probe finished; otherwise it's racy */ + if (!codec->bus->bus_probing && codec->card->registered) { err = snd_card_register(codec->card); if (err < 0) goto error_module; diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index e784130ea4e0..e5c49003e75f 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -2185,6 +2185,7 @@ static int azx_probe_continue(struct azx *chip) int dev = chip->dev_index; int err; + to_hda_bus(bus)->bus_probing = 1; hda->probe_continued = 1; /* bind with i915 if needed */ @@ -2269,6 +2270,7 @@ static int azx_probe_continue(struct azx *chip) if (err < 0) hda->init_failed = 1; complete_all(>probe_wait); + to_hda_bus(bus)->bus_probing = 0; return err; } diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c index e5bdbc245682..29882bda7632 100644 --- a/sound/pci/hda/patch_ca0132.c +++ b/sound/pci/hda/patch_ca0132.c @@ -8451,8 +8451,10 @@ static void ca0132_free(struct hda_codec *codec) ca0132_exit_chip(codec); snd_hda_power_down(codec); - if (IS_ENABLED(CONFIG_PCI) && spec->mem_base) +#ifdef CONFIG_PCI + if (spec->mem_base) pci_iounmap(codec->bus->pci, spec->mem_base); +#endif kfree(spec->spec_init_verbs); kfree(codec->spec); } diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 4139aced63f8..6df758adff84 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -515,6 +515,15 @@ static void alc_auto_init_amp(struct hda_codec *codec, int
Re: [GIT PULL] sound fixes for 5.0-rc5
The pull request you sent on Thu, 31 Jan 2019 12:32:28 +0100: > git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git > tags/sound-5.0-rc5 has been merged into torvalds/linux.git: https://git.kernel.org/torvalds/c/83f4997a01e72844045a2bf1f348359a1acbfb19 Thank you! -- Deet-doot-dot, I am a bot. https://korg.wiki.kernel.org/userdoc/prtracker
[GIT PULL] sound fixes for 5.0-rc5
Linus, please pull sound fixes for v5.0-rc5 from: git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git tags/sound-5.0-rc5 The topmost commit is 693abe11aa6b27aed6eb8222162f8fb986325cef sound fixes for 5.0-rc5 Only three fixes: a fix for Realtek HD-audio looks lengthy, but it's just a code shuffling, and the actual changes are fairly small. The rest are a PCM core fix for a long-standing bug that was recently scratched by syzkaller, and a trivial USB-audio quirk for DSD support. Kailang Yang (1): ALSA: hda/realtek - Fixed hp_pin no value Olek Poplavsky (1): ALSA: usb-audio: Add Opus #3 to quirks for native DSD support Takashi Iwai (1): ALSA: pcm: Fix tight loop of OSS capture stream --- sound/core/pcm_lib.c | 9 - sound/pci/hda/patch_realtek.c | 78 +-- sound/usb/quirks.c| 1 + 3 files changed, 54 insertions(+), 34 deletions(-) diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c index 40013b26f671..6c99fa8ac5fa 100644 --- a/sound/core/pcm_lib.c +++ b/sound/core/pcm_lib.c @@ -2112,6 +2112,13 @@ int pcm_lib_apply_appl_ptr(struct snd_pcm_substream *substream, return 0; } +/* allow waiting for a capture stream that hasn't been started */ +#if IS_ENABLED(CONFIG_SND_PCM_OSS) +#define wait_capture_start(substream) ((substream)->oss.oss) +#else +#define wait_capture_start(substream) false +#endif + /* the common loop for read/write data */ snd_pcm_sframes_t __snd_pcm_lib_xfer(struct snd_pcm_substream *substream, void *data, bool interleaved, @@ -2182,7 +2189,7 @@ snd_pcm_sframes_t __snd_pcm_lib_xfer(struct snd_pcm_substream *substream, err = snd_pcm_start(substream); if (err < 0) goto _end_unlock; - } else { + } else if (!wait_capture_start(substream)) { /* nothing to do */ err = 0; goto _end_unlock; diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index b4f472157ebd..4139aced63f8 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -117,6 +117,7 @@ struct alc_spec { int codec_variant; /* flag for other variants */ unsigned int has_alc5505_dsp:1; unsigned int no_depop_delay:1; + unsigned int done_hp_init:1; /* for PLL fix */ hda_nid_t pll_nid; @@ -3372,6 +3373,48 @@ static void alc_default_shutup(struct hda_codec *codec) snd_hda_shutup_pins(codec); } +static void alc294_hp_init(struct hda_codec *codec) +{ + struct alc_spec *spec = codec->spec; + hda_nid_t hp_pin = spec->gen.autocfg.hp_pins[0]; + int i, val; + + if (!hp_pin) + return; + + snd_hda_codec_write(codec, hp_pin, 0, + AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE); + + msleep(100); + + snd_hda_codec_write(codec, hp_pin, 0, + AC_VERB_SET_PIN_WIDGET_CONTROL, 0x0); + + alc_update_coef_idx(codec, 0x6f, 0x000f, 0);/* Set HP depop to manual mode */ + alc_update_coefex_idx(codec, 0x58, 0x00, 0x8000, 0x8000); /* HP depop procedure start */ + + /* Wait for depop procedure finish */ + val = alc_read_coefex_idx(codec, 0x58, 0x01); + for (i = 0; i < 20 && val & 0x0080; i++) { + msleep(50); + val = alc_read_coefex_idx(codec, 0x58, 0x01); + } + /* Set HP depop to auto mode */ + alc_update_coef_idx(codec, 0x6f, 0x000f, 0x000b); + msleep(50); +} + +static void alc294_init(struct hda_codec *codec) +{ + struct alc_spec *spec = codec->spec; + + if (!spec->done_hp_init) { + alc294_hp_init(codec); + spec->done_hp_init = true; + } + alc_default_init(codec); +} + static void alc5505_coef_set(struct hda_codec *codec, unsigned int index_reg, unsigned int val) { @@ -7373,37 +7416,6 @@ static void alc269_fill_coef(struct hda_codec *codec) alc_update_coef_idx(codec, 0x4, 0, 1<<11); } -static void alc294_hp_init(struct hda_codec *codec) -{ - struct alc_spec *spec = codec->spec; - hda_nid_t hp_pin = spec->gen.autocfg.hp_pins[0]; - int i, val; - - if (!hp_pin) - return; - - snd_hda_codec_write(codec, hp_pin, 0, - AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE); - - msleep(100); - - snd_hda_codec_write(codec, hp_pin, 0, - AC_VERB_SET_PIN_WIDGET_CONTROL, 0x0); - - alc_update_coef_idx(codec, 0x6f, 0x000f, 0);/* Set HP depop to manual mode */ - alc_update_coefex_idx(codec, 0x58, 0x00, 0x8000, 0x8000); /* HP depop
Re: [GIT PULL] sound fixes for 5.0-rc4
The pull request you sent on Thu, 24 Jan 2019 10:13:07 +0100: > git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git > tags/sound-5.0-rc4 has been merged into torvalds/linux.git: https://git.kernel.org/torvalds/c/aa7b98459f15bf45d0610c8acfa7929a8641864a Thank you! -- Deet-doot-dot, I am a bot. https://korg.wiki.kernel.org/userdoc/prtracker
[GIT PULL] sound fixes for 5.0-rc4
Linus, please pull sound fixes for v5.0-rc4 from: git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git tags/sound-5.0-rc4 The topmost commit is 699390381a7bae2fab01a22f742a17235c44ed8a sound fixes for 5.0-rc4 A significant amount of fixes at this time, mostly for covering the recent ASoC issues. - Fixes for the missing ASoC driver initialization with non-deferred probes; these triggered other problems in chain, which resulted in yet more fix commits - DaVinci runtime PM fix; the diff looks large but it's just a code shuffling - Various fixes for ASoC Intel drivers: a regression in HD-A HDMI, Kconfig dependency, machine driver adjustments, PLL fix. - Other ASoC driver-specific stuff including the trivial fixes caught by static analysis - Usual HD-audio quirks Ajit Pandey (1): ASoC: soc-core: defer card probe until all component is added to list Anthony Wong (1): ALSA: hda - Add mute LED support for HP ProBook 470 G5 Curtis Malainey (1): ASoC: soc-core: fix init platform memory handling Dan Carpenter (6): ASoC: dma-sh7760: cleanup a debug printk ASoC: pcm512x: Fix a double unlock in pcm512x_digital_mute() ASoC: qdsp6: q6asm-dai: Off by one in of_q6asm_parse_dai_data() ASoC: qdsp6: q6asm-dai: Fix a NULL vs IS_ERR() bug ASoC: qdsp6: q6asm-dai: Fix a small memory leak ALSA: compress: prevent potential divide by zero bugs Geert Uytterhoeven (1): ASoC: xlnx: Grammar s/the the/the/ Gustavo A. R. Silva (2): ASoC: rt5514-spi: Fix potential NULL pointer dereference ASoC: amd: Fix potential NULL pointer dereference Kailang Yang (1): ALSA: hda/realtek - Fix typo for ALC225 model Kangjie Lu (1): ASoC: atom: fix a missing check of snd_pcm_lib_malloc_pages Mac Chiang (1): ASoC: Intel: Boards: move the codec PLL configuration to _init Mark Brown (1): ASoC: core: Make snd_soc_find_component() more robust Maruthi Srinivas Bayyavarapu (1): ASoC: xlnx: change license header format style Matthias Reichl (1): ASoC: core: Don't defer probe on optional, NULL components Peter Ujfalusi (1): ASoC: ti: davinci-mcasp: Move context save/restore to runtime_pm callbacks Rander Wang (1): ASoC: Intel: Haswell/Broadwell: fix setting for .dynamic field Rohit kumar (2): ASoC: sdm845: set jack only for a specific backend ASoC: soc-core: Hold client_mutex around soc_init_dai_link() Shuming Fan (2): ASoC: rt5682: Fix recording no sound issue ASoC: rt5682: Fix PLL source register definitions Silvio Cesare (2): ASoC: dapm: change snprintf to scnprintf for possible overflow ASoC: imx-audmux: change snprintf to scnprintf for possible overflow Sinan Kaya (1): ASoC: Intel: atom: Make PCI dependency explicit Takashi Iwai (1): ASoC: intel: skl: Fix display power regression Yizhuo (1): ASoC: Variable "val" in function rt274_i2c_probe() could be uninitialized b-ak (1): ASoC: tlv320aic32x4: Kernel OOPS while entering DAPM standby mode --- include/sound/soc.h | 6 ++ sound/core/compress_offload.c | 3 +- sound/pci/hda/patch_conexant.c| 1 + sound/pci/hda/patch_realtek.c | 2 +- sound/soc/amd/raven/acp3x-pcm-dma.c | 6 +- sound/soc/codecs/hdac_hdmi.c | 116 +++--- sound/soc/codecs/pcm512x.c| 11 +-- sound/soc/codecs/rt274.c | 5 +- sound/soc/codecs/rt5514-spi.c | 2 + sound/soc/codecs/rt5682.c | 1 + sound/soc/codecs/rt5682.h | 24 ++--- sound/soc/codecs/tlv320aic32x4.c | 4 + sound/soc/fsl/imx-audmux.c| 24 ++--- sound/soc/intel/Kconfig | 2 +- sound/soc/intel/atom/sst-mfld-platform-pcm.c | 8 +- sound/soc/intel/boards/broadwell.c| 2 +- sound/soc/intel/boards/glk_rt5682_max98357a.c | 45 ++--- sound/soc/intel/boards/haswell.c | 2 +- sound/soc/intel/skylake/skl.c | 13 +-- sound/soc/qcom/qdsp6/q6asm-dai.c | 17 +++- sound/soc/qcom/sdm845.c | 31 -- sound/soc/sh/dma-sh7760.c | 2 +- sound/soc/soc-core.c | 34 +-- sound/soc/soc-dapm.c | 10 +- sound/soc/ti/davinci-mcasp.c | 136 -- sound/soc/xilinx/Kconfig | 2 +- sound/soc/xilinx/xlnx_i2s.c | 15 ++- 27 files changed, 227 insertions(+), 297 deletions(-)
Re: [GIT PULL] sound fixes for 5.0-rc2
The pull request you sent on Thu, 10 Jan 2019 14:56:43 +0100: > git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git > tags/sound-5.0-rc2 has been merged into torvalds/linux.git: https://git.kernel.org/torvalds/c/f0ebbe9b18e0d2bb79c7963faf847b949d4f5720 Thank you! -- Deet-doot-dot, I am a bot. https://korg.wiki.kernel.org/userdoc/prtracker
[GIT PULL] sound fixes for 5.0-rc2
Linus, please pull sound fixes for v5.0-rc2 from: git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git tags/sound-5.0-rc2 The topmost commit is d1dd42110d2727e81b9265841a62bc84c454c3a2 sound fixes for 5.0-rc2 A collection of small fixes for USB-audio, HD-audio and cs46xx. The USB-audio fixes are for out-of-bound accesses and a regression in the recent cleanup, while HD-audio fixes are usual device- specific quirks. Amadeusz Sławiński (1): ALSA: usb-audio: fix CM6206 register definitions Dan Carpenter (1): ALSA: cs46xx: Potential NULL dereference in probe Hui Peng (1): ALSA: usb-audio: Fix an out-of-bound read in create_composite_quirks Kailang Yang (3): ALSA: hda/realtek - Support Dell headset mode for New AIO platform ALSA: hda/realtek - Add unplug function into unplug state of Headset Mode for ALC225 ALSA: hda/realtek - Disable headset Mic VREF for headset mode of ALC225 Takashi Iwai (3): ALSA: usb-audio: Avoid access before bLength check in build_audio_procunit() ALSA: usb-audio: Check mixer unit descriptors more strictly ALSA: usb-audio: Always check descriptor sizes in parser code --- sound/pci/cs46xx/dsp_spos.c | 3 +++ sound/pci/hda/patch_realtek.c | 18 +- sound/usb/card.c | 2 +- sound/usb/mixer.c | 29 +++-- sound/usb/quirks-table.h | 6 ++ sound/usb/quirks.c| 2 +- sound/usb/stream.c| 36 +--- 7 files changed, 76 insertions(+), 20 deletions(-) diff --git a/sound/pci/cs46xx/dsp_spos.c b/sound/pci/cs46xx/dsp_spos.c index 598d140bb7cb..5fc497c6d738 100644 --- a/sound/pci/cs46xx/dsp_spos.c +++ b/sound/pci/cs46xx/dsp_spos.c @@ -903,6 +903,9 @@ int cs46xx_dsp_proc_done (struct snd_cs46xx *chip) struct dsp_spos_instance * ins = chip->dsp_spos_instance; int i; + if (!ins) + return 0; + snd_info_free_entry(ins->proc_sym_info_entry); ins->proc_sym_info_entry = NULL; diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index aee4cbd29d53..0b3e7a18ca78 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -4102,6 +4102,7 @@ static void alc_headset_mode_unplugged(struct hda_codec *codec) case 0x10ec0295: case 0x10ec0289: case 0x10ec0299: + alc_process_coef_fw(codec, alc225_pre_hsmode); alc_process_coef_fw(codec, coef0225); break; case 0x10ec0867: @@ -5440,6 +5441,13 @@ static void alc_fixup_headset_jack(struct hda_codec *codec, } } +static void alc_fixup_disable_mic_vref(struct hda_codec *codec, + const struct hda_fixup *fix, int action) +{ + if (action == HDA_FIXUP_ACT_PRE_PROBE) + snd_hda_codec_set_pin_target(codec, 0x19, PIN_VREFHIZ); +} + /* for hda_fixup_thinkpad_acpi() */ #include "thinkpad_helper.c" @@ -5549,6 +5557,7 @@ enum { ALC293_FIXUP_LENOVO_SPK_NOISE, ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY, ALC255_FIXUP_DELL_SPK_NOISE, + ALC225_FIXUP_DISABLE_MIC_VREF, ALC225_FIXUP_DELL1_MIC_NO_PRESENCE, ALC295_FIXUP_DISABLE_DAC3, ALC280_FIXUP_HP_HEADSET_MIC, @@ -6268,6 +6277,12 @@ static const struct hda_fixup alc269_fixups[] = { .chained = true, .chain_id = ALC255_FIXUP_DELL1_MIC_NO_PRESENCE }, + [ALC225_FIXUP_DISABLE_MIC_VREF] = { + .type = HDA_FIXUP_FUNC, + .v.func = alc_fixup_disable_mic_vref, + .chained = true, + .chain_id = ALC269_FIXUP_DELL1_MIC_NO_PRESENCE + }, [ALC225_FIXUP_DELL1_MIC_NO_PRESENCE] = { .type = HDA_FIXUP_VERBS, .v.verbs = (const struct hda_verb[]) { @@ -6277,7 +6292,7 @@ static const struct hda_fixup alc269_fixups[] = { {} }, .chained = true, - .chain_id = ALC269_FIXUP_DELL1_MIC_NO_PRESENCE + .chain_id = ALC225_FIXUP_DISABLE_MIC_VREF }, [ALC280_FIXUP_HP_HEADSET_MIC] = { .type = HDA_FIXUP_FUNC, @@ -6584,6 +6599,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x1028, 0x0871, "Dell Precision 3630", ALC255_FIXUP_DELL_HEADSET_MIC), SND_PCI_QUIRK(0x1028, 0x0872, "Dell Precision 3630", ALC255_FIXUP_DELL_HEADSET_MIC), SND_PCI_QUIRK(0x1028, 0x0873, "Dell Precision 3930", ALC255_FIXUP_DUMMY_LINEOUT_VERB), + SND_PCI_QUIRK(0x1028, 0x0935, "Dell", ALC274_FIXUP_DELL_AIO_LINEOUT_VERB), SND_PCI_QUIRK(0x1028, 0x164a, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1028, 0x164b, "Dell",