From nobody Tue Mar 25 19:14:12 2025 X-Original-To: dev-commits-src-main@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 4ZMfjc6TQqz5rg4R; Tue, 25 Mar 2025 19:14:12 +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 4ZMfjc5T50z3rql; Tue, 25 Mar 2025 19:14:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742930052; 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=IBXDIsJk+WZulfdvAeJcMeIVukHvV4BKasFRjBtM8y0=; b=CPVzNNzT7DMPLTkfiUiPlVVVexkBkcdvs6T3b8tuWHLNUxgd5GzRcxKyQC7qDQTrWACwwT ae/nKwghA5F0e71whYX94LVtw5NC5Bh6spZyapvzMnD8QmoSc/YjOqIyEWllg/7l82s/rK rKNY/WVb9ifuSzzjHruCyu9o2bM6/3us4WPniVYJVtcDZkD8wsIKcV9B2EOBROWRD3aRCH R8kGuOt9uGauIt3XgIrq4+VCWirj6zGT6Dj6rlGozRBxFx+Iru4LOIsf+3zT9USd4fLo08 9vnZslsEKNu1luqC22UhUJklgGL63A5M3gBm8HV7vQUuWoFr6WSTvMrs+A7IHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742930052; a=rsa-sha256; cv=none; b=nDQFpus2nYg56Y6otYEsuRNccNGznkXXcEsEzQqvoKoBoR4D0TTskYgEli93WZsqli3NQE HJo16k8ktMUWKh28X2PMHQoVZgyz57r09iTTk0Bv6vLtsUTfy+o8J34GfqazpFIDZsZ0s8 iXhJbeY/4eDZSeXXKrhDaj9PdIvW4vTcXOIj2KNFHxolgTS18ta2y/NOrV2w7ZiSV05k8h 6UEQzvrQg7cMPUCVDjDY+5mQTCgar5SrpGl5XubSkr4bE1OOQpuBJ9bqKiETG48K+5WCrW mIMDAPEpDf4cN6AFHqSg53bSIXG5tckzm02I/qPKiOZZFzx53jnEa7H0zFcfow== 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=1742930052; 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=IBXDIsJk+WZulfdvAeJcMeIVukHvV4BKasFRjBtM8y0=; b=WDuTvYUEh8blcXUr191kyF4j1N25zAiFgFwwaf/OM1Cewfyo+SBNrbEYiOa5nD7xqmHOET rulIXqNjLK7GxAP0XPWo6bjL1aYdr4cBkSLQn++Da9cYXqSFuhLL36cUJ5Hy+Df1uF9Z+0 yj0lL6iOeUIqCn9CUyp6BAkSQMe7ehks6osLyTwzBoD1+NST9sT4SmOXmNcxU4iX4/nypX mwh99CeGUMnSOyfjnEa6a0Zgah3AcZyE6tu/+7LTPDfYNJFlC8/dVRJ+vD7u+c6p5Ol0c/ Soh5ywxqzN3a1NVpxU81dkS+9GSwsIlsTzg6sK58csBXjQL3PgUzLy+hxgK1wQ== 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 4ZMfjc4jSzzst3; Tue, 25 Mar 2025 19:14:12 +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 52PJECgW053373; Tue, 25 Mar 2025 19:14:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52PJECWh053369; Tue, 25 Mar 2025 19:14:12 GMT (envelope-from git) Date: Tue, 25 Mar 2025 19:14:12 GMT Message-Id: <202503251914.52PJECWh053369@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 2f1f523a45fb - main - snd_hda: Patch Framework 16 AMD List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 2f1f523a45fb7f9fddd36a3402edbf7b111996c3 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=2f1f523a45fb7f9fddd36a3402edbf7b111996c3 commit 2f1f523a45fb7f9fddd36a3402edbf7b111996c3 Author: Christos Margiolis AuthorDate: 2025-03-25 19:13:49 +0000 Commit: Christos Margiolis CommitDate: 2025-03-25 19:13:59 +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 --- 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 0e88a63e2423..e5473ad48cc1 100644 --- a/sys/dev/sound/pci/hda/hdaa_patches.c +++ b/sys/dev/sound/pci/hda/hdaa_patches.c @@ -346,6 +346,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 231839327530..2a79cb47353c 100644 --- a/sys/dev/sound/pci/hda/hdac.h +++ b/sys/dev/sound/pci/hda/hdac.h @@ -532,6 +532,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... */