From nobody Thu Mar 24 13:55:07 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id E0D6C1A23ECF; Thu, 24 Mar 2022 13:55:07 +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 4KPRYl3mySz3mgf; Thu, 24 Mar 2022 13:55:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648130107; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XTbE00BjggvYKjUWyYIeRs0vAKryRd4KBgl1eNomnz0=; b=UIpOPWcc1Jd1PpVzqXKkNZniIrOTy4ZJUM5UX87m6NmCPcjgS2d7mFmgFQ/H3+HIwJNn/Y uZ3DLIhJkLpq9wGbHdaFq4a5E8JlBBV2D5YemXNLiFdNSeuL5Dr92Dd0IJG5Ufw3TX8Kg+ Rg+cJGb0Aq2+yi1DvgnyLEGkGPqN1/Pc0joxv9PCudkeTSMXcFRAhfP8xBEK8P4i7IEIOO P8A2j9oXgcUFbKfnJPWmD4RSFA+Im/FHsWeeT66BmGpfaDO380N+6hP8J+VIefYjjX/FLO f29L97m7UrbrDZgheD39xQ+vWDvf+UDc1HfTbLmCdZzNUhjm2/h4SvAvlcUU9A== 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 5497518F2E; Thu, 24 Mar 2022 13:55:07 +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 22ODt7sc086414; Thu, 24 Mar 2022 13:55:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22ODt7ZE086413; Thu, 24 Mar 2022 13:55:07 GMT (envelope-from git) Date: Thu, 24 Mar 2022 13:55:07 GMT Message-Id: <202203241355.22ODt7ZE086413@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 08dfec6cf282 - stable/13 - snd_hda(4): Fix sound on headset jack for ThinkPad T51. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 08dfec6cf28249de5c908c89d36fbe1592f10acc Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648130107; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XTbE00BjggvYKjUWyYIeRs0vAKryRd4KBgl1eNomnz0=; b=TpAayXRi8dOBdURtraq6NexA/gJri9IrbX//0Af5GlzW9LzjszHDQbXcrLD3IMoDI2j06p lF6pNujYrdyuJ4s8lziSXs4sO30oemvqzX56FAcMuBYTdlWSXuyRnt1mREpTp2iEVUl1i1 eM+C/fw8uPjdNlh9YWBGp1Uj2cm3EIma5k+p1TzYIbLV4PT4t+H/zfCUWXt6mME/4QejCr 49MJTMURGR7Lts6ALmmrlG3cZ54b7M0AOpA3Ndhka/MXe68TRtOA54RQjQR4qWY/HWJv9T aQsMIjOVa2kUNrmrmZmE0HmL6hoazN4zcXEOfGjcPwHVnG1XKw43IUMV9JJPYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648130107; a=rsa-sha256; cv=none; b=EwZQZUhCtbUZEqO3G8BG6txeUAbiw9QIlzmb4JLiQ3JaBXtTjgsSa+7VbqfZhJ+U9efdjj SYsAsCA2Nf+7WLxZGrxdtuvrrc6ljymr5ZBm+CHr6p7VPuHvaU4iDx9Ej3rWGz8C/EBE0n XU+xifl5CBOyqaYYd9qz9I0Iu2fzt6sNi5AUqOpTS37ikj43AH6Jj+ytOA13WD61Y4tQok C6tBlz+nKXW/EI7VReH86NoeQqKlSUbldrXL8M1RHtnG9S5t40RRN3kXxsSRYYmvuHLb3F zp02Hu76d4g6zAbz2cfVB6trH42EHLMoVBn3RTaNCGtj1jqXM1I78xLJzGTwRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=08dfec6cf28249de5c908c89d36fbe1592f10acc commit 08dfec6cf28249de5c908c89d36fbe1592f10acc Author: Xin LI AuthorDate: 2021-07-12 05:43:56 +0000 Commit: Ed Maste CommitDate: 2022-03-24 13:52:37 +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. (cherry picked from commit c43bf3f59161ac697a1c3a0a3f9326d4d15216c9) --- 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 265697901a2b..45577819e897 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 02a8d68bee6d..f8f27aedca14 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 ****/