Received: by 2002:ac0:946b:0:0:0:0:0 with SMTP id j40csp2677672imj; Mon, 11 Feb 2019 06:54:37 -0800 (PST) X-Google-Smtp-Source: AHgI3Ia1XXfRNRQ9qZVMHP9n5f72F+ynoXDMf50IKCoGzLZB6EOgBCyTf+e1eLEjlXGkaKBBGWDt X-Received: by 2002:a17:902:7896:: with SMTP id q22mr38422177pll.280.1549896877776; Mon, 11 Feb 2019 06:54:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549896877; cv=none; d=google.com; s=arc-20160816; b=fdr2uJH0hv9FxQQM3eN06fHQfzJcV4W1/ML9ow5d45b8vpV29EGIwdjJqRkL0ISNQv rbEwORLgC454kA0xs28zQcGUUZY1jQrzrlzhcTJwnYN/TsoWRBh9Tto8sj43vORGjgCs NW3IiKZQOVDe07pRkA1XI53NVwKtXRXwrP7ea4wl3LeIPlk1n+7im4EI+RoN3qW3SjzM OmbXzsF4UZYxQ0EkhPTGDbnnnK4abU4SfOkNMageUYsfsJ42gIYcCMU8yqzNfnOJfmVl K3RUBUbfKqRl9ASYk/yfaEzLNv4q6eiDc9FVyt6OhZtOfqXez2/jegbNJMrDOEnBuRGp dusg== 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=s8z3LSs5zNoF9L8HnNl8QxeONf6aRZxyuNGE50SajFA=; b=jLJd+qHhNYMI5Y2B9KAbjKcSOwF6RUsCS1ryPMtHlrL/Zv8oG8Bd68tZl3QD29Ow6i BgTS6h3XhZEiSKArvW1qr2Qbk3bIysCN4UPOMC2vxJ354I6BWYwCkhzxI/L7dwgb6axp 9Br7ObMWnFNkSi45a6o/GMO8qxgPRdW+K77hQxk9chZ46wQeIVKO7Toa44DEd969TiMd zKreHQ9lZZGYLkJR6EWXubMDOQZijJlLeLCQLJdATMzh5bpJDlDpza2MVrESBj3y+9Wk LCjlOFKxlnK36I037g6qS7wRpLmLRSELV6xdTbEvklz6alX9574Dd8DytrO5PY9hJDLC wAMw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ZY+6aRVu; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z16si9064094pgu.407.2019.02.11.06.54.21; Mon, 11 Feb 2019 06:54:37 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ZY+6aRVu; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388389AbfBKOwO (ORCPT + 99 others); Mon, 11 Feb 2019 09:52:14 -0500 Received: from mail.kernel.org ([198.145.29.99]:38382 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731816AbfBKOwM (ORCPT ); Mon, 11 Feb 2019 09:52:12 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.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 51DB22081B; Mon, 11 Feb 2019 14:52:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549896731; bh=+urJ1CdXBUS7ExzYJWJyPbWhDidR+1fVQ4XVjo5ZYDs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZY+6aRVu6je0YbVrJlc/kuOIXel2uXKjcb94kiYR8Luc8ksgYvj2a/dpM+l62Xmrp MNkZ6YLOWs3Qvd5i5fbiMX0vSzPetH2lmJmfcZxdwXTsK9jXXT4uYtv3E0PVp/3diS yHJ+vKKQnfCTRNjcJTsaRc7jZ191caw1dp7MpL7o= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kailang Yang , Takashi Iwai Subject: [PATCH 4.19 281/313] ALSA: hda/realtek - Fix lose hp_pins for disable auto mute Date: Mon, 11 Feb 2019 15:19:21 +0100 Message-Id: <20190211141912.006276269@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190211141852.749630980@linuxfoundation.org> References: <20190211141852.749630980@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore 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 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ From: Kailang Yang commit d561aa0a70bb2e1dd85fde98b6a5561e4175ac3e upstream. When auto_mute = no or spec->suppress_auto_mute = 1, cfg->hp_pins will lose value. Add this patch to find hp_pins value. I add fixed for ALC282 ALC225 ALC256 ALC294 and alc_default_init() alc_default_shutup(). Signed-off-by: Kailang Yang Cc: Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman --- sound/pci/hda/patch_realtek.c | 45 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -2963,6 +2963,11 @@ static void alc282_init(struct hda_codec bool hp_pin_sense; int coef78; + if (!spec->gen.autocfg.hp_outs && spec->gen.suppress_auto_mute) { + if (spec->gen.autocfg.line_out_type == AC_JACK_HP_OUT) + hp_pin = spec->gen.autocfg.line_out_pins[0]; + } + alc282_restore_default_value(codec); if (!hp_pin) @@ -3000,6 +3005,11 @@ static void alc282_shutup(struct hda_cod bool hp_pin_sense; int coef78; + if (!spec->gen.autocfg.hp_outs && spec->gen.suppress_auto_mute) { + if (spec->gen.autocfg.line_out_type == AC_JACK_HP_OUT) + hp_pin = spec->gen.autocfg.line_out_pins[0]; + } + if (!hp_pin) { alc269_shutup(codec); return; @@ -3159,6 +3169,11 @@ static void alc256_init(struct hda_codec hda_nid_t hp_pin = spec->gen.autocfg.hp_pins[0]; bool hp_pin_sense; + if (!spec->gen.autocfg.hp_outs && spec->gen.suppress_auto_mute) { + if (spec->gen.autocfg.line_out_type == AC_JACK_HP_OUT) + hp_pin = spec->gen.autocfg.line_out_pins[0]; + } + if (!hp_pin) return; @@ -3195,6 +3210,11 @@ static void alc256_shutup(struct hda_cod hda_nid_t hp_pin = spec->gen.autocfg.hp_pins[0]; bool hp_pin_sense; + if (!spec->gen.autocfg.hp_outs && spec->gen.suppress_auto_mute) { + if (spec->gen.autocfg.line_out_type == AC_JACK_HP_OUT) + hp_pin = spec->gen.autocfg.line_out_pins[0]; + } + if (!hp_pin) { alc269_shutup(codec); return; @@ -3231,6 +3251,11 @@ static void alc225_init(struct hda_codec hda_nid_t hp_pin = spec->gen.autocfg.hp_pins[0]; bool hp1_pin_sense, hp2_pin_sense; + if (!spec->gen.autocfg.hp_outs && spec->gen.suppress_auto_mute) { + if (spec->gen.autocfg.line_out_type == AC_JACK_HP_OUT) + hp_pin = spec->gen.autocfg.line_out_pins[0]; + } + if (!hp_pin) return; @@ -3274,6 +3299,11 @@ static void alc225_shutup(struct hda_cod hda_nid_t hp_pin = spec->gen.autocfg.hp_pins[0]; bool hp1_pin_sense, hp2_pin_sense; + if (!spec->gen.autocfg.hp_outs && spec->gen.suppress_auto_mute) { + if (spec->gen.autocfg.line_out_type == AC_JACK_HP_OUT) + hp_pin = spec->gen.autocfg.line_out_pins[0]; + } + if (!hp_pin) { alc269_shutup(codec); return; @@ -3318,6 +3348,11 @@ static void alc_default_init(struct hda_ hda_nid_t hp_pin = spec->gen.autocfg.hp_pins[0]; bool hp_pin_sense; + if (!spec->gen.autocfg.hp_outs && spec->gen.suppress_auto_mute) { + if (spec->gen.autocfg.line_out_type == AC_JACK_HP_OUT) + hp_pin = spec->gen.autocfg.line_out_pins[0]; + } + if (!hp_pin) return; @@ -3347,6 +3382,11 @@ static void alc_default_shutup(struct hd hda_nid_t hp_pin = spec->gen.autocfg.hp_pins[0]; bool hp_pin_sense; + if (!spec->gen.autocfg.hp_outs && spec->gen.suppress_auto_mute) { + if (spec->gen.autocfg.line_out_type == AC_JACK_HP_OUT) + hp_pin = spec->gen.autocfg.line_out_pins[0]; + } + if (!hp_pin) { alc269_shutup(codec); return; @@ -3379,6 +3419,11 @@ static void alc294_hp_init(struct hda_co hda_nid_t hp_pin = spec->gen.autocfg.hp_pins[0]; int i, val; + if (!spec->gen.autocfg.hp_outs && spec->gen.suppress_auto_mute) { + if (spec->gen.autocfg.line_out_type == AC_JACK_HP_OUT) + hp_pin = spec->gen.autocfg.line_out_pins[0]; + } + if (!hp_pin) return;