ALSA: hda - Cache the jack-detection value

Introduce a table containing the pins and their jack-detection states
for avoiding the unnecessary verbs to check the pin status at each time.

When the unsol event is enabled via snd_hda_jack_detect_enable(), it
automatically adds the given NID to the table.  Then the driver supposes
that the codec driver will set the dirty flag appropariately when an
unsolicited event is invoked for that pin.

The behavior for reading other pins that aren't registered in the table
doesn't change.  Only the pins assigned to the table are cached, so far.

In near futre, this table can be extended to use the central place for
the unsolicited events of all pins, etc, and eventually include the
jack-detect kcontrols that replace the current input-jack stuff.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

1 files changed, 8 insertions, 10 deletions

diff --git a/sound/pci/hda/patch_cirrus.c b/sound/pci/hda/patch_cirrus.c
index 34a460bd27bb..6f158777f71a 100644
--- a/sound/pci/hda/patch_cirrus.c
+++ b/sound/pci/hda/patch_cirrus.c
@@ -26,6 +26,7 @@
 #include <sound/core.h>
 #include "hda_codec.h"
 #include "hda_local.h"
+#include "hda_jack.h"
 #include <sound/tlv.h>
 
 /*
@@ -1020,9 +1021,7 @@ static void init_output(struct hda_codec *codec)
                 if (!cfg->speaker_outs)
                         continue;
                 if (get_wcaps(codec, nid) & AC_WCAP_UNSOL_CAP) {
-                        snd_hda_codec_write(codec, nid, 0,
-                                            AC_VERB_SET_UNSOLICITED_ENABLE,
-                                            AC_USRSP_EN | HP_EVENT);
+                        snd_hda_jack_detect_enable(codec, nid, HP_EVENT);
                         spec->hp_detect = 1;
                 }
         }
@@ -1063,9 +1062,7 @@ static void init_input(struct hda_codec *codec)
                                     AC_VERB_SET_AMP_GAIN_MUTE,
                                     AMP_IN_MUTE(spec->adc_idx[i]));
                 if (spec->mic_detect && spec->automic_idx == i)
-                        snd_hda_codec_write(codec, pin, 0,
-                                            AC_VERB_SET_UNSOLICITED_ENABLE,
-                                            AC_USRSP_EN | MIC_EVENT);
+                        snd_hda_jack_detect_enable(codec, pin, MIC_EVENT);
         }
         /* specific to CS421x */
         if (spec->vendor_nid == CS421X_VENDOR_NID) {
@@ -1227,6 +1224,8 @@ static void cs_free(struct hda_codec *codec)
 
 static void cs_unsol_event(struct hda_codec *codec, unsigned int res)
 {
+        snd_hda_jack_set_dirty_all(codec); /* FIXME: to be more fine-grained */
+
         switch ((res >> 26) & 0x7f) {
         case HP_EVENT:
                 cs_automute(codec);
@@ -1585,10 +1584,7 @@ static void init_cs421x_digital(struct hda_codec *codec)
                 if (!cfg->speaker_outs)
                         continue;
                 if (get_wcaps(codec, nid) & AC_WCAP_UNSOL_CAP) {
-
-                        snd_hda_codec_write(codec, nid, 0,
-                                    AC_VERB_SET_UNSOLICITED_ENABLE,
-                                    AC_USRSP_EN | SPDIF_EVENT);
+                        snd_hda_jack_detect_enable(codec, nid, SPDIF_EVENT);
                         spec->spdif_detect = 1;
                 }
         }
@@ -1806,6 +1802,8 @@ static int cs421x_build_controls(struct hda_codec *codec)
 
 static void cs421x_unsol_event(struct hda_codec *codec, unsigned int res)
 {
+        snd_hda_jack_set_dirty_all(codec); /* FIXME: to be more fine-grained */
+
         switch ((res >> 26) & 0x3f) {
         case HP_EVENT:
         case SPDIF_EVENT: