ALSA: hda - add device entry and inactive flag to unsolicited response

This patch adds two fields to unsolicited response, according to spec HDA040-A:
- Device Entry (bit 20:15)
- Inactive (bit 2)
and show the info in debug message.

Signed-off-by: Mengdong Lin <mengdong.lin@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h
index b838c70420d1e2e623e1eb1396c8a71b61e5d388..7aa9870040c102df5b02aa0a94778c8e14c36024 100644 (file)
--- a/sound/pci/hda/hda_codec.h
+++ b/sound/pci/hda/hda_codec.h
@@ -255,6 +255,11 @@ enum {
 #define AC_UNSOL_RES_TAG_SHIFT         26
 #define AC_UNSOL_RES_SUBTAG            (0x1f<<21)
 #define AC_UNSOL_RES_SUBTAG_SHIFT      21
+#define AC_UNSOL_RES_DE                        (0x3f<<15)  /* Device Entry
+                                                    * (for DP1.2 MST)
+                                                    */
+#define AC_UNSOL_RES_DE_SHIFT          15
+#define AC_UNSOL_RES_IA                        (1<<2)  /* Inactive (for DP1.2 MST) */
 #define AC_UNSOL_RES_ELDV              (1<<1)  /* ELD Data valid (for HDMI) */
 #define AC_UNSOL_RES_PD                        (1<<0)  /* pinsense detect */
 #define AC_UNSOL_RES_CP_STATE          (1<<1)  /* content protection */

diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
index 87ca984bbf8dcd2f1650fec4f45740b748112494..895a0d3320b48eded617aa8b8d282521beb3c72b 100644 (file)
--- a/sound/pci/hda/patch_hdmi.c
+++ b/sound/pci/hda/patch_hdmi.c
@@ -959,6 +959,7 @@ static void hdmi_intrinsic_event(struct hda_codec *codec, unsigned int res)
        int pin_nid;
        int pin_idx;
        struct hda_jack_tbl *jack;
+       int dev_entry = (res & AC_UNSOL_RES_DE) >> AC_UNSOL_RES_DE_SHIFT;
 
        jack = snd_hda_jack_tbl_get_from_tag(codec, tag);
        if (!jack)
@@ -967,8 +968,8 @@ static void hdmi_intrinsic_event(struct hda_codec *codec, unsigned int res)
        jack->jack_dirty = 1;
 
        _snd_printd(SND_PR_VERBOSE,
-               "HDMI hot plug event: Codec=%d Pin=%d Presence_Detect=%d ELD_Valid=%d\n",
-               codec->addr, pin_nid,
+               "HDMI hot plug event: Codec=%d Pin=%d Device=%d Inactive=%d Presence_Detect=%d ELD_Valid=%d\n",
+               codec->addr, pin_nid, dev_entry, !!(res & AC_UNSOL_RES_IA),
                !!(res & AC_UNSOL_RES_PD), !!(res & AC_UNSOL_RES_ELDV));
 
        pin_idx = pin_nid_to_pin_index(spec, pin_nid);