Commit 81231ad1 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda/hdmi: Enable drivers as default 



Like other HD-audio codec drivers, HD-audio HDMI codec driver was
split to multiple drivers, and now users are forced to choose the
right kconfig items.

For smoother upgrade path, keep the previous CONFIG_SND_HDA_CODEC_HDMI
as the meuconfig, so that the kconfig can be taken over from the
previous config.  The all belonging HDMI codec drivers are enabled as
default as long as CONFIG_SND_HDA_CODEC_HDMI is set.

This is only about the default config, and each driver can be still
disabled if user wants to reduce the size, too.

The kconfig for the generic HDMI driver is changed to
CONFIG_SND_HDA_CODEC_HDMI_GENERIC along with this action.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Link: https://patch.msgid.link/20250730064639.25617-4-tiwai@suse.de
parent fc2792a4

sound/hda/codecs/hdmi/Kconfig

+19 −5
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only



config SND_HDA_CODEC_HDMI

menuconfig SND_HDA_CODEC_HDMI

	tristate "HD-audio HDMI codec support"



if SND_HDA_CODEC_HDMI



config SND_HDA_CODEC_HDMI_GENERIC

	tristate "Generic HDMI/DisplayPort HD-audio codec support"

	select SND_DYNAMIC_MINORS

	select SND_PCM_ELD

	default y

	help

	  Say Y or M here to include Generic HDMI and DisplayPort HD-audio

	  codec support.
@@ -13,13 +19,15 @@ config SND_HDA_CODEC_HDMI 


config SND_HDA_CODEC_HDMI_SIMPLE

	tristate "Simple HDMI/DisplayPort HD-audio codec support"

	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"

	select SND_HDA_CODEC_HDMI

	select SND_HDA_CODEC_HDMI_GENERIC

	default y

	help

	  Say Y or M here to include Intel graphics HDMI and DisplayPort

	  HD-audio codec support.
@@ -41,14 +49,16 @@ config SND_HDA_INTEL_HDMI_SILENT_STREAM 


config SND_HDA_CODEC_HDMI_ATI

	tristate "AMD/ATI HDMI/DisplayPort HD-audio codec support"

	select SND_HDA_CODEC_HDMI

	select SND_HDA_CODEC_HDMI_GENERIC

	default y

	help

	  Say Y or M here to include AMD/ATI graphics HDMI and DisplayPort

	  HD-audio codec support.



config SND_HDA_CODEC_HDMI_NVIDIA

	tristate "Nvidia HDMI/DisplayPort HD-audio codec support"

	select SND_HDA_CODEC_HDMI

	select SND_HDA_CODEC_HDMI_GENERIC

	default y

	help

	  Say Y or M here to include HDMI and DisplayPort HD-audio codec

	  support for the recent Nvidia graphics cards.
@@ -56,13 +66,17 @@ config SND_HDA_CODEC_HDMI_NVIDIA 
config SND_HDA_CODEC_HDMI_NVIDIA_MCP

	tristate "Legacy Nvidia HDMI/DisplayPort HD-audio codec support"

	select SND_HDA_CODEC_HDMI_SIMPLE

	default y

	help

	  Say Y or M here to include HDMI and DisplayPort HD-audio codec

	  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"

	select SND_HDA_CODEC_HDMI

	select SND_HDA_CODEC_HDMI_GENERIC

	default y

	help

	  Say Y or M here to include HDMI and DisplayPort HD-audio codec

	  support for Nvidia Tegra.



endif

sound/hda/codecs/hdmi/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ snd-hda-codec-nvhdmi-y := nvhdmi.o 
snd-hda-codec-nvhdmi-mcp-y :=	nvhdmi-mcp.o

snd-hda-codec-tegrahdmi-y :=	tegrahdmi.o



obj-$(CONFIG_SND_HDA_CODEC_HDMI) += snd-hda-codec-hdmi.o

obj-$(CONFIG_SND_HDA_CODEC_HDMI_GENERIC) += snd-hda-codec-hdmi.o

obj-$(CONFIG_SND_HDA_CODEC_HDMI_SIMPLE) += snd-hda-codec-simplehdmi.o

obj-$(CONFIG_SND_HDA_CODEC_HDMI_INTEL) += snd-hda-codec-intelhdmi.o

obj-$(CONFIG_SND_HDA_CODEC_HDMI_ATI) += snd-hda-codec-atihdmi.o