summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2025-08-06 21:25:38 +0200
committerTakashi Iwai <tiwai@suse.de>2025-08-07 08:20:59 +0200
commit606fcab9aa212ba7d99a259663411d665070e317 (patch)
treee521b8cadeb75e96ba20be4ec12fa9827ea5adcd
parent6bd05db76751c872970c63be41c97172cfbec4c1 (diff)
ALSA: hda/hdmi: Restrict prompt only for CONFIG_EXPERT
The split of HDMI codec driver may confuse users when migrating from the previous kernel configs and leave some drivers disabled unexpectedly. Although we've already set y to all HDMI codec drivers as default, it's still safer to paper over the wrong choices. This patch marks the prompt of each HDMI codec driver with CONFIG_EXPERT, so that they are all enabled when the top-level CONFIG_SND_HDA_CODEC_HDMI is set. For users who really care about the minimalistic configuration, they can turn each driver on/off individually after setting CONFIG_EXPERT=y. The patch also adds the missing help text to the top-level CONFIG_SND_HDA_CODEC_HDMI together with the explanation of individual choices, too. Fixes: 73cd0490819d ("ALSA: hda/hdmi: Split vendor codec drivers") Link: https://lore.kernel.org/10172c80-daec-4e20-ab57-a483cf1afc02@molgen.mpg.de Signed-off-by: Takashi Iwai <tiwai@suse.de> Link: https://patch.msgid.link/20250806192541.21949-3-tiwai@suse.de
-rw-r--r--sound/hda/codecs/hdmi/Kconfig20
1 files changed, 13 insertions, 7 deletions
diff --git a/sound/hda/codecs/hdmi/Kconfig b/sound/hda/codecs/hdmi/Kconfig
index 973ca4ca077b..6ea3553ba9f8 100644
--- a/sound/hda/codecs/hdmi/Kconfig
+++ b/sound/hda/codecs/hdmi/Kconfig
@@ -2,11 +2,17 @@
menuconfig SND_HDA_CODEC_HDMI
tristate "HD-audio HDMI codec support"
+ help
+ Say Y or M here to include HD-audio HDMI/DislayPort codec support.
+
+ This will enable all HDMI/DP codec drivers as default, but you can
+ enable/disable each codec driver individually, too (only when
+ CONFIG_EXPERT is set).
if SND_HDA_CODEC_HDMI
config SND_HDA_CODEC_HDMI_GENERIC
- tristate "Generic HDMI/DisplayPort HD-audio codec support"
+ tristate "Generic HDMI/DisplayPort HD-audio codec support" if EXPERT
select SND_DYNAMIC_MINORS
select SND_PCM_ELD
default y
@@ -18,14 +24,14 @@ config SND_HDA_CODEC_HDMI_GENERIC
to assure the multiple streams for DP-MST support.
config SND_HDA_CODEC_HDMI_SIMPLE
- tristate "Simple HDMI/DisplayPort HD-audio codec support"
+ tristate "Simple HDMI/DisplayPort HD-audio codec support" if EXPERT
default y
help
Say Y or M here to include Simple HDMI and DisplayPort HD-audio
codec support for VIA and other codecs.
config SND_HDA_CODEC_HDMI_INTEL
- tristate "Intel HDMI/DisplayPort HD-audio codec support"
+ tristate "Intel HDMI/DisplayPort HD-audio codec support" if EXPERT
select SND_HDA_CODEC_HDMI_GENERIC
default y
help
@@ -48,7 +54,7 @@ config SND_HDA_INTEL_HDMI_SILENT_STREAM
are kept reserved both at transmitter and receiver.
config SND_HDA_CODEC_HDMI_ATI
- tristate "AMD/ATI HDMI/DisplayPort HD-audio codec support"
+ tristate "AMD/ATI HDMI/DisplayPort HD-audio codec support" if EXPERT
select SND_HDA_CODEC_HDMI_GENERIC
default y
help
@@ -56,7 +62,7 @@ config SND_HDA_CODEC_HDMI_ATI
HD-audio codec support.
config SND_HDA_CODEC_HDMI_NVIDIA
- tristate "Nvidia HDMI/DisplayPort HD-audio codec support"
+ tristate "Nvidia HDMI/DisplayPort HD-audio codec support" if EXPERT
select SND_HDA_CODEC_HDMI_GENERIC
default y
help
@@ -64,7 +70,7 @@ config SND_HDA_CODEC_HDMI_NVIDIA
support for the recent Nvidia graphics cards.
config SND_HDA_CODEC_HDMI_NVIDIA_MCP
- tristate "Legacy Nvidia HDMI/DisplayPort HD-audio codec support"
+ tristate "Legacy Nvidia HDMI/DisplayPort HD-audio codec support" if EXPERT
select SND_HDA_CODEC_HDMI_SIMPLE
default y
help
@@ -72,7 +78,7 @@ config SND_HDA_CODEC_HDMI_NVIDIA_MCP
support for the legacy Nvidia graphics like MCP73, MCP67, MCP77/78.
config SND_HDA_CODEC_HDMI_TEGRA
- tristate "Nvidia Tegra HDMI/DisplayPort HD-audio codec support"
+ tristate "Nvidia Tegra HDMI/DisplayPort HD-audio codec support" if EXPERT
select SND_HDA_CODEC_HDMI_GENERIC
default y
help