ALSA: hda: Allow multple SPDIF controls per codec

Currently, the data that backs the kcontrols created by
snd_hda_create_spdif_out_ctls is stored directly in struct hda_codec. When
multiple sets of these controls are stored, they will all manipulate the
same data, causing confusion. Instead, store an array of this data, one
copy per converter, to isolate the controls.

This patch would cause a behavioural change in the case where
snd_hda_create_spdif_out_ctls was called multiple times for a single codec.
As best I can tell, this is never the case for any codec.

This will be relevant at least for some HDMI audio codecs, such as the
NVIDIA GeForce 520 and Intel Ibex Peak. A future change will modify the
driver's handling of those codecs to create multiple PCMs per codec. Note
that this issue isn't affected by whether one creates a PCM-per-converter
or PCM-per-pin; there are multiple of both within a single codec in both
of those codecs.

Note that those codecs don't currently create multiple PCMs for the codec
due to the default HW mux state of all pins being to point at the same
converter, hence there is only a single converter routed to any pin, and
hence only a single PCM.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

1 files changed, 11 insertions, 8 deletions

diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
index 8ccec72a8f0c..86b35a071a83 100644
--- a/sound/pci/hda/patch_hdmi.c
+++ b/sound/pci/hda/patch_hdmi.c
@@ -1352,6 +1352,9 @@ static int nvhdmi_8ch_7x_pcm_prepare(struct hda_pcm_stream *hinfo,
         int chs;
         unsigned int dataDCC1, dataDCC2, channel_id;
         int i;
+        struct hdmi_spec *spec = codec->spec;
+        struct hda_spdif_out *spdif =
+                snd_hda_spdif_out_of_nid(codec, spec->cvt[0]);
 
         mutex_lock(&codec->spdif_mutex);
 
@@ -1361,12 +1364,12 @@ static int nvhdmi_8ch_7x_pcm_prepare(struct hda_pcm_stream *hinfo,
         dataDCC2 = 0x2;
 
         /* turn off SPDIF once; otherwise the IEC958 bits won't be updated */
-        if (codec->spdif_status_reset && (codec->spdif_ctls & AC_DIG1_ENABLE))
+        if (codec->spdif_status_reset && (spdif->ctls & AC_DIG1_ENABLE))
                 snd_hda_codec_write(codec,
                                 nvhdmi_master_con_nid_7x,
                                 0,
                                 AC_VERB_SET_DIGI_CONVERT_1,
-                                codec->spdif_ctls & ~AC_DIG1_ENABLE & 0xff);
+                                spdif->ctls & ~AC_DIG1_ENABLE & 0xff);
 
         /* set the stream id */
         snd_hda_codec_write(codec, nvhdmi_master_con_nid_7x, 0,
@@ -1378,12 +1381,12 @@ static int nvhdmi_8ch_7x_pcm_prepare(struct hda_pcm_stream *hinfo,
 
         /* turn on again (if needed) */
         /* enable and set the channel status audio/data flag */
-        if (codec->spdif_status_reset && (codec->spdif_ctls & AC_DIG1_ENABLE)) {
+        if (codec->spdif_status_reset && (spdif->ctls & AC_DIG1_ENABLE)) {
                 snd_hda_codec_write(codec,
                                 nvhdmi_master_con_nid_7x,
                                 0,
                                 AC_VERB_SET_DIGI_CONVERT_1,
-                                codec->spdif_ctls & 0xff);
+                                spdif->ctls & 0xff);
                 snd_hda_codec_write(codec,
                                 nvhdmi_master_con_nid_7x,
                                 0,
@@ -1400,12 +1403,12 @@ static int nvhdmi_8ch_7x_pcm_prepare(struct hda_pcm_stream *hinfo,
                  *otherwise the IEC958 bits won't be updated
                  */
                 if (codec->spdif_status_reset &&
-                (codec->spdif_ctls & AC_DIG1_ENABLE))
+                (spdif->ctls & AC_DIG1_ENABLE))
                         snd_hda_codec_write(codec,
                                 nvhdmi_con_nids_7x[i],
                                 0,
                                 AC_VERB_SET_DIGI_CONVERT_1,
-                                codec->spdif_ctls & ~AC_DIG1_ENABLE & 0xff);
+                                spdif->ctls & ~AC_DIG1_ENABLE & 0xff);
                 /* set the stream id */
                 snd_hda_codec_write(codec,
                                 nvhdmi_con_nids_7x[i],
@@ -1421,12 +1424,12 @@ static int nvhdmi_8ch_7x_pcm_prepare(struct hda_pcm_stream *hinfo,
                 /* turn on again (if needed) */
                 /* enable and set the channel status audio/data flag */
                 if (codec->spdif_status_reset &&
-                (codec->spdif_ctls & AC_DIG1_ENABLE)) {
+                (spdif->ctls & AC_DIG1_ENABLE)) {
                         snd_hda_codec_write(codec,
                                         nvhdmi_con_nids_7x[i],
                                         0,
                                         AC_VERB_SET_DIGI_CONVERT_1,
-                                        codec->spdif_ctls & 0xff);
+                                        spdif->ctls & 0xff);
                         snd_hda_codec_write(codec,
                                         nvhdmi_con_nids_7x[i],
                                         0,