Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 862f76f8 authored by Takashi Iwai's avatar Takashi Iwai Committed by Jaroslav Kysela
Browse files

ALSA: hda - set up HDMI channels 



Set up channel information for HDMI widgets.  This will allow LPCM
with multiple channels supported on some HDMI devices.

TODO: It still doesn't check ELD and doesn't change PCM parameters
dynamically.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@perex.cz>
parent c4920606

sound/pci/hda/patch_atihdmi.c

+37 −8
Original line number Diff line number Diff line
@@ -35,6 +35,9 @@ struct atihdmi_spec { 
	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 },
@@ -60,8 +63,9 @@ 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, 0x03) & AC_WCAP_OUT_AMP)

		snd_hda_codec_write(codec, 0x03, 0, AC_VERB_SET_AMP_GAIN_MUTE,

	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;

}
@@ -92,15 +96,29 @@ static int atihdmi_dig_playback_pcm_prepare(struct hda_pcm_stream *hinfo, 
					    struct snd_pcm_substream *substream)

{

	struct atihdmi_spec *spec = codec->spec;

	return snd_hda_multi_out_dig_prepare(codec, &spec->multiout, stream_tag,

	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 = 0x2, /* NID to query formats and rates and setup streams */

	.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,
@@ -112,6 +130,7 @@ 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;
@@ -120,6 +139,13 @@ static int atihdmi_build_pcms(struct hda_codec *codec) 
	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 = (chans & AC_WCAP_CHAN_CNT_EXT) >> 13;

	chans = ((chans << 1) | 1) + 1;

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



	return 0;

}
@@ -147,9 +173,11 @@ static int patch_atihdmi(struct hda_codec *codec) 


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

	spec->multiout.max_channels = 2;

	spec->multiout.dig_out_nid = 0x2; /* NID for copying analog to digital,

	/* NID for copying analog to digital,

	 * seems to be unused in pure-digital

					   * case. */

	 * case.

	 */

	spec->multiout.dig_out_nid = CVT_NID;



	codec->patch_ops = atihdmi_patch_ops;
@@ -164,6 +192,7 @@ struct hda_codec_preset snd_hda_preset_atihdmi[] = { 
	{ .id = 0x10027919, .name = "ATI RS600 HDMI", .patch = patch_atihdmi },

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

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

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

	{ .id = 0x10951392, .name = "SiI1392 HDMI", .patch = patch_atihdmi },

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

	{} /* terminator */