diff options
author | Thomas Gleixner | 2015-10-13 19:00:14 +0200 |
---|---|---|
committer | Thomas Gleixner | 2015-10-13 19:00:14 +0200 |
commit | e50226b4b86755e65aef2129e94d952fee3df722 (patch) | |
tree | d4dd925fc7f5c6fe46b647c8027911190595f014 /include/drm/drm_dp_helper.h | |
parent | genirq: Add flag to force mask in disable_irq[_nosync]() (diff) | |
parent | Linux 4.3-rc5 (diff) | |
download | kernel-qcow2-linux-e50226b4b86755e65aef2129e94d952fee3df722.tar.gz kernel-qcow2-linux-e50226b4b86755e65aef2129e94d952fee3df722.tar.xz kernel-qcow2-linux-e50226b4b86755e65aef2129e94d952fee3df722.zip |
Merge branch 'linus' into irq/core
Bring in upstream updates for patches which depend on them
Diffstat (limited to 'include/drm/drm_dp_helper.h')
-rw-r--r-- | include/drm/drm_dp_helper.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/drm/drm_dp_helper.h b/include/drm/drm_dp_helper.h index 499e9f625aef..0212d139a480 100644 --- a/include/drm/drm_dp_helper.h +++ b/include/drm/drm_dp_helper.h @@ -568,6 +568,10 @@ #define MODE_I2C_READ 4 #define MODE_I2C_STOP 8 +/* DP 1.2 MST PORTs - Section 2.5.1 v1.2a spec */ +#define DP_MST_PHYSICAL_PORT_0 0 +#define DP_MST_LOGICAL_PORT_0 8 + #define DP_LINK_STATUS_SIZE 6 bool drm_dp_channel_eq_ok(const u8 link_status[DP_LINK_STATUS_SIZE], int lane_count); |