Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp486509pxj; Thu, 20 May 2021 14:10:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx9+v5yiNvCDvxD3dXYubF2dv1roPV+nmmrBRn9Gd1FQQxQ6XT2c814HnHYEI8AWwCkE9Mi X-Received: by 2002:a05:6602:1695:: with SMTP id s21mr6730088iow.29.1621545029360; Thu, 20 May 2021 14:10:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621545029; cv=none; d=google.com; s=arc-20160816; b=VMNnAFHXb36gWYvbskf9MaXKz0NT86Sk0jNET773uWJU8oAfwo47U7rCKZeRHthkwL PJdTGDbUfqNbC0pRPmoMw/rp9fsK+LCmwVzkEiFAshQEeGiE+epHpm+AuXjH6UqAD9Kc eCtpdCDISgnvGhzoKvQgT9Rc0dp2y6J7nz7Uf91OiWU7o1mcwlu3ILpza3G3Nb+fFhVK 8TzErOm4Y0lB0RqdbnDysEqPx/+EUTVdG+usmzeqzdbzy1MeyBLjC3ScOS6Nif1c9zij daKlhUHnJ75zKj/BLsO0uwRUDY2Wjgjs+81mbKwTR59ZdU4KcQdz0pq7cSywEGJc+Ecd 5GkA== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=SKZRsLIGF1c2eqrc85EWPyVjs/45PtDZIulrsrbNu24=; b=NKcgKyZ5xk7+P7I2SlM3Yu9xM0L6YS1W7cztJWYg8bO6UJ91BXtxJ+9k0ifv6GzJVz q6kE31YWDKv1aNVUwO1SzTKOqbzVXFv506MIIhL7wcnHLGlOSsK2sBifYYlEbKTVslmT 21h9fT5b6bXPwBUoyLbIJrfQyf6o+SEEdaqzHxGhuKqsTJEXLalEWVbbjnbL6c9BHz1X bssgcvUJDVwKAEbHnnKeSc37r7ISRBe++htN20PEtzn0xOenLl8EqEhyZ+ZnHSQYd7hG 3pytOFHe+2tC3V9z1gBiRawQRtjGRn9gYv8zJWSTYeVpkxcwwOz3sVArgWB/JEG6Svgk fZUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=sGVLopYI; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y9si3650859ilp.9.2021.05.20.14.10.15; Thu, 20 May 2021 14:10:29 -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=@linuxfoundation.org header.s=korg header.b=sGVLopYI; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238993AbhETLB6 (ORCPT + 99 others); Thu, 20 May 2021 07:01:58 -0400 Received: from mail.kernel.org ([198.145.29.99]:46230 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237841AbhETKnq (ORCPT ); Thu, 20 May 2021 06:43:46 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 2E13961C8A; Thu, 20 May 2021 09:56:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1621504613; bh=v+o9R/WRLaLDBMpf2DCdFw1HJwrUNglZKj5Rq94Tmf0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sGVLopYIgkDUA1dt9Z4MWGNYuRPAVAY3ARIMLkXufpmyhD/AOjaKYj3CboIxSbKXI F+PStB3QSdC1QIk4rxDdBMzvforYQRTWCktNg1b397KCEdo6f0nIgpB6YKaC8eSfW+ ZaLzRpPoACV1oMmXd/n38EZepewl4XXKMnb7uzcM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hui Wang , Takashi Iwai , Sasha Levin Subject: [PATCH 4.14 316/323] ALSA: hda: generic: change the DAC ctl name for LO+SPK or LO+HP Date: Thu, 20 May 2021 11:23:28 +0200 Message-Id: <20210520092131.076616885@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210520092120.115153432@linuxfoundation.org> References: <20210520092120.115153432@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Hui Wang [ Upstream commit f48652bbe3ae62ba2835a396b7e01f063e51c4cd ] Without this change, the DAC ctl's name could be changed only when the machine has both Speaker and Headphone, but we met some machines which only has Lineout and Headhpone, and the Lineout and Headphone share the Audio Mixer0 and DAC0, the ctl's name is set to "Front". On most of machines, the "Front" is used for Speaker only or Lineout only, but on this machine it is shared by Lineout and Headphone, This introduces an issue in the pipewire and pulseaudio, suppose users want the Headphone to be on and the Speaker/Lineout to be off, they could turn off the "Front", this works on most of the machines, but on this machine, the "Front" couldn't be turned off otherwise the headphone will be off too. Here we do some change to let the ctl's name change to "Headphone+LO" on this machine, and pipewire and pulseaudio already could handle "Headphone+LO" and "Speaker+LO". (https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/747) BugLink: http://bugs.launchpad.net/bugs/804178 Signed-off-by: Hui Wang Link: https://lore.kernel.org/r/20210504073917.22406-1-hui.wang@canonical.com Signed-off-by: Takashi Iwai Signed-off-by: Sasha Levin --- sound/pci/hda/hda_generic.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c index 14881fe80a21..1833deefe1af 100644 --- a/sound/pci/hda/hda_generic.c +++ b/sound/pci/hda/hda_generic.c @@ -1212,11 +1212,17 @@ static const char *get_line_out_pfx(struct hda_codec *codec, int ch, *index = ch; return "Headphone"; case AUTO_PIN_LINE_OUT: - /* This deals with the case where we have two DACs and - * one LO, one HP and one Speaker */ - if (!ch && cfg->speaker_outs && cfg->hp_outs) { - bool hp_lo_shared = !path_has_mixer(codec, spec->hp_paths[0], ctl_type); - bool spk_lo_shared = !path_has_mixer(codec, spec->speaker_paths[0], ctl_type); + /* This deals with the case where one HP or one Speaker or + * one HP + one Speaker need to share the DAC with LO + */ + if (!ch) { + bool hp_lo_shared = false, spk_lo_shared = false; + + if (cfg->speaker_outs) + spk_lo_shared = !path_has_mixer(codec, + spec->speaker_paths[0], ctl_type); + if (cfg->hp_outs) + hp_lo_shared = !path_has_mixer(codec, spec->hp_paths[0], ctl_type); if (hp_lo_shared && spk_lo_shared) return spec->vmaster_mute.hook ? "PCM" : "Master"; if (hp_lo_shared) -- 2.30.2