From owner-dev-commits-src-main@freebsd.org Mon Jul 12 05:50:06 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4776165137F; Mon, 12 Jul 2021 05:50:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GNXsp1cy9z3PQ1; Mon, 12 Jul 2021 05:50:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1A87A10CA; Mon, 12 Jul 2021 05:50:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 16C5o5go007840; Mon, 12 Jul 2021 05:50:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16C5o5Xd007837; Mon, 12 Jul 2021 05:50:05 GMT (envelope-from git) Date: Mon, 12 Jul 2021 05:50:05 GMT Message-Id: <202107120550.16C5o5Xd007837@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Xin LI Subject: git: c43bf3f59161 - main - snd_hda(4): Fix sound on headset jack for ThinkPad T51. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c43bf3f59161ac697a1c3a0a3f9326d4d15216c9 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Jul 2021 05:50:06 -0000 The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=c43bf3f59161ac697a1c3a0a3f9326d4d15216c9 commit c43bf3f59161ac697a1c3a0a3f9326d4d15216c9 Author: Xin LI AuthorDate: 2021-07-12 05:43:56 +0000 Commit: Xin LI CommitDate: 2021-07-12 05:46:49 +0000 snd_hda(4): Fix sound on headset jack for ThinkPad T51. sys/dev/sound/pci/hda/hdaa_patches.c: match_pin_patches: Use HDA_DEV_MATCH instead of regular == sys/dev/sound/pci/hda/pin_patch_realtek.h: Add quirk for Lenovo laptops when ALC298 is used. --- sys/dev/sound/pci/hda/hdaa_patches.c | 2 +- sys/dev/sound/pci/hda/pin_patch_realtek.h | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/sys/dev/sound/pci/hda/hdaa_patches.c b/sys/dev/sound/pci/hda/hdaa_patches.c index 69299ee4344f..dc404b9ba98e 100644 --- a/sys/dev/sound/pci/hda/hdaa_patches.c +++ b/sys/dev/sound/pci/hda/hdaa_patches.c @@ -157,7 +157,7 @@ match_pin_patches(int vendor_id, int vendor_subid) continue; for (struct model_pin_patch_t *pp = p->patches; pp->models; pp++) { for (struct pin_machine_model_t *model = pp->models; model->id != 0; model++) { - if (vendor_subid == model->id) + if (HDA_DEV_MATCH(model->id, vendor_subid)) return (pp->pin_patches); } } diff --git a/sys/dev/sound/pci/hda/pin_patch_realtek.h b/sys/dev/sound/pci/hda/pin_patch_realtek.h index ddaeeaef5345..804885659515 100644 --- a/sys/dev/sound/pci/hda/pin_patch_realtek.h +++ b/sys/dev/sound/pci/hda/pin_patch_realtek.h @@ -648,6 +648,17 @@ static struct hdaa_model_pin_patch_t realtek_model_pin_patches[] = { { } }, .pin_patches = pin_patches_dell_xps_jack + }, + { + .models = (struct pin_machine_model_t[]){ + PIN_SUBVENDOR(LENOVO_ALL_SUBVENDOR), + { } + }, + .pin_patches = (struct pin_patch_t[]){ + PIN_PATCH_DOCK_LINE_OUT(23), + PIN_PATCH_HP_OUT(33), + { } + }, }, { } } }, { /**** CODEC: HDA_CODEC_ALC861 ****/