Commit 84eb01be authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda - Merge all HDMI modules into the unified module 



This patch merges all three patch_*hdmi variants to the single HDMI
parser.  There is only one snd-hda-codec-hdmi module now.

In this patch, the behavior of each parser isn't changed much.
The old ATI parser still doesn't use the dynamic parser yet.
In later patches, they'll be cleaned up.

Also, this patch gets rid of the individual snd-hda-eld module and
builds into snd-hda-codec-hdmi, since this is referred only from the
HDMI parser.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent f68b3b29

sound/pci/hda/Kconfig

+6 −33
Original line number Diff line number Diff line
@@ -119,47 +119,20 @@ config SND_HDA_CODEC_VIA 
	  snd-hda-codec-via.

	  This module is automatically loaded at probing.



config SND_HDA_CODEC_ATIHDMI

	bool "Build ATI HDMI HD-audio codec support"

	default y

	help

	  Say Y here to include ATI HDMI HD-audio codec support in

	  snd-hda-intel driver, such as ATI RS600 HDMI.



	  When the HD-audio driver is built as a module, the codec

	  support code is also built as another module,

	  snd-hda-codec-atihdmi.

	  This module is automatically loaded at probing.



config SND_HDA_CODEC_NVHDMI

	bool "Build NVIDIA HDMI HD-audio codec support"

	default y

	help

	  Say Y here to include NVIDIA HDMI HD-audio codec support in

	  snd-hda-intel driver, such as NVIDIA MCP78 HDMI.



	  When the HD-audio driver is built as a module, the codec

	  support code is also built as another module,

	  snd-hda-codec-nvhdmi.

	  This module is automatically loaded at probing.



config SND_HDA_CODEC_INTELHDMI

	bool "Build INTEL HDMI HD-audio codec support"

config SND_HDA_CODEC_HDMI

	bool "Build HDMI/DisplayPort HD-audio codec support"

	select SND_DYNAMIC_MINORS

	default y

	help

	  Say Y here to include INTEL HDMI HD-audio codec support in

	  snd-hda-intel driver, such as Eaglelake integrated HDMI.

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

	  support in snd-hda-intel driver.  This includes all AMD/ATI,

	  Intel and Nvidia HDMI/DisplayPort codecs.



	  When the HD-audio driver is built as a module, the codec

	  support code is also built as another module,

	  snd-hda-codec-intelhdmi.

	  snd-hda-codec-hdmi.

	  This module is automatically loaded at probing.



config SND_HDA_ELD

	def_bool y

	depends on SND_HDA_CODEC_INTELHDMI || SND_HDA_CODEC_NVHDMI



config SND_HDA_CODEC_CIRRUS

	bool "Build Cirrus Logic codec support"

	depends on SND_HDA_INTEL

sound/pci/hda/Makefile

+3 −12
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ snd-hda-intel-objs := hda_intel.o 
snd-hda-codec-y := hda_codec.o

snd-hda-codec-$(CONFIG_SND_HDA_GENERIC) += hda_generic.o

snd-hda-codec-$(CONFIG_PROC_FS) += hda_proc.o

snd-hda-codec-$(CONFIG_SND_HDA_ELD) += hda_eld.o

snd-hda-codec-$(CONFIG_SND_HDA_HWDEP) += hda_hwdep.o

snd-hda-codec-$(CONFIG_SND_HDA_INPUT_BEEP) += hda_beep.o
@@ -12,13 +11,11 @@ snd-hda-codec-cmedia-objs := patch_cmedia.o 
snd-hda-codec-analog-objs :=	patch_analog.o

snd-hda-codec-idt-objs :=	patch_sigmatel.o

snd-hda-codec-si3054-objs :=	patch_si3054.o

snd-hda-codec-atihdmi-objs :=	patch_atihdmi.o

snd-hda-codec-cirrus-objs :=	patch_cirrus.o

snd-hda-codec-ca0110-objs :=	patch_ca0110.o

snd-hda-codec-conexant-objs :=	patch_conexant.o

