diff options
| author | Takashi Iwai <tiwai@suse.de> | 2017-02-02 18:17:13 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2017-02-02 18:17:13 +0100 |
| commit | 374a504025a0913d3d639cec7fbb46a5800fc447 (patch) | |
| tree | c095297abb766d4a316d74b4995f9fa663a3a061 /include | |
| parent | fc28ab1882b59f65d88f99348fdf01073e67349c (diff) | |
| parent | b1c01f4df20a6376fe6245644225ff9fe97c5f95 (diff) | |
Merge branch 'topic/intel-lpe-audio-dp' into for-next
Merged more patches for Intel LPE audio driver, now to support DP audio.
Diffstat (limited to 'include')
| -rw-r--r-- | include/drm/intel_lpe_audio.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/drm/intel_lpe_audio.h b/include/drm/intel_lpe_audio.h index 952de05a9d76..e9892b4c3af1 100644 --- a/include/drm/intel_lpe_audio.h +++ b/include/drm/intel_lpe_audio.h @@ -27,10 +27,13 @@ #include <linux/types.h> #include <linux/spinlock_types.h> +struct platform_device; + #define HDMI_MAX_ELD_BYTES 128 struct intel_hdmi_lpe_audio_eld { int port_id; + int pipe_id; unsigned char eld_data[HDMI_MAX_ELD_BYTES]; }; @@ -38,8 +41,10 @@ struct intel_hdmi_lpe_audio_pdata { bool notify_pending; int tmds_clock_speed; bool hdmi_connected; + bool dp_output; + int link_rate; struct intel_hdmi_lpe_audio_eld eld; - void (*notify_audio_lpe)(void *audio_ptr); + void (*notify_audio_lpe)(struct platform_device *pdev); spinlock_t lpe_audio_slock; }; |