diff options
Diffstat (limited to 'sound/pci/hda/hda_codec.h')
-rw-r--r-- | sound/pci/hda/hda_codec.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h index 701c2e069b10..b838c70420d1 100644 --- a/sound/pci/hda/hda_codec.h +++ b/sound/pci/hda/hda_codec.h | |||
@@ -94,6 +94,8 @@ enum { | |||
94 | #define AC_VERB_GET_HDMI_DIP_XMIT 0x0f32 | 94 | #define AC_VERB_GET_HDMI_DIP_XMIT 0x0f32 |
95 | #define AC_VERB_GET_HDMI_CP_CTRL 0x0f33 | 95 | #define AC_VERB_GET_HDMI_CP_CTRL 0x0f33 |
96 | #define AC_VERB_GET_HDMI_CHAN_SLOT 0x0f34 | 96 | #define AC_VERB_GET_HDMI_CHAN_SLOT 0x0f34 |
97 | #define AC_VERB_GET_DEVICE_SEL 0xf35 | ||
98 | #define AC_VERB_GET_DEVICE_LIST 0xf36 | ||
97 | 99 | ||
98 | /* | 100 | /* |
99 | * SET verbs | 101 | * SET verbs |
@@ -133,6 +135,7 @@ enum { | |||
133 | #define AC_VERB_SET_HDMI_DIP_XMIT 0x732 | 135 | #define AC_VERB_SET_HDMI_DIP_XMIT 0x732 |
134 | #define AC_VERB_SET_HDMI_CP_CTRL 0x733 | 136 | #define AC_VERB_SET_HDMI_CP_CTRL 0x733 |
135 | #define AC_VERB_SET_HDMI_CHAN_SLOT 0x734 | 137 | #define AC_VERB_SET_HDMI_CHAN_SLOT 0x734 |
138 | #define AC_VERB_SET_DEVICE_SEL 0x735 | ||
136 | 139 | ||
137 | /* | 140 | /* |
138 | * Parameter IDs | 141 | * Parameter IDs |
@@ -154,6 +157,7 @@ enum { | |||
154 | #define AC_PAR_GPIO_CAP 0x11 | 157 | #define AC_PAR_GPIO_CAP 0x11 |
155 | #define AC_PAR_AMP_OUT_CAP 0x12 | 158 | #define AC_PAR_AMP_OUT_CAP 0x12 |
156 | #define AC_PAR_VOL_KNB_CAP 0x13 | 159 | #define AC_PAR_VOL_KNB_CAP 0x13 |
160 | #define AC_PAR_DEVLIST_LEN 0x15 | ||
157 | #define AC_PAR_HDMI_LPCM_CAP 0x20 | 161 | #define AC_PAR_HDMI_LPCM_CAP 0x20 |
158 | 162 | ||
159 | /* | 163 | /* |
@@ -352,6 +356,10 @@ enum { | |||
352 | #define AC_LPCMCAP_44K (1<<30) /* 44.1kHz support */ | 356 | #define AC_LPCMCAP_44K (1<<30) /* 44.1kHz support */ |
353 | #define AC_LPCMCAP_44K_MS (1<<31) /* 44.1kHz-multiplies support */ | 357 | #define AC_LPCMCAP_44K_MS (1<<31) /* 44.1kHz-multiplies support */ |
354 | 358 | ||
359 | /* Display pin's device list length */ | ||
360 | #define AC_DEV_LIST_LEN_MASK 0x3f | ||
361 | #define AC_MAX_DEV_LIST_LEN 64 | ||
362 | |||
355 | /* | 363 | /* |
356 | * Control Parameters | 364 | * Control Parameters |
357 | */ | 365 | */ |
@@ -460,6 +468,11 @@ enum { | |||
460 | #define AC_DEFCFG_PORT_CONN (0x3<<30) | 468 | #define AC_DEFCFG_PORT_CONN (0x3<<30) |
461 | #define AC_DEFCFG_PORT_CONN_SHIFT 30 | 469 | #define AC_DEFCFG_PORT_CONN_SHIFT 30 |
462 | 470 | ||
471 | /* Display pin's device list entry */ | ||
472 | #define AC_DE_PD (1<<0) | ||
473 | #define AC_DE_ELDV (1<<1) | ||
474 | #define AC_DE_IA (1<<2) | ||
475 | |||
463 | /* device device types (0x0-0xf) */ | 476 | /* device device types (0x0-0xf) */ |
464 | enum { | 477 | enum { |
465 | AC_JACK_LINE_OUT, | 478 | AC_JACK_LINE_OUT, |
@@ -885,6 +898,7 @@ struct hda_codec { | |||
885 | unsigned int pcm_format_first:1; /* PCM format must be set first */ | 898 | unsigned int pcm_format_first:1; /* PCM format must be set first */ |
886 | unsigned int epss:1; /* supporting EPSS? */ | 899 | unsigned int epss:1; /* supporting EPSS? */ |
887 | unsigned int cached_write:1; /* write only to caches */ | 900 | unsigned int cached_write:1; /* write only to caches */ |
901 | unsigned int dp_mst:1; /* support DP1.2 Multi-stream transport */ | ||
888 | #ifdef CONFIG_PM | 902 | #ifdef CONFIG_PM |
889 | unsigned int power_on :1; /* current (global) power-state */ | 903 | unsigned int power_on :1; /* current (global) power-state */ |
890 | unsigned int d3_stop_clk:1; /* support D3 operation without BCLK */ | 904 | unsigned int d3_stop_clk:1; /* support D3 operation without BCLK */ |
@@ -972,6 +986,8 @@ int snd_hda_override_conn_list(struct hda_codec *codec, hda_nid_t nid, int nums, | |||
972 | const hda_nid_t *list); | 986 | const hda_nid_t *list); |
973 | int snd_hda_get_conn_index(struct hda_codec *codec, hda_nid_t mux, | 987 | int snd_hda_get_conn_index(struct hda_codec *codec, hda_nid_t mux, |
974 | hda_nid_t nid, int recursive); | 988 | hda_nid_t nid, int recursive); |
989 | int snd_hda_get_devices(struct hda_codec *codec, hda_nid_t nid, | ||
990 | u8 *dev_list, int max_devices); | ||
975 | int snd_hda_query_supported_pcm(struct hda_codec *codec, hda_nid_t nid, | 991 | int snd_hda_query_supported_pcm(struct hda_codec *codec, hda_nid_t nid, |
976 | u32 *ratesp, u64 *formatsp, unsigned int *bpsp); | 992 | u32 *ratesp, u64 *formatsp, unsigned int *bpsp); |
977 | 993 | ||