From nobody Tue Apr 01 13:20:10 2025 X-Original-To: dev-commits-src-branches@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 4ZRpWv2Vfcz5rWcG; Tue, 01 Apr 2025 13:20:11 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZRpWt5NThz3MrH; Tue, 01 Apr 2025 13:20:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743513610; 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=mJqqfgjhbFW32NPlL1ndUlKrPXyq/sg/ui7EvqGu+NY=; b=SkNSwbaUxok921ZsPmuTt1IHQQREgWEdwlKoH98/kEEczwzyUkKlSuvqjuGEvPLKNdw+H+ pOd4icBLmUNVXjrEcCymIKQCxqp6/nhXOFFLqGJKgxWHCj+KlaVYUOK/mG/SYA7zKyErdl uM/bKTSVnzLv0BSjCUYpWhHkr1V111VAajmejRtYPEfxJg8kWPl0TbJgUW0hhjZqlI3WQL 6C1Xe73myTG9kgvYSKgFE9jM0aaKITR56KO1dpUvr7hjp9pcCp1EVEpgEMn8AXchj1lIkQ QDMVa7GpMjfOr9heJgfx5xf0of4boEdJ8gHWFH2P1LY/6NLYkLuTfITS7ujyvg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743513610; a=rsa-sha256; cv=none; b=xPpu4yf0lpF+cVrigT9YVyfMRSHD8TTTIyG2Kfn5itqjd03SkmqeLPY6Rd8mx4Btke48gM 2Rrz+exRSOvywVDqriEC5DYBnArtrFfdbtppqVNBfZVPSgwq8U1J+0jP8acFm+hna1QwDf tpd0kuge/pLZD9c1kImQQKWcQKMMat2hfB5KD6YE3T43OGzIPim8xX7MojOV5d2dUpRN/e OJ3S9boA0sCRQddnaddH/23l9efvBx0oOx4Ykloah72OcguCvLxToM4Cc7yczH25MS1J9X yzOUwc/zcK323hsWk/atW0NdpwkmiZDMH40fr0nm3kSw2w5RsGpxR/R/IctH4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743513610; 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=mJqqfgjhbFW32NPlL1ndUlKrPXyq/sg/ui7EvqGu+NY=; b=Qwlx0UENXAfwhPOUjGRloXqmv+z+rclxrrNoC6niP47uvslArzN4T61u7o1KyWZT3rKeOm /oailuKGGz+cHBILuTIPmSzFFbhWY6tqvSNFLmJ8b/kUBBHtah+0jJA1Btw85FBPuVhiwe fShopmkMrqAs0RuWpF08RHsyRiZ9bI4I8vwbG3hne2HeGZL2CUdu7Ch/XnMTOMAWw1dNFL Kx0WV12dxFv17WjaXhgbDLSRjlEsr69fp3ywKdUP0csBNkAkhLqP8LYHzwrMtvVQoVfoEf 6pCcl/342dqZSj2i3dlajlc6dPCxS/LFzk/mAjKCqRzFm18f6XzMv/jVhGWecg== 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 4ZRpWt4hT0zY8X; Tue, 01 Apr 2025 13:20:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 531DKAuU054392; Tue, 1 Apr 2025 13:20:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 531DKAF3054383; Tue, 1 Apr 2025 13:20:10 GMT (envelope-from git) Date: Tue, 1 Apr 2025 13:20:10 GMT Message-Id: <202504011320.531DKAF3054383@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: e431b38b0f77 - stable/14 - snd_hda: Patch Framework 16 AMD List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e431b38b0f77a6deff9f6f214fe520b689c38bd2 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=e431b38b0f77a6deff9f6f214fe520b689c38bd2 commit e431b38b0f77a6deff9f6f214fe520b689c38bd2 Author: Christos Margiolis AuthorDate: 2025-03-25 19:13:49 +0000 Commit: Christos Margiolis CommitDate: 2025-04-01 13:20:05 +0000 snd_hda: Patch Framework 16 AMD Reported by: jrm Tested by: jrm Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: jrm Differential Revision: https://reviews.freebsd.org/D49416 (cherry picked from commit 2f1f523a45fb7f9fddd36a3402edbf7b111996c3) --- sys/dev/sound/pci/hda/hdaa_patches.c | 14 ++++++++++++++ sys/dev/sound/pci/hda/hdac.h | 1 + 2 files changed, 15 insertions(+) diff --git a/sys/dev/sound/pci/hda/hdaa_patches.c b/sys/dev/sound/pci/hda/hdaa_patches.c index 8ad1c845c254..233ba1ae8d13 100644 --- a/sys/dev/sound/pci/hda/hdaa_patches.c +++ b/sys/dev/sound/pci/hda/hdaa_patches.c @@ -340,6 +340,20 @@ hdac_pin_patch(struct hdaa_widget *w) patch_str = "as=3 seq=15 color=Black loc=Left"; break; } + } else if (id == HDA_CODEC_ALC295 && + subid == FRAMEWORK_LAPTOP_0005_SUBVENDOR) { + switch (nid) { + case 20: + /* + * This pin is a duplicate of pin 23 (both as=1 seq=0), + * which ends up in the driver disabling the + * association altogether. Since sound quality from pin + * 23 seems to be better, configure this one as a back + * speaker. + */ + patch_str = "as=1 seq=2"; + break; + } } else if (id == HDA_CODEC_ALC295 && subid == FRAMEWORK_LAPTOP_0006_SUBVENDOR) { switch (nid) { diff --git a/sys/dev/sound/pci/hda/hdac.h b/sys/dev/sound/pci/hda/hdac.h index 9b11dcba32a8..cb383d3be498 100644 --- a/sys/dev/sound/pci/hda/hdac.h +++ b/sys/dev/sound/pci/hda/hdac.h @@ -530,6 +530,7 @@ #define FRAMEWORK_LAPTOP_0001_SUBVENDOR HDA_MODEL_CONSTRUCT(FRAMEWORK, 0x0001) #define FRAMEWORK_LAPTOP_0002_SUBVENDOR HDA_MODEL_CONSTRUCT(FRAMEWORK, 0x0002) #define FRAMEWORK_LAPTOP_0003_SUBVENDOR HDA_MODEL_CONSTRUCT(FRAMEWORK, 0x0003) +#define FRAMEWORK_LAPTOP_0005_SUBVENDOR HDA_MODEL_CONSTRUCT(FRAMEWORK, 0x0005) #define FRAMEWORK_LAPTOP_0006_SUBVENDOR HDA_MODEL_CONSTRUCT(FRAMEWORK, 0x0006) /* All codecs you can eat... */