snd-hda-codec-via-objs :=	patch_via.o

snd-hda-codec-nvhdmi-objs :=	patch_nvhdmi.o

snd-hda-codec-intelhdmi-objs :=	patch_intelhdmi.o

snd-hda-codec-hdmi-objs :=	patch_hdmi.o hda_eld.o



# common driver

obj-$(CONFIG_SND_HDA_INTEL) := snd-hda-codec.o
@@ -39,9 +36,6 @@ endif 
ifdef CONFIG_SND_HDA_CODEC_SI3054

obj-$(CONFIG_SND_HDA_INTEL) += snd-hda-codec-si3054.o

endif

ifdef CONFIG_SND_HDA_CODEC_ATIHDMI

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

endif

ifdef CONFIG_SND_HDA_CODEC_CIRRUS

obj-$(CONFIG_SND_HDA_INTEL) += snd-hda-codec-cirrus.o

endif
@@ -54,11 +48,8 @@ endif 
ifdef CONFIG_SND_HDA_CODEC_VIA

obj-$(CONFIG_SND_HDA_INTEL) += snd-hda-codec-via.o

endif

ifdef CONFIG_SND_HDA_CODEC_NVHDMI

obj-$(CONFIG_SND_HDA_INTEL) += snd-hda-codec-nvhdmi.o

endif

ifdef CONFIG_SND_HDA_CODEC_INTELHDMI

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

ifdef CONFIG_SND_HDA_CODEC_HDMI

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

endif



# this must be the last entry after codec drivers;

sound/pci/hda/hda_eld.c

+0 −7
Original line number Diff line number Diff line
@@ -332,7 +332,6 @@ int snd_hdmi_get_eld_size(struct hda_codec *codec, hda_nid_t nid) 
	return snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_HDMI_DIP_SIZE,

						 AC_DIPSIZE_ELD_BUF);

}

EXPORT_SYMBOL_HDA(snd_hdmi_get_eld_size);



int snd_hdmi_get_eld(struct hdmi_eld *eld,

		     struct hda_codec *codec, hda_nid_t nid)
@@ -368,7 +367,6 @@ int snd_hdmi_get_eld(struct hdmi_eld *eld, 
	kfree(buf);

	return ret;

}

EXPORT_SYMBOL_HDA(snd_hdmi_get_eld);



static void hdmi_show_short_audio_desc(struct cea_sad *a)

{
@@ -407,7 +405,6 @@ void snd_print_channel_allocation(int spk_alloc, char *buf, int buflen) 
	}

	buf[j] = '\0';	/* necessary when j == 0 */

}

EXPORT_SYMBOL_HDA(snd_print_channel_allocation);



void snd_hdmi_show_eld(struct hdmi_eld *e)

{
@@ -426,7 +423,6 @@ void snd_hdmi_show_eld(struct hdmi_eld *e) 
	for (i = 0; i < e->sad_count; i++)

		hdmi_show_short_audio_desc(e->sad + i);

}

EXPORT_SYMBOL_HDA(snd_hdmi_show_eld);



#ifdef CONFIG_PROC_FS
@@ -585,7 +581,6 @@ int snd_hda_eld_proc_new(struct hda_codec *codec, struct hdmi_eld *eld, 


	return 0;

}

EXPORT_SYMBOL_HDA(snd_hda_eld_proc_new);



void snd_hda_eld_proc_free(struct hda_codec *codec, struct hdmi_eld *eld)

{
@@ -594,7 +589,6 @@ void snd_hda_eld_proc_free(struct hda_codec *codec, struct hdmi_eld *eld) 
		eld->proc_entry = NULL;

	}

}

EXPORT_SYMBOL_HDA(snd_hda_eld_proc_free);



#endif /* CONFIG_PROC_FS */
@@ -645,4 +639,3 @@ void hdmi_eld_update_pcm_info(struct hdmi_eld *eld, struct hda_pcm_stream *pcm, 
	pcm->channels_max = min(pcm->channels_max, codec_pars->channels_max);

	pcm->maxbps = min(pcm->maxbps, codec_pars->maxbps);

}
 
