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, 27 insertions, 19 deletions

diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index 3b4ef0cba0e7..97c6df9db5e9 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -37,6 +37,7 @@
 #include "hda_codec.h"
 #include "hda_local.h"
 #include "hda_beep.h"
+#include "hda_jack.h"
 
 enum {
         STAC_VREF_EVENT = 1,
@@ -4244,9 +4245,7 @@ static int enable_pin_detect(struct hda_codec *codec, hda_nid_t nid,
                 if (tag < 0)
                         return 0;
         }
-        snd_hda_codec_write_cache(codec, nid, 0,
-                                  AC_VERB_SET_UNSOLICITED_ENABLE,
-                                  AC_USRSP_EN | tag);
+        snd_hda_jack_detect_enable(codec, nid, tag);
         return 1;
 }
 
@@ -4795,24 +4794,11 @@ static void stac92xx_mic_detect(struct hda_codec *codec)
                                           mic->mux_idx);
 }
 
-static void stac_issue_unsol_event(struct hda_codec *codec, hda_nid_t nid)
-{
-        struct sigmatel_event *event = stac_get_event(codec, nid);
-        if (!event)
-                return;
-        codec->patch_ops.unsol_event(codec, (unsigned)event->tag << 26);
-}
-
-static void stac92xx_unsol_event(struct hda_codec *codec, unsigned int res)
+static void handle_unsol_event(struct hda_codec *codec,
+                               struct sigmatel_event *event)
 {
         struct sigmatel_spec *spec = codec->spec;
-        struct sigmatel_event *event;
-        int tag, data;
-
-        tag = (res >> 26) & 0x7f;
-        event = stac_get_event_from_tag(codec, tag);
-        if (!event)
-                return;
+        int data;
 
         switch (event->type) {
         case STAC_HP_EVENT:
@@ -4862,6 +4848,28 @@ static void stac92xx_unsol_event(struct hda_codec *codec, unsigned int res)
         }
 }
 
+static void stac_issue_unsol_event(struct hda_codec *codec, hda_nid_t nid)
+{
+        struct sigmatel_event *event = stac_get_event(codec, nid);
+        if (!event)
+                return;
+        handle_unsol_event(codec, event);
+}
+
+static void stac92xx_unsol_event(struct hda_codec *codec, unsigned int res)
+{
+        struct sigmatel_spec *spec = codec->spec;
+        struct sigmatel_event *event;
+        int tag;
+
+        tag = (res >> 26) & 0x7f;
+        event = stac_get_event_from_tag(codec, tag);
+        if (!event)
+                return;
+        snd_hda_jack_set_dirty(codec, event->nid);
+        handle_unsol_event(codec, event);
+}
+
 static int hp_blike_system(u32 subsystem_id);
 
 static void set_hp_led_gpio(struct hda_codec *codec)