Received: by 2002:ad5:4acb:0:0:0:0:0 with SMTP id n11csp4569053imw; Tue, 19 Jul 2022 09:01:43 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tnCHodVl8G2gRQP1D3Ia4Rz3xiLCHzGN5tz0cDMnvEtdfRUrvgtuCKDlMZcLRZ4+fUdbYe X-Received: by 2002:a05:6402:5008:b0:437:7f01:82a with SMTP id p8-20020a056402500800b004377f01082amr45134390eda.220.1658246503564; Tue, 19 Jul 2022 09:01:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658246503; cv=none; d=google.com; s=arc-20160816; b=ohEoFag5GVU2euvwTCaj+z94z+zfABttF7k9rV9+GmRgvhUi2Tr8NNVrpuOzZsckbl y0dJ11yk7KuZGT6uF6SJsxTM+AzR40UfLCAaQ/bqAbnqo+IS7GQX5FAUP7xgKC8XRf4A lilVdXszdw6r2M4hlAWfSY/MmaPpxWrGcZzgYddu9hHetG0bXKITyiuIcPVRfaKzSIni KVu7iprwrzhVQ87BHO7oVS+V/JBt1HRFKn/BagrvzU5BvZNwPXt91LOlY+c9spZaDg+n ZlVpFE11dxh6wftQhO6yidtHX89S+EGHXeuyITAT3nO1MSIfDaXVcvCGUDpwuLj58wrE yxQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=AvYcZcToBAAnfmFM45alM5FvVGJ3gSm105Dq6wUqcmw=; b=bQXBBjYDKct+vT4aSU8PAVsl7HcmRlFn80ssRSwB7v6RlCChOHSjHWx6tyIY9ld7Yh JpOsvssAtfW/WFwxOOFqJ9Q4jKEkhU8HKEG1Nfk55oI1vWtyAMXV4/h4mP5t+JY02eqC SX98yiFWcJZAQdU+drlZIBmmMb3YNSXUfnq8ZUToMK3Wv7S7/8wZWKh9fPD/T4WyuCzq QZSmnSeDF+7Hif8cgQGqBLGfEOiFUu+UDfQbEx2+NJQpjA4a5SyPYOIT8MWmexylCyR/ ePbHhXXmQ+f6qvG4GlTF/+mx9mFQvI2HAPdmKDTq4U+sLi4qjpHBRVOsOifVuEfhdBlW tmWQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canonical.com header.s=20210705 header.b=M4LBTZOI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canonical.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i18-20020a0564020f1200b0043ba0e9cfb6si1825520eda.356.2022.07.19.09.01.09; Tue, 19 Jul 2022 09:01:43 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@canonical.com header.s=20210705 header.b=M4LBTZOI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canonical.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238697AbiGSOsr (ORCPT + 99 others); Tue, 19 Jul 2022 10:48:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46620 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235040AbiGSOsp (ORCPT ); Tue, 19 Jul 2022 10:48:45 -0400 Received: from smtp-relay-canonical-1.canonical.com (smtp-relay-canonical-1.canonical.com [185.125.188.121]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 82BBCEAC for ; Tue, 19 Jul 2022 07:48:44 -0700 (PDT) Received: from localhost.localdomain (unknown [10.101.196.174]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-1.canonical.com (Postfix) with ESMTPSA id 600193F3BD; Tue, 19 Jul 2022 14:48:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1658242122; bh=AvYcZcToBAAnfmFM45alM5FvVGJ3gSm105Dq6wUqcmw=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=M4LBTZOIWTCzLkUwctVzsSbya8Nmf+Nic/k9snJH1tKr8hXrbajBgCf4e/GDxL2BZ YQdiyZ6ce2YAY9N9ToM5sWMqPsfXP93sDzGImIP+u4erSCxL/evPkfO9UHGfPfnm08 9vJc9C93fZHH9SW2oCoT+XitJVQRnI9s9n+bYwHx5iz1Pm9kDxYqV2teZmygxf7389 z7bmtF/hum06CSaqay9jFHFBIOiCK+hsAFKE7xGC8IUs4YRYbfN363mwYus/5q52zI w8MZRXbI9vti0BJ+nojXYWRfcti5II6ws4mlLIEUpZP8vUbeljxSPfL+z8dwHD4kjH Xqz3AOh8ahnpA== From: Kai-Heng Feng To: tiwai@suse.com Cc: Kai-Heng Feng , Jaroslav Kysela , Bard Liao , Pierre-Louis Bossart , 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 Message-Id: <20220719144753.252231-1-kai.heng.feng@canonical.com> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Cc: Bard Liao Cc: Pierre-Louis Bossart Signed-off-by: Kai-Heng Feng --- 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