* FAILED: patch "[PATCH] ALSA: hda: Add missing NVIDIA HDA codec IDs" failed to apply to 5.15-stable tree
@ 2025-07-12 13:58 gregkh
2025-07-23 14:10 ` [PATCH 5.15.y] ALSA: hda: Add missing NVIDIA HDA codec IDs Sasha Levin
0 siblings, 1 reply; 5+ messages in thread
From: gregkh @ 2025-07-12 13:58 UTC (permalink / raw)
To: ddadap, stable, tiwai; +Cc: stable
The patch below does not apply to the 5.15-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable@vger.kernel.org>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y
git checkout FETCH_HEAD
git cherry-pick -x e0a911ac86857a73182edde9e50d9b4b949b7f01
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<stable@vger.kernel.org>' --in-reply-to '2025071244-canon-whacky-600c@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From e0a911ac86857a73182edde9e50d9b4b949b7f01 Mon Sep 17 00:00:00 2001
From: Daniel Dadap <ddadap@nvidia.com>
Date: Thu, 26 Jun 2025 16:16:30 -0500
Subject: [PATCH] ALSA: hda: Add missing NVIDIA HDA codec IDs
Add codec IDs for several NVIDIA products with HDA controllers to the
snd_hda_id_hdmi[] patch table.
Signed-off-by: Daniel Dadap <ddadap@nvidia.com>
Cc: <stable@vger.kernel.org>
Link: https://patch.msgid.link/aF24rqwMKFWoHu12@ddadap-lakeline.nvidia.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
index 08308231b4ed..9a7793eb16e9 100644
--- a/sound/pci/hda/patch_hdmi.c
+++ b/sound/pci/hda/patch_hdmi.c
@@ -4551,7 +4551,9 @@ HDA_CODEC_ENTRY(0x10de002e, "Tegra186 HDMI/DP1", patch_tegra_hdmi),
HDA_CODEC_ENTRY(0x10de002f, "Tegra194 HDMI/DP2", patch_tegra_hdmi),
HDA_CODEC_ENTRY(0x10de0030, "Tegra194 HDMI/DP3", patch_tegra_hdmi),
HDA_CODEC_ENTRY(0x10de0031, "Tegra234 HDMI/DP", patch_tegra234_hdmi),
+HDA_CODEC_ENTRY(0x10de0033, "SoC 33 HDMI/DP", patch_tegra234_hdmi),
HDA_CODEC_ENTRY(0x10de0034, "Tegra264 HDMI/DP", patch_tegra234_hdmi),
+HDA_CODEC_ENTRY(0x10de0035, "SoC 35 HDMI/DP", patch_tegra234_hdmi),
HDA_CODEC_ENTRY(0x10de0040, "GPU 40 HDMI/DP", patch_nvhdmi),
HDA_CODEC_ENTRY(0x10de0041, "GPU 41 HDMI/DP", patch_nvhdmi),
HDA_CODEC_ENTRY(0x10de0042, "GPU 42 HDMI/DP", patch_nvhdmi),
@@ -4590,15 +4592,32 @@ HDA_CODEC_ENTRY(0x10de0097, "GPU 97 HDMI/DP", patch_nvhdmi),
HDA_CODEC_ENTRY(0x10de0098, "GPU 98 HDMI/DP", patch_nvhdmi),
HDA_CODEC_ENTRY(0x10de0099, "GPU 99 HDMI/DP", patch_nvhdmi),
HDA_CODEC_ENTRY(0x10de009a, "GPU 9a HDMI/DP", patch_nvhdmi),
+HDA_CODEC_ENTRY(0x10de009b, "GPU 9b HDMI/DP", patch_nvhdmi),
+HDA_CODEC_ENTRY(0x10de009c, "GPU 9c HDMI/DP", patch_nvhdmi),
HDA_CODEC_ENTRY(0x10de009d, "GPU 9d HDMI/DP", patch_nvhdmi),
HDA_CODEC_ENTRY(0x10de009e, "GPU 9e HDMI/DP", patch_nvhdmi),
HDA_CODEC_ENTRY(0x10de009f, "GPU 9f HDMI/DP", patch_nvhdmi),
HDA_CODEC_ENTRY(0x10de00a0, "GPU a0 HDMI/DP", patch_nvhdmi),
+HDA_CODEC_ENTRY(0x10de00a1, "GPU a1 HDMI/DP", patch_nvhdmi),
HDA_CODEC_ENTRY(0x10de00a3, "GPU a3 HDMI/DP", patch_nvhdmi),
HDA_CODEC_ENTRY(0x10de00a4, "GPU a4 HDMI/DP", patch_nvhdmi),
HDA_CODEC_ENTRY(0x10de00a5, "GPU a5 HDMI/DP", patch_nvhdmi),
HDA_CODEC_ENTRY(0x10de00a6, "GPU a6 HDMI/DP", patch_nvhdmi),
HDA_CODEC_ENTRY(0x10de00a7, "GPU a7 HDMI/DP", patch_nvhdmi),
+HDA_CODEC_ENTRY(0x10de00a8, "GPU a8 HDMI/DP", patch_nvhdmi),
+HDA_CODEC_ENTRY(0x10de00a9, "GPU a9 HDMI/DP", patch_nvhdmi),
+HDA_CODEC_ENTRY(0x10de00aa, "GPU aa HDMI/DP", patch_nvhdmi),
+HDA_CODEC_ENTRY(0x10de00ab, "GPU ab HDMI/DP", patch_nvhdmi),
+HDA_CODEC_ENTRY(0x10de00ad, "GPU ad HDMI/DP", patch_nvhdmi),
+HDA_CODEC_ENTRY(0x10de00ae, "GPU ae HDMI/DP", patch_nvhdmi),
+HDA_CODEC_ENTRY(0x10de00af, "GPU af HDMI/DP", patch_nvhdmi),
+HDA_CODEC_ENTRY(0x10de00b0, "GPU b0 HDMI/DP", patch_nvhdmi),
+HDA_CODEC_ENTRY(0x10de00b1, "GPU b1 HDMI/DP", patch_nvhdmi),
+HDA_CODEC_ENTRY(0x10de00c0, "GPU c0 HDMI/DP", patch_nvhdmi),
+HDA_CODEC_ENTRY(0x10de00c1, "GPU c1 HDMI/DP", patch_nvhdmi),
+HDA_CODEC_ENTRY(0x10de00c3, "GPU c3 HDMI/DP", patch_nvhdmi),
+HDA_CODEC_ENTRY(0x10de00c4, "GPU c4 HDMI/DP", patch_nvhdmi),
+HDA_CODEC_ENTRY(0x10de00c5, "GPU c5 HDMI/DP", patch_nvhdmi),
HDA_CODEC_ENTRY(0x10de8001, "MCP73 HDMI", patch_nvhdmi_2ch),
HDA_CODEC_ENTRY(0x10de8067, "MCP67/68 HDMI", patch_nvhdmi_2ch),
HDA_CODEC_ENTRY(0x67663d82, "Arise 82 HDMI/DP", patch_gf_hdmi),
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 5.15.y] ALSA: hda: Add missing NVIDIA HDA codec IDs
2025-07-12 13:58 FAILED: patch "[PATCH] ALSA: hda: Add missing NVIDIA HDA codec IDs" failed to apply to 5.15-stable tree gregkh
@ 2025-07-23 14:10 ` Sasha Levin
2025-07-23 16:46 ` Daniel Dadap
0 siblings, 1 reply; 5+ messages in thread
From: Sasha Levin @ 2025-07-23 14:10 UTC (permalink / raw)
To: stable; +Cc: Daniel Dadap, Takashi Iwai, Sasha Levin
From: Daniel Dadap <ddadap@nvidia.com>
[ Upstream commit e0a911ac86857a73182edde9e50d9b4b949b7f01 ]
Add codec IDs for several NVIDIA products with HDA controllers to the
snd_hda_id_hdmi[] patch table.
Signed-off-by: Daniel Dadap <ddadap@nvidia.com>
Cc: <stable@vger.kernel.org>
Link: https://patch.msgid.link/aF24rqwMKFWoHu12@ddadap-lakeline.nvidia.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>
[ change patch_tegra234_hdmi function calls to patch_tegra_hdmi ]
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
sound/pci/hda/patch_hdmi.c | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
index 81025d45306d3..fcd7d94afc5d5 100644
--- a/sound/pci/hda/patch_hdmi.c
+++ b/sound/pci/hda/patch_hdmi.c
@@ -4364,6 +4364,8 @@ HDA_CODEC_ENTRY(0x10de002d, "Tegra186 HDMI/DP0", patch_tegra_hdmi),
HDA_CODEC_ENTRY(0x10de002e, "Tegra186 HDMI/DP1", patch_tegra_hdmi),
HDA_CODEC_ENTRY(0x10de002f, "Tegra194 HDMI/DP2", patch_tegra_hdmi),
HDA_CODEC_ENTRY(0x10de0030, "Tegra194 HDMI/DP3", patch_tegra_hdmi),
+HDA_CODEC_ENTRY(0x10de0033, "SoC 33 HDMI/DP", patch_tegra_hdmi),
+HDA_CODEC_ENTRY(0x10de0035, "SoC 35 HDMI/DP", patch_tegra_hdmi),
HDA_CODEC_ENTRY(0x10de0040, "GPU 40 HDMI/DP", patch_nvhdmi),
HDA_CODEC_ENTRY(0x10de0041, "GPU 41 HDMI/DP", patch_nvhdmi),
HDA_CODEC_ENTRY(0x10de0042, "GPU 42 HDMI/DP", patch_nvhdmi),
@@ -4402,15 +4404,32 @@ HDA_CODEC_ENTRY(0x10de0097, "GPU 97 HDMI/DP", patch_nvhdmi),
HDA_CODEC_ENTRY(0x10de0098, "GPU 98 HDMI/DP", patch_nvhdmi),
HDA_CODEC_ENTRY(0x10de0099, "GPU 99 HDMI/DP", patch_nvhdmi),
HDA_CODEC_ENTRY(0x10de009a, "GPU 9a HDMI/DP", patch_nvhdmi),
+HDA_CODEC_ENTRY(0x10de009b, "GPU 9b HDMI/DP", patch_nvhdmi),
+HDA_CODEC_ENTRY(0x10de009c, "GPU 9c HDMI/DP", patch_nvhdmi),
HDA_CODEC_ENTRY(0x10de009d, "GPU 9d HDMI/DP", patch_nvhdmi),
HDA_CODEC_ENTRY(0x10de009e, "GPU 9e HDMI/DP", patch_nvhdmi),
HDA_CODEC_ENTRY(0x10de009f, "GPU 9f HDMI/DP", patch_nvhdmi),
HDA_CODEC_ENTRY(0x10de00a0, "GPU a0 HDMI/DP", patch_nvhdmi),
+HDA_CODEC_ENTRY(0x10de00a1, "GPU a1 HDMI/DP", patch_nvhdmi),
HDA_CODEC_ENTRY(0x10de00a3, "GPU a3 HDMI/DP", patch_nvhdmi),
HDA_CODEC_ENTRY(0x10de00a4, "GPU a4 HDMI/DP", patch_nvhdmi),
HDA_CODEC_ENTRY(0x10de00a5, "GPU a5 HDMI/DP", patch_nvhdmi),
HDA_CODEC_ENTRY(0x10de00a6, "GPU a6 HDMI/DP", patch_nvhdmi),
HDA_CODEC_ENTRY(0x10de00a7, "GPU a7 HDMI/DP", patch_nvhdmi),
+HDA_CODEC_ENTRY(0x10de00a8, "GPU a8 HDMI/DP", patch_nvhdmi),
+HDA_CODEC_ENTRY(0x10de00a9, "GPU a9 HDMI/DP", patch_nvhdmi),
+HDA_CODEC_ENTRY(0x10de00aa, "GPU aa HDMI/DP", patch_nvhdmi),
+HDA_CODEC_ENTRY(0x10de00ab, "GPU ab HDMI/DP", patch_nvhdmi),
+HDA_CODEC_ENTRY(0x10de00ad, "GPU ad HDMI/DP", patch_nvhdmi),
+HDA_CODEC_ENTRY(0x10de00ae, "GPU ae HDMI/DP", patch_nvhdmi),
+HDA_CODEC_ENTRY(0x10de00af, "GPU af HDMI/DP", patch_nvhdmi),
+HDA_CODEC_ENTRY(0x10de00b0, "GPU b0 HDMI/DP", patch_nvhdmi),
+HDA_CODEC_ENTRY(0x10de00b1, "GPU b1 HDMI/DP", patch_nvhdmi),
+HDA_CODEC_ENTRY(0x10de00c0, "GPU c0 HDMI/DP", patch_nvhdmi),
+HDA_CODEC_ENTRY(0x10de00c1, "GPU c1 HDMI/DP", patch_nvhdmi),
+HDA_CODEC_ENTRY(0x10de00c3, "GPU c3 HDMI/DP", patch_nvhdmi),
+HDA_CODEC_ENTRY(0x10de00c4, "GPU c4 HDMI/DP", patch_nvhdmi),
+HDA_CODEC_ENTRY(0x10de00c5, "GPU c5 HDMI/DP", patch_nvhdmi),
HDA_CODEC_ENTRY(0x10de8001, "MCP73 HDMI", patch_nvhdmi_2ch),
HDA_CODEC_ENTRY(0x10de8067, "MCP67/68 HDMI", patch_nvhdmi_2ch),
HDA_CODEC_ENTRY(0x67663d82, "Arise 82 HDMI/DP", patch_gf_hdmi),
--
2.39.5
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 5.15.y] ALSA: hda: Add missing NVIDIA HDA codec IDs
2025-07-23 14:10 ` [PATCH 5.15.y] ALSA: hda: Add missing NVIDIA HDA codec IDs Sasha Levin
@ 2025-07-23 16:46 ` Daniel Dadap
2025-07-23 18:23 ` Sasha Levin
0 siblings, 1 reply; 5+ messages in thread
From: Daniel Dadap @ 2025-07-23 16:46 UTC (permalink / raw)
To: Sasha Levin; +Cc: stable, Takashi Iwai
On Wed, Jul 23, 2025 at 10:10:42AM -0400, Sasha Levin wrote:
> From: Daniel Dadap <ddadap@nvidia.com>
>
> [ Upstream commit e0a911ac86857a73182edde9e50d9b4b949b7f01 ]
>
> Add codec IDs for several NVIDIA products with HDA controllers to the
> snd_hda_id_hdmi[] patch table.
>
> Signed-off-by: Daniel Dadap <ddadap@nvidia.com>
> Cc: <stable@vger.kernel.org>
> Link: https://patch.msgid.link/aF24rqwMKFWoHu12@ddadap-lakeline.nvidia.com
> Signed-off-by: Takashi Iwai <tiwai@suse.de>
> [ change patch_tegra234_hdmi function calls to patch_tegra_hdmi ]
> Signed-off-by: Sasha Levin <sashal@kernel.org>
> ---
> sound/pci/hda/patch_hdmi.c | 19 +++++++++++++++++++
> 1 file changed, 19 insertions(+)
>
> diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
> index 81025d45306d3..fcd7d94afc5d5 100644
> --- a/sound/pci/hda/patch_hdmi.c
> +++ b/sound/pci/hda/patch_hdmi.c
> @@ -4364,6 +4364,8 @@ HDA_CODEC_ENTRY(0x10de002d, "Tegra186 HDMI/DP0", patch_tegra_hdmi),
> HDA_CODEC_ENTRY(0x10de002e, "Tegra186 HDMI/DP1", patch_tegra_hdmi),
> HDA_CODEC_ENTRY(0x10de002f, "Tegra194 HDMI/DP2", patch_tegra_hdmi),
> HDA_CODEC_ENTRY(0x10de0030, "Tegra194 HDMI/DP3", patch_tegra_hdmi),
> +HDA_CODEC_ENTRY(0x10de0033, "SoC 33 HDMI/DP", patch_tegra_hdmi),
> +HDA_CODEC_ENTRY(0x10de0035, "SoC 35 HDMI/DP", patch_tegra_hdmi),
I tested a modified snd-hda-codec-hdmi.ko which patched one of these to
patch_tegra_hdmi instead of patch_tegra234_hdmi, and it still worked
correctly as far as I could tell with a few brief checks. However, it
seems like patch_nvhdmi might be a better match, at least based on how
it seems to behave with DP MST, so if we don't decide to drop the codec
entries for 0x10de0033 and 0x10de0035 in the older branches it might be
good to use patch_nvhdmi.
It probably does make more sense to drop the SoC codec entries for the
backports, the more I think about it. It makes sense to backport dGPU
codec entries since somebody could put an add-in-board into an existing
system running an LTS kernel, but for new SoCs you'd want the kernel to
be recent enough to support all of the hardware on the system. Notably,
we don't seem to have backported HDA codec entries for other SoCs like
the T234 that patch_tegra234_hdmi was added for in the first place.
> HDA_CODEC_ENTRY(0x10de0040, "GPU 40 HDMI/DP", patch_nvhdmi),
> HDA_CODEC_ENTRY(0x10de0041, "GPU 41 HDMI/DP", patch_nvhdmi),
> HDA_CODEC_ENTRY(0x10de0042, "GPU 42 HDMI/DP", patch_nvhdmi),
> @@ -4402,15 +4404,32 @@ HDA_CODEC_ENTRY(0x10de0097, "GPU 97 HDMI/DP", patch_nvhdmi),
> HDA_CODEC_ENTRY(0x10de0098, "GPU 98 HDMI/DP", patch_nvhdmi),
> HDA_CODEC_ENTRY(0x10de0099, "GPU 99 HDMI/DP", patch_nvhdmi),
> HDA_CODEC_ENTRY(0x10de009a, "GPU 9a HDMI/DP", patch_nvhdmi),
> +HDA_CODEC_ENTRY(0x10de009b, "GPU 9b HDMI/DP", patch_nvhdmi),
> +HDA_CODEC_ENTRY(0x10de009c, "GPU 9c HDMI/DP", patch_nvhdmi),
> HDA_CODEC_ENTRY(0x10de009d, "GPU 9d HDMI/DP", patch_nvhdmi),
> HDA_CODEC_ENTRY(0x10de009e, "GPU 9e HDMI/DP", patch_nvhdmi),
> HDA_CODEC_ENTRY(0x10de009f, "GPU 9f HDMI/DP", patch_nvhdmi),
> HDA_CODEC_ENTRY(0x10de00a0, "GPU a0 HDMI/DP", patch_nvhdmi),
> +HDA_CODEC_ENTRY(0x10de00a1, "GPU a1 HDMI/DP", patch_nvhdmi),
> HDA_CODEC_ENTRY(0x10de00a3, "GPU a3 HDMI/DP", patch_nvhdmi),
> HDA_CODEC_ENTRY(0x10de00a4, "GPU a4 HDMI/DP", patch_nvhdmi),
> HDA_CODEC_ENTRY(0x10de00a5, "GPU a5 HDMI/DP", patch_nvhdmi),
> HDA_CODEC_ENTRY(0x10de00a6, "GPU a6 HDMI/DP", patch_nvhdmi),
> HDA_CODEC_ENTRY(0x10de00a7, "GPU a7 HDMI/DP", patch_nvhdmi),
> +HDA_CODEC_ENTRY(0x10de00a8, "GPU a8 HDMI/DP", patch_nvhdmi),
> +HDA_CODEC_ENTRY(0x10de00a9, "GPU a9 HDMI/DP", patch_nvhdmi),
> +HDA_CODEC_ENTRY(0x10de00aa, "GPU aa HDMI/DP", patch_nvhdmi),
> +HDA_CODEC_ENTRY(0x10de00ab, "GPU ab HDMI/DP", patch_nvhdmi),
> +HDA_CODEC_ENTRY(0x10de00ad, "GPU ad HDMI/DP", patch_nvhdmi),
> +HDA_CODEC_ENTRY(0x10de00ae, "GPU ae HDMI/DP", patch_nvhdmi),
> +HDA_CODEC_ENTRY(0x10de00af, "GPU af HDMI/DP", patch_nvhdmi),
> +HDA_CODEC_ENTRY(0x10de00b0, "GPU b0 HDMI/DP", patch_nvhdmi),
> +HDA_CODEC_ENTRY(0x10de00b1, "GPU b1 HDMI/DP", patch_nvhdmi),
> +HDA_CODEC_ENTRY(0x10de00c0, "GPU c0 HDMI/DP", patch_nvhdmi),
> +HDA_CODEC_ENTRY(0x10de00c1, "GPU c1 HDMI/DP", patch_nvhdmi),
> +HDA_CODEC_ENTRY(0x10de00c3, "GPU c3 HDMI/DP", patch_nvhdmi),
> +HDA_CODEC_ENTRY(0x10de00c4, "GPU c4 HDMI/DP", patch_nvhdmi),
> +HDA_CODEC_ENTRY(0x10de00c5, "GPU c5 HDMI/DP", patch_nvhdmi),
> HDA_CODEC_ENTRY(0x10de8001, "MCP73 HDMI", patch_nvhdmi_2ch),
> HDA_CODEC_ENTRY(0x10de8067, "MCP67/68 HDMI", patch_nvhdmi_2ch),
> HDA_CODEC_ENTRY(0x67663d82, "Arise 82 HDMI/DP", patch_gf_hdmi),
> --
> 2.39.5
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 5.15.y] ALSA: hda: Add missing NVIDIA HDA codec IDs
2025-07-23 16:46 ` Daniel Dadap
@ 2025-07-23 18:23 ` Sasha Levin
2025-07-23 19:42 ` Daniel Dadap
0 siblings, 1 reply; 5+ messages in thread
From: Sasha Levin @ 2025-07-23 18:23 UTC (permalink / raw)
To: Daniel Dadap; +Cc: stable, Takashi Iwai
On Wed, Jul 23, 2025 at 11:46:21AM -0500, Daniel Dadap wrote:
>On Wed, Jul 23, 2025 at 10:10:42AM -0400, Sasha Levin wrote:
>> From: Daniel Dadap <ddadap@nvidia.com>
>>
>> [ Upstream commit e0a911ac86857a73182edde9e50d9b4b949b7f01 ]
>>
>> Add codec IDs for several NVIDIA products with HDA controllers to the
>> snd_hda_id_hdmi[] patch table.
>>
>> Signed-off-by: Daniel Dadap <ddadap@nvidia.com>
>> Cc: <stable@vger.kernel.org>
>> Link: https://patch.msgid.link/aF24rqwMKFWoHu12@ddadap-lakeline.nvidia.com
>> Signed-off-by: Takashi Iwai <tiwai@suse.de>
>> [ change patch_tegra234_hdmi function calls to patch_tegra_hdmi ]
>> Signed-off-by: Sasha Levin <sashal@kernel.org>
>> ---
>> sound/pci/hda/patch_hdmi.c | 19 +++++++++++++++++++
>> 1 file changed, 19 insertions(+)
>>
>> diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
>> index 81025d45306d3..fcd7d94afc5d5 100644
>> --- a/sound/pci/hda/patch_hdmi.c
>> +++ b/sound/pci/hda/patch_hdmi.c
>> @@ -4364,6 +4364,8 @@ HDA_CODEC_ENTRY(0x10de002d, "Tegra186 HDMI/DP0", patch_tegra_hdmi),
>> HDA_CODEC_ENTRY(0x10de002e, "Tegra186 HDMI/DP1", patch_tegra_hdmi),
>> HDA_CODEC_ENTRY(0x10de002f, "Tegra194 HDMI/DP2", patch_tegra_hdmi),
>> HDA_CODEC_ENTRY(0x10de0030, "Tegra194 HDMI/DP3", patch_tegra_hdmi),
>> +HDA_CODEC_ENTRY(0x10de0033, "SoC 33 HDMI/DP", patch_tegra_hdmi),
>> +HDA_CODEC_ENTRY(0x10de0035, "SoC 35 HDMI/DP", patch_tegra_hdmi),
>
>I tested a modified snd-hda-codec-hdmi.ko which patched one of these to
>patch_tegra_hdmi instead of patch_tegra234_hdmi, and it still worked
>correctly as far as I could tell with a few brief checks. However, it
>seems like patch_nvhdmi might be a better match, at least based on how
>it seems to behave with DP MST, so if we don't decide to drop the codec
>entries for 0x10de0033 and 0x10de0035 in the older branches it might be
>good to use patch_nvhdmi.
Hmm...
I've used patch_tegra_hdmi because from my understanding of the code,
Tegra SoCs require explicit format notification through NVIDIA AFG
scratch registers. The key mechanism is in tegra_hdmi_set_format() which
writes the HDA format to NVIDIA_SET_SCRATCH0_BYTE[0-1] and toggles
NVIDIA_SCRATCH_VALID (bit 30) in NVIDIA_SET_SCRATCH0_BYTE3.
patch_nvhdmi doesn't seem to deal with this at all.
>It probably does make more sense to drop the SoC codec entries for the
>backports, the more I think about it. It makes sense to backport dGPU
>codec entries since somebody could put an add-in-board into an existing
>system running an LTS kernel, but for new SoCs you'd want the kernel to
>be recent enough to support all of the hardware on the system. Notably,
>we don't seem to have backported HDA codec entries for other SoCs like
>the T234 that patch_tegra234_hdmi was added for in the first place.
On our end we'd prefer to keep this align with upstream as much as
possible: it will make future patches easier to apply without manual
modifications.
If leaving them in there is harmless (and only unnecessary), I'd rather
just leave it there.
--
Thanks,
Sasha
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 5.15.y] ALSA: hda: Add missing NVIDIA HDA codec IDs
2025-07-23 18:23 ` Sasha Levin
@ 2025-07-23 19:42 ` Daniel Dadap
0 siblings, 0 replies; 5+ messages in thread
From: Daniel Dadap @ 2025-07-23 19:42 UTC (permalink / raw)
To: Sasha Levin; +Cc: stable, Takashi Iwai
On Wed, Jul 23, 2025 at 02:23:26PM -0400, Sasha Levin wrote:
> On Wed, Jul 23, 2025 at 11:46:21AM -0500, Daniel Dadap wrote:
> > On Wed, Jul 23, 2025 at 10:10:42AM -0400, Sasha Levin wrote:
> > > From: Daniel Dadap <ddadap@nvidia.com>
> > >
> > > [ Upstream commit e0a911ac86857a73182edde9e50d9b4b949b7f01 ]
> > >
> > > Add codec IDs for several NVIDIA products with HDA controllers to the
> > > snd_hda_id_hdmi[] patch table.
> > >
> > > Signed-off-by: Daniel Dadap <ddadap@nvidia.com>
> > > Cc: <stable@vger.kernel.org>
> > > Link: https://patch.msgid.link/aF24rqwMKFWoHu12@ddadap-lakeline.nvidia.com
> > > Signed-off-by: Takashi Iwai <tiwai@suse.de>
> > > [ change patch_tegra234_hdmi function calls to patch_tegra_hdmi ]
> > > Signed-off-by: Sasha Levin <sashal@kernel.org>
> > > ---
> > > sound/pci/hda/patch_hdmi.c | 19 +++++++++++++++++++
> > > 1 file changed, 19 insertions(+)
> > >
> > > diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
> > > index 81025d45306d3..fcd7d94afc5d5 100644
> > > --- a/sound/pci/hda/patch_hdmi.c
> > > +++ b/sound/pci/hda/patch_hdmi.c
> > > @@ -4364,6 +4364,8 @@ HDA_CODEC_ENTRY(0x10de002d, "Tegra186 HDMI/DP0", patch_tegra_hdmi),
> > > HDA_CODEC_ENTRY(0x10de002e, "Tegra186 HDMI/DP1", patch_tegra_hdmi),
> > > HDA_CODEC_ENTRY(0x10de002f, "Tegra194 HDMI/DP2", patch_tegra_hdmi),
> > > HDA_CODEC_ENTRY(0x10de0030, "Tegra194 HDMI/DP3", patch_tegra_hdmi),
> > > +HDA_CODEC_ENTRY(0x10de0033, "SoC 33 HDMI/DP", patch_tegra_hdmi),
> > > +HDA_CODEC_ENTRY(0x10de0035, "SoC 35 HDMI/DP", patch_tegra_hdmi),
> >
> > I tested a modified snd-hda-codec-hdmi.ko which patched one of these to
> > patch_tegra_hdmi instead of patch_tegra234_hdmi, and it still worked
> > correctly as far as I could tell with a few brief checks. However, it
> > seems like patch_nvhdmi might be a better match, at least based on how
> > it seems to behave with DP MST, so if we don't decide to drop the codec
> > entries for 0x10de0033 and 0x10de0035 in the older branches it might be
> > good to use patch_nvhdmi.
>
> Hmm...
>
> I've used patch_tegra_hdmi because from my understanding of the code,
> Tegra SoCs require explicit format notification through NVIDIA AFG
> scratch registers. The key mechanism is in tegra_hdmi_set_format() which
> writes the HDA format to NVIDIA_SET_SCRATCH0_BYTE[0-1] and toggles
> NVIDIA_SCRATCH_VALID (bit 30) in NVIDIA_SET_SCRATCH0_BYTE3.
>
> patch_nvhdmi doesn't seem to deal with this at all.
Hmm. The HDA does manage to work with both patch_nvhdmi and the generic
HDMI patch functions on this system, but I'm not sure if that's because
it doesn't need the explicit notification, or if I just hadn't exercised
changing the format from the default.
>
> > It probably does make more sense to drop the SoC codec entries for the
> > backports, the more I think about it. It makes sense to backport dGPU
> > codec entries since somebody could put an add-in-board into an existing
> > system running an LTS kernel, but for new SoCs you'd want the kernel to
> > be recent enough to support all of the hardware on the system. Notably,
> > we don't seem to have backported HDA codec entries for other SoCs like
> > the T234 that patch_tegra234_hdmi was added for in the first place.
>
> On our end we'd prefer to keep this align with upstream as much as
> possible: it will make future patches easier to apply without manual
> modifications.
>
> If leaving them in there is harmless (and only unnecessary), I'd rather
> just leave it there.
Sounds good to me.
>
> --
> Thanks,
> Sasha
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2025-07-23 19:42 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-07-12 13:58 FAILED: patch "[PATCH] ALSA: hda: Add missing NVIDIA HDA codec IDs" failed to apply to 5.15-stable tree gregkh
2025-07-23 14:10 ` [PATCH 5.15.y] ALSA: hda: Add missing NVIDIA HDA codec IDs Sasha Levin
2025-07-23 16:46 ` Daniel Dadap
2025-07-23 18:23 ` Sasha Levin
2025-07-23 19:42 ` Daniel Dadap
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).