1 files changed, 21 insertions, 0 deletions

diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h
index 701c2e069b10..7aa9870040c1 100644
--- a/sound/pci/hda/hda_codec.h
+++ b/sound/pci/hda/hda_codec.h
@@ -94,6 +94,8 @@ enum {
 #define AC_VERB_GET_HDMI_DIP_XMIT               0x0f32
 #define AC_VERB_GET_HDMI_CP_CTRL                0x0f33
 #define AC_VERB_GET_HDMI_CHAN_SLOT              0x0f34
+#define AC_VERB_GET_DEVICE_SEL                  0xf35
+#define AC_VERB_GET_DEVICE_LIST                 0xf36
 
 /*
  * SET verbs
@@ -133,6 +135,7 @@ enum {
 #define AC_VERB_SET_HDMI_DIP_XMIT               0x732
 #define AC_VERB_SET_HDMI_CP_CTRL                0x733
 #define AC_VERB_SET_HDMI_CHAN_SLOT              0x734
+#define AC_VERB_SET_DEVICE_SEL                  0x735
 
 /*
  * Parameter IDs
@@ -154,6 +157,7 @@ enum {
 #define AC_PAR_GPIO_CAP                 0x11
 #define AC_PAR_AMP_OUT_CAP              0x12
 #define AC_PAR_VOL_KNB_CAP              0x13
+#define AC_PAR_DEVLIST_LEN              0x15
 #define AC_PAR_HDMI_LPCM_CAP            0x20
 
 /*
@@ -251,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 */
@@ -352,6 +361,10 @@ enum {
 #define AC_LPCMCAP_44K                  (1<<30) /* 44.1kHz support */
 #define AC_LPCMCAP_44K_MS               (1<<31) /* 44.1kHz-multiplies support */
 
+/* Display pin's device list length */
+#define AC_DEV_LIST_LEN_MASK            0x3f
+#define AC_MAX_DEV_LIST_LEN             64
+
 /*
  * Control Parameters
  */
@@ -460,6 +473,11 @@ enum {
 #define AC_DEFCFG_PORT_CONN             (0x3<<30)
 #define AC_DEFCFG_PORT_CONN_SHIFT       30
 
+/* Display pin's device list entry */
+#define AC_DE_PD                        (1<<0)
+#define AC_DE_ELDV                      (1<<1)
+#define AC_DE_IA                        (1<<2)
+
 /* device device types (0x0-0xf) */
 enum {
         AC_JACK_LINE_OUT,
@@ -885,6 +903,7 @@ struct hda_codec {
         unsigned int pcm_format_first:1; /* PCM format must be set first */
         unsigned int epss:1;            /* supporting EPSS? */
         unsigned int cached_write:1;    /* write only to caches */
+        unsigned int dp_mst:1; /* support DP1.2 Multi-stream transport */
 #ifdef CONFIG_PM
         unsigned int power_on :1;       /* current (global) power-state */
         unsigned int d3_stop_clk:1;     /* support D3 operation without BCLK */
@@ -972,6 +991,8 @@ int snd_hda_override_conn_list(struct hda_codec *codec, hda_nid_t nid, int nums,
                           const hda_nid_t *list);
 int snd_hda_get_conn_index(struct hda_codec *codec, hda_nid_t mux,
                            hda_nid_t nid, int recursive);
+int snd_hda_get_devices(struct hda_codec *codec, hda_nid_t nid,
+                        u8 *dev_list, int max_devices);
 int snd_hda_query_supported_pcm(struct hda_codec *codec, hda_nid_t nid,
                                 u32 *ratesp, u64 *formatsp, unsigned int *bpsp);