Skip to content

Commit 606fcab

Browse files
committed
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: 73cd049 ("ALSA: hda/hdmi: Split vendor codec drivers") Link: https://lore.kernel.org/[email protected] Signed-off-by: Takashi Iwai <[email protected]> Link: https://patch.msgid.link/[email protected]
1 parent 6bd05db commit 606fcab

File tree

1 file changed

+13
-7
lines changed

1 file changed

+13
-7
lines changed

sound/hda/codecs/hdmi/Kconfig

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,17 @@
22

33
menuconfig SND_HDA_CODEC_HDMI
44
tristate "HD-audio HDMI codec support"
5+
help
6+
Say Y or M here to include HD-audio HDMI/DislayPort codec support.
7+
8+
This will enable all HDMI/DP codec drivers as default, but you can
9+
enable/disable each codec driver individually, too (only when
10+
CONFIG_EXPERT is set).
511

612
if SND_HDA_CODEC_HDMI
713

814
config SND_HDA_CODEC_HDMI_GENERIC
9-
tristate "Generic HDMI/DisplayPort HD-audio codec support"
15+
tristate "Generic HDMI/DisplayPort HD-audio codec support" if EXPERT
1016
select SND_DYNAMIC_MINORS
1117
select SND_PCM_ELD
1218
default y
@@ -18,14 +24,14 @@ config SND_HDA_CODEC_HDMI_GENERIC
1824
to assure the multiple streams for DP-MST support.
1925

2026
config SND_HDA_CODEC_HDMI_SIMPLE
21-
tristate "Simple HDMI/DisplayPort HD-audio codec support"
27+
tristate "Simple HDMI/DisplayPort HD-audio codec support" if EXPERT
2228
default y
2329
help
2430
Say Y or M here to include Simple HDMI and DisplayPort HD-audio
2531
codec support for VIA and other codecs.
2632

2733
config SND_HDA_CODEC_HDMI_INTEL
28-
tristate "Intel HDMI/DisplayPort HD-audio codec support"
34+
tristate "Intel HDMI/DisplayPort HD-audio codec support" if EXPERT
2935
select SND_HDA_CODEC_HDMI_GENERIC
3036
default y
3137
help
@@ -48,31 +54,31 @@ config SND_HDA_INTEL_HDMI_SILENT_STREAM
4854
are kept reserved both at transmitter and receiver.
4955

5056
config SND_HDA_CODEC_HDMI_ATI
51-
tristate "AMD/ATI HDMI/DisplayPort HD-audio codec support"
57+
tristate "AMD/ATI HDMI/DisplayPort HD-audio codec support" if EXPERT
5258
select SND_HDA_CODEC_HDMI_GENERIC
5359
default y
5460
help
5561
Say Y or M here to include AMD/ATI graphics HDMI and DisplayPort
5662
HD-audio codec support.
5763

5864
config SND_HDA_CODEC_HDMI_NVIDIA
59-
tristate "Nvidia HDMI/DisplayPort HD-audio codec support"
65+
tristate "Nvidia HDMI/DisplayPort HD-audio codec support" if EXPERT
6066
select SND_HDA_CODEC_HDMI_GENERIC
6167
default y
6268
help
6369
Say Y or M here to include HDMI and DisplayPort HD-audio codec
6470
support for the recent Nvidia graphics cards.
6571

6672
config SND_HDA_CODEC_HDMI_NVIDIA_MCP
67-
tristate "Legacy Nvidia HDMI/DisplayPort HD-audio codec support"
73+
tristate "Legacy Nvidia HDMI/DisplayPort HD-audio codec support" if EXPERT
6874
select SND_HDA_CODEC_HDMI_SIMPLE
6975
default y
7076
help
7177
Say Y or M here to include HDMI and DisplayPort HD-audio codec
7278
support for the legacy Nvidia graphics like MCP73, MCP67, MCP77/78.
7379

7480
config SND_HDA_CODEC_HDMI_TEGRA
75-
tristate "Nvidia Tegra HDMI/DisplayPort HD-audio codec support"
81+
tristate "Nvidia Tegra HDMI/DisplayPort HD-audio codec support" if EXPERT
7682
select SND_HDA_CODEC_HDMI_GENERIC
7783
default y
7884
help

0 commit comments

Comments
 (0)