forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ALSA: hda - remove intelhdmi dependency on multiout

Browse source 
We'll be managing multiple HDMI audio sources/sinks on our own.
So remove multiout dependency from intelhdmi.

Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Wu Fengguang 2009-10-30 11:41:44 +01:00 • committed by Takashi Iwai
commit 7bedb011ef
1 changed files with 7 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

23
sound/pci/hda/patch_intelhdmi.c
View file

@ -39,7 +39,6 @@ static hda_nid_t pin_nid; /* HDMI output pin */
#define INTEL_HDMI_EVENT_TAG 0x08 #define INTEL_HDMI_EVENT_TAG 0x08
struct intel_hdmi_spec { struct intel_hdmi_spec {
struct hda_multi_out multiout;
struct hda_pcm pcm_rec; struct hda_pcm pcm_rec;
struct hdmi_eld sink_eld; struct hdmi_eld sink_eld;
}; };
@ -548,9 +547,7 @@ static int intel_hdmi_playback_pcm_open(struct hda_pcm_stream *hinfo,
struct hda_codec *codec, struct hda_codec *codec,
struct snd_pcm_substream *substream) struct snd_pcm_substream *substream)
{ {
struct intel_hdmi_spec *spec = codec->spec; return 0;
return snd_hda_multi_out_dig_open(codec, &spec->multiout);
} }
static int intel_hdmi_playback_pcm_close(struct hda_pcm_stream *hinfo, static int intel_hdmi_playback_pcm_close(struct hda_pcm_stream *hinfo,
@ -561,7 +558,8 @@ static int intel_hdmi_playback_pcm_close(struct hda_pcm_stream *hinfo,
hdmi_stop_infoframe_trans(codec, pin_nid); hdmi_stop_infoframe_trans(codec, pin_nid);
return snd_hda_multi_out_dig_close(codec, &spec->multiout); snd_hda_codec_cleanup_stream(codec, hinfo->nid);
return 0;
} }
static int intel_hdmi_playback_pcm_prepare(struct hda_pcm_stream *hinfo, static int intel_hdmi_playback_pcm_prepare(struct hda_pcm_stream *hinfo,
@ -570,15 +568,12 @@ static int intel_hdmi_playback_pcm_prepare(struct hda_pcm_stream *hinfo,
unsigned int format, unsigned int format,
struct snd_pcm_substream *substream) struct snd_pcm_substream *substream)
{ {
struct intel_hdmi_spec *spec = codec->spec; hdmi_set_channel_count(codec, cvt_nid,
substream->runtime->channels);
snd_hda_multi_out_dig_prepare(codec, &spec->multiout, stream_tag,
format, substream);
hdmi_set_channel_count(codec, cvt_nid, substream->runtime->channels);
hdmi_setup_audio_infoframe(codec, cvt_nid, substream); hdmi_setup_audio_infoframe(codec, cvt_nid, substream);
snd_hda_codec_setup_stream(codec, hinfo->nid, stream_tag, 0, format);
return 0; return 0;
} }
@ -616,7 +611,7 @@ static int intel_hdmi_build_controls(struct hda_codec *codec)
struct intel_hdmi_spec *spec = codec->spec; struct intel_hdmi_spec *spec = codec->spec;
int err; int err;
err = snd_hda_create_spdif_out_ctls(codec, spec->multiout.dig_out_nid); err = snd_hda_create_spdif_out_ctls(codec, cvt_nid);
if (err < 0) if (err < 0)
return err; return err;
@ -657,10 +652,6 @@ static int do_patch_intel_hdmi(struct hda_codec *codec)
if (spec == NULL) if (spec == NULL)
return -ENOMEM; return -ENOMEM;
spec->multiout.num_dacs = 0; /* no analog */
spec->multiout.max_channels = 8;
spec->multiout.dig_out_nid = cvt_nid;
codec->spec = spec; codec->spec = spec;
codec->patch_ops = intel_hdmi_patch_ops; codec->patch_ops = intel_hdmi_patch_ops;