From: Kai-Heng Feng <kai.heng.feng@canonical.com> To: tiwai@suse.com Cc: Kai-Heng Feng <kai.heng.feng@canonical.com>, Jaroslav Kysela <perex@perex.cz>, Bard Liao <yung-chuan.liao@linux.intel.com>, Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: [PATCH] ALSA: hda: Skip creating captures in SOF context Date: Tue, 19 Jul 2022 22:47:52 +0800 [thread overview] Message-ID: <20220719144753.252231-1-kai.heng.feng@canonical.com> (raw) On HP laptops that use SOF driver for DMIC, the micmute LED doesn't light up when mic is muted after commit 9b014266ef8a ("ASoC: SOF: topology: use new sound control LED layer"). The micmute LED itself is still working via sysfs, but it doesn't follow mute anymore. That's because unlike vendors like Dell and Lenovo, HP laptops use HDA codec to control mute LEDs instead of ACPI. So on HP laptops, both SOF and HDA create captures with SNDRV_CTL_ELEM_ACCESS_MIC_LED access, snd_ctl_led_set_state() considers there are two different kcontrols and one of them is not muted. So skip creating captures for HDA when it's called from SOF, the captures are already handled by SOF. Cc: Jaroslav Kysela <perex@perex.cz> Cc: Bard Liao <yung-chuan.liao@linux.intel.com> Cc: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com> --- sound/pci/hda/hda_generic.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c index fc114e5224806..2a6c1a77c49ac 100644 --- a/sound/pci/hda/hda_generic.c +++ b/sound/pci/hda/hda_generic.c @@ -5075,10 +5075,14 @@ int snd_hda_gen_parse_auto_config(struct hda_codec *codec, return err; } - - err = create_capture_mixers(codec); - if (err < 0) - return err; + /* Skip creating capture on SOF which creates captures based on + * topology file. + */ + if (codec->core.type != HDA_DEV_ASOC) { + err = create_capture_mixers(codec); + if (err < 0) + return err; + } err = parse_mic_boost(codec); if (err < 0) -- 2.36.1
WARNING: multiple messages have this Message-ID (diff)
From: Kai-Heng Feng <kai.heng.feng@canonical.com> To: tiwai@suse.com Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>, Kai-Heng Feng <kai.heng.feng@canonical.com>, Bard Liao <yung-chuan.liao@linux.intel.com> Subject: [PATCH] ALSA: hda: Skip creating captures in SOF context Date: Tue, 19 Jul 2022 22:47:52 +0800 [thread overview] Message-ID: <20220719144753.252231-1-kai.heng.feng@canonical.com> (raw) On HP laptops that use SOF driver for DMIC, the micmute LED doesn't light up when mic is muted after commit 9b014266ef8a ("ASoC: SOF: topology: use new sound control LED layer"). The micmute LED itself is still working via sysfs, but it doesn't follow mute anymore. That's because unlike vendors like Dell and Lenovo, HP laptops use HDA codec to control mute LEDs instead of ACPI. So on HP laptops, both SOF and HDA create captures with SNDRV_CTL_ELEM_ACCESS_MIC_LED access, snd_ctl_led_set_state() considers there are two different kcontrols and one of them is not muted. So skip creating captures for HDA when it's called from SOF, the captures are already handled by SOF. Cc: Jaroslav Kysela <perex@perex.cz> Cc: Bard Liao <yung-chuan.liao@linux.intel.com> Cc: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com> --- sound/pci/hda/hda_generic.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c index fc114e5224806..2a6c1a77c49ac 100644 --- a/sound/pci/hda/hda_generic.c +++ b/sound/pci/hda/hda_generic.c @@ -5075,10 +5075,14 @@ int snd_hda_gen_parse_auto_config(struct hda_codec *codec, return err; } - - err = create_capture_mixers(codec); - if (err < 0) - return err; + /* Skip creating capture on SOF which creates captures based on + * topology file. + */ + if (codec->core.type != HDA_DEV_ASOC) { + err = create_capture_mixers(codec); + if (err < 0) + return err; + } err = parse_mic_boost(codec); if (err < 0) -- 2.36.1
next reply other threads:[~2022-07-19 14:48 UTC|newest] Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-07-19 14:47 Kai-Heng Feng [this message] 2022-07-19 14:47 ` [PATCH] ALSA: hda: Skip creating captures in SOF context Kai-Heng Feng 2022-07-19 15:41 ` Jaroslav Kysela 2022-07-19 15:41 ` Jaroslav Kysela 2022-07-20 1:45 ` Kai-Heng Feng 2022-07-20 1:45 ` Kai-Heng Feng 2022-07-20 6:29 ` Takashi Iwai 2022-07-20 6:29 ` Takashi Iwai 2022-07-20 7:52 ` Jaroslav Kysela 2022-07-20 7:52 ` Jaroslav Kysela 2022-07-20 13:31 ` Pierre-Louis Bossart 2022-07-20 13:31 ` Pierre-Louis Bossart 2022-08-15 7:55 ` Kai-Heng Feng 2023-01-05 12:36 ` Kai-Heng Feng 2023-01-05 12:36 ` Kai-Heng Feng 2023-01-05 12:43 ` Jaroslav Kysela 2023-01-05 12:43 ` Jaroslav Kysela 2023-01-06 5:00 ` Kai-Heng Feng 2023-01-06 5:00 ` Kai-Heng Feng
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220719144753.252231-1-kai.heng.feng@canonical.com \ --to=kai.heng.feng@canonical.com \ --cc=alsa-devel@alsa-project.org \ --cc=linux-kernel@vger.kernel.org \ --cc=perex@perex.cz \ --cc=pierre-louis.bossart@linux.intel.com \ --cc=tiwai@suse.com \ --cc=yung-chuan.liao@linux.intel.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.