Received: by 2002:a25:e74b:0:0:0:0:0 with SMTP id e72csp1979345ybh; Tue, 14 Jul 2020 12:10:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwhWxz8Q4Du3V7d1dQcdBF1k0uB12tsvELhI1U4cvZRtgWG+pHzy2/llR1xJcoM+3FsPhym X-Received: by 2002:a17:907:205c:: with SMTP id pg28mr5670850ejb.22.1594753817324; Tue, 14 Jul 2020 12:10:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594753817; cv=none; d=google.com; s=arc-20160816; b=e63Ru3ZoNdah0HQSdgUVe/O3TDkAhx/erDND+X+/x4T9k57jkIbKMBb6qr6lxsPBhH Rha4I5NqjbuUCLgPCSXrYtwPFiwcLQYIiOxPDNgBOst3a1riMBHJoggC11OmE+SIeXmD XiwjJXeN6UYjT0TnmYFd7oU7kdfW4VjtMrA/cMCqZ0bPqu6/G31073m8ydQfhkiJ1L9R RMp0PgnVYBq8d2SFQmMZk0Qucqh4me64qb9+/8Sy+c1DH6ktiuWBrtx3/MvDvSvbppR3 SOEbn/Ae0oqmF0Dya98l9zySI3UvYQWWPslcn8bRzyRmPdQ8QspEPNKnM052VWzokSQw llrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=hwKFR7KVvsf3TqhSTkg8wWJNm5zPE95u/3vyTnMGqrc=; b=QFjH4pQVlAA7JY5a9rK51CAksSDDNQLKpLZHa0eZ3WizBNCP3rCUl3pPk2fgH+L246 aIU1t5f+L/zARqNpn9cPQwVY3h3urYM3JrdsZqI1qfXbx39Fl+teRLyblcQNnzEBGst8 rMD2U60m6F+xTA3VKkpupPcmbmG0O2BX6spMH87o6g2rs6oNVbKm0rYzJl08oKMNF+gn LuwqVy1Gim36pA88/q0Z9yEevQxL5CwS7ETsCqqyMWw/iDYfXPJH1HQD+kH8mU3qOzxl W2kQ7fUsiec8gZ3XymdKPVRMb1NdlPQrAN+gXE9DVlmT4lGFLebV/XjGgbWXlIKJOIkN viVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=0F02kR+D; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id dk6si12030438ejb.129.2020.07.14.12.09.54; Tue, 14 Jul 2020 12:10:17 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=0F02kR+D; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730432AbgGNTHp (ORCPT + 99 others); Tue, 14 Jul 2020 15:07:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:48070 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730406AbgGNSve (ORCPT ); Tue, 14 Jul 2020 14:51:34 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7A898207F5; Tue, 14 Jul 2020 18:51:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594752694; bh=qiFM/BxMOjkslEgFa0Oc0P/NOeX/xVHdll8hGt151nA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0F02kR+Ds3av8uJuFFq77EId30T9qDkSltMZHCPLZ/btsKdfs4PZaqoFrEg1w4Xzs WPwdyzdzJve0Kw68S3RSMfFVSP4VMnNN5sUDclqhZU4c7C48cGNsC9XovZVVsc0Avd 7JEQnrAkYUagJOLmYzn0rikJRjtIBmdoXKI6lnsM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hui Wang , Takashi Iwai Subject: [PATCH 5.4 073/109] ALSA: hda - let hs_mic be picked ahead of hp_mic Date: Tue, 14 Jul 2020 20:44:16 +0200 Message-Id: <20200714184109.043237551@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200714184105.507384017@linuxfoundation.org> References: <20200714184105.507384017@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Hui Wang commit 6a6ca7881b1ab1c13fe0d70bae29211a65dd90de upstream. We have a Dell AIO, there is neither internal speaker nor internal mic, only a multi-function audio jack on it. Users reported that after freshly installing the OS and plug a headset to the audio jack, the headset can't output sound. I reproduced this bug, at that moment, the Input Source is as below: Simple mixer control 'Input Source',0 Capabilities: cenum Items: 'Headphone Mic' 'Headset Mic' Item0: 'Headphone Mic' That is because the patch_realtek will set this audio jack as mic_in mode if Input Source's value is hp_mic. If it is not fresh installing, this issue will not happen since the systemd will run alsactl restore -f /var/lib/alsa/asound.state, this will set the 'Input Source' according to history value. If there is internal speaker or internal mic, this issue will not happen since there is valid sink/source in the pulseaudio, the PA will set the 'Input Source' according to active_port. To fix this issue, change the parser function to let the hs_mic be stored ahead of hp_mic. Cc: stable@vger.kernel.org Signed-off-by: Hui Wang Link: https://lore.kernel.org/r/20200625083833.11264-1-hui.wang@canonical.com Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman --- sound/pci/hda/hda_auto_parser.c | 6 ++++++ 1 file changed, 6 insertions(+) --- a/sound/pci/hda/hda_auto_parser.c +++ b/sound/pci/hda/hda_auto_parser.c @@ -72,6 +72,12 @@ static int compare_input_type(const void if (a->type != b->type) return (int)(a->type - b->type); + /* If has both hs_mic and hp_mic, pick the hs_mic ahead of hp_mic. */ + if (a->is_headset_mic && b->is_headphone_mic) + return -1; /* don't swap */ + else if (a->is_headphone_mic && b->is_headset_mic) + return 1; /* swap */ + /* In case one has boost and the other one has not, pick the one with boost first. */ return (int)(b->has_boost_on_pin - a->has_boost_on_pin);