EXPORT_SYMBOL_HDA(hdmi_eld_update_pcm_info);

sound/pci/hda/patch_atihdmi.c

deleted100644 → 0
+0 −224
Original line number Diff line number Diff line 
/*

 * Universal Interface for Intel High Definition Audio Codec

 *

 * HD audio interface patch for ATI HDMI codecs

 *

 * Copyright (c) 2006 ATI Technologies Inc.

 *

 *

 *  This driver is free software; you can redistribute it and/or modify

 *  it under the terms of the GNU General Public License as published by

 *  the Free Software Foundation; either version 2 of the License, or

 *  (at your option) any later version.

 *

 *  This driver is distributed in the hope that it will be useful,

 *  but WITHOUT ANY WARRANTY; without even the implied warranty of

 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 *  GNU General Public License for more details.

 *

 *  You should have received a copy of the GNU General Public License

 *  along with this program; if not, write to the Free Software

 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA

 */



#include <linux/init.h>

#include <linux/delay.h>

#include <linux/slab.h>

#include <sound/core.h>

#include "hda_codec.h"

#include "hda_local.h"



struct atihdmi_spec {

	struct hda_multi_out multiout;



	struct hda_pcm pcm_rec;

};



#define CVT_NID		0x02	/* audio converter */

#define PIN_NID		0x03	/* HDMI output pin */



static struct hda_verb atihdmi_basic_init[] = {

	/* enable digital output on pin widget */

	{ 0x03, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },

	{} /* terminator */

};



/*

 * Controls

 */

static int atihdmi_build_controls(struct hda_codec *codec)

{

	struct atihdmi_spec *spec = codec->spec;

	int err;



	err = snd_hda_create_spdif_out_ctls(codec, spec->multiout.dig_out_nid);

	if (err < 0)

		return err;



	return 0;

}



static int atihdmi_init(struct hda_codec *codec)

{

	snd_hda_sequence_write(codec, atihdmi_basic_init);

	/* SI codec requires to unmute the pin */

	if (get_wcaps(codec, PIN_NID) & AC_WCAP_OUT_AMP)

		snd_hda_codec_write(codec, PIN_NID, 0,

				    AC_VERB_SET_AMP_GAIN_MUTE,

				    AMP_OUT_UNMUTE);

	return 0;

}



/*

 * Digital out

 */

static int atihdmi_dig_playback_pcm_open(struct hda_pcm_stream *hinfo,

				     struct hda_codec *codec,

				     struct snd_pcm_substream *substream)

{

	struct atihdmi_spec *spec = codec->spec;

	return snd_hda_multi_out_dig_open(codec, &spec->multiout);

}



static int atihdmi_dig_playback_pcm_close(struct hda_pcm_stream *hinfo,

				      struct hda_codec *codec,

				      struct snd_pcm_substream *substream)

{

	struct atihdmi_spec *spec = codec->spec;

	return snd_hda_multi_out_dig_close(codec, &spec->multiout);

}



static int atihdmi_dig_playback_pcm_prepare(struct hda_pcm_stream *hinfo,

					    struct hda_codec *codec,

					    unsigned int stream_tag,

					    unsigned int format,

					    struct snd_pcm_substream *substream)

{

	struct atihdmi_spec *spec = codec->spec;

	int chans = substream->runtime->channels;

	int i, err;



	err = snd_hda_multi_out_dig_prepare(codec, &spec->multiout, stream_tag,

					    format, substream);

	if (err < 0)

		return err;

	snd_hda_codec_write(codec, CVT_NID, 0, AC_VERB_SET_CVT_CHAN_COUNT,

			    chans - 1);

	/* FIXME: XXX */

	for (i = 0; i < chans; i++) {

		snd_hda_codec_write(codec, CVT_NID, 0,

				    AC_VERB_SET_HDMI_CHAN_SLOT,

				    (i << 4) | i);

	}

	return 0;

}



static struct hda_pcm_stream atihdmi_pcm_digital_playback = {

	.substreams = 1,

	.channels_min = 2,

	.channels_max = 2,

	.nid = CVT_NID, /* NID to query formats and rates and setup streams */

	.ops = {

		.open = atihdmi_dig_playback_pcm_open,

		.close = atihdmi_dig_playback_pcm_close,

		.prepare = atihdmi_dig_playback_pcm_prepare

	},

};



static int atihdmi_build_pcms(struct hda_codec *codec)

{

	struct atihdmi_spec *spec = codec->spec;

	struct hda_pcm *info = &spec->pcm_rec;

	unsigned int chans;



	codec->num_pcms = 1;

	codec->pcm_info = info;



	info->name = "ATI HDMI";

	info->pcm_type = HDA_PCM_TYPE_HDMI;

	info->stream[SNDRV_PCM_STREAM_PLAYBACK] = atihdmi_pcm_digital_playback;



	/* FIXME: we must check ELD and change the PCM parameters dynamically

	 */

	chans = get_wcaps(codec, CVT_NID);

	chans = get_wcaps_channels(chans);

	info->stream[SNDRV_PCM_STREAM_PLAYBACK].channels_max = chans;



	return 0;

}



static void atihdmi_free(struct hda_codec *codec)

{

	kfree(codec->spec);

}



static struct hda_codec_ops atihdmi_patch_ops = {

	.build_controls = atihdmi_build_controls,

	.build_pcms = atihdmi_build_pcms,

	.init = atihdmi_init,

	.free = atihdmi_free,

};



static int patch_atihdmi(struct hda_codec *codec)

{

	struct atihdmi_spec *spec;



	spec = kzalloc(sizeof(*spec), GFP_KERNEL);

	if (spec == NULL)

		return -ENOMEM;



	codec->spec = spec;



	spec->multiout.num_dacs = 0;	  /* no analog */

	spec->multiout.max_channels = 2;

	/* NID for copying analog to digital,

	 * seems to be unused in pure-digital

	 * case.

	 */

	spec->multiout.dig_out_nid = CVT_NID;



	codec->patch_ops = atihdmi_patch_ops;



	return 0;

}



/*

 * patch entries

 */

static struct hda_codec_preset snd_hda_preset_atihdmi[] = {

	{ .id = 0x1002793c, .name = "RS600 HDMI", .patch = patch_atihdmi },

	{ .id = 0x10027919, .name = "RS600 HDMI", .patch = patch_atihdmi },

	{ .id = 0x1002791a, .name = "RS690/780 HDMI", .patch = patch_atihdmi },

	{ .id = 0x1002aa01, .name = "R6xx HDMI", .patch = patch_atihdmi },

	{ .id = 0x10951390, .name = "SiI1390 HDMI", .patch = patch_atihdmi },

	{ .id = 0x17e80047, .name = "Chrontel HDMI",  .patch = patch_atihdmi },

	{} /* terminator */

};



MODULE_ALIAS("snd-hda-codec-id:1002793c");

MODULE_ALIAS("snd-hda-codec-id:10027919");

MODULE_ALIAS("snd-hda-codec-id:1002791a");

MODULE_ALIAS("snd-hda-codec-id:1002aa01");

MODULE_ALIAS("snd-hda-codec-id:10951390");

MODULE_ALIAS("snd-hda-codec-id:17e80047");



MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("ATI HDMI HD-audio codec");



static struct hda_codec_preset_list atihdmi_list = {

	.preset = snd_hda_preset_atihdmi,

	.owner = THIS_MODULE,

};



static int __init patch_atihdmi_init(void)

{

	return snd_hda_add_codec_preset(&atihdmi_list);

}



static void __exit patch_atihdmi_exit(void)

{

	snd_hda_delete_codec_preset(&atihdmi_list);

}



module_init(patch_atihdmi_init)

module_exit(patch_atihdmi_exit)

sound/pci/hda/patch_hdmi.c

+682 −3

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE