Merge remote-tracking branch 'drm/drm-next' into drm-misc-next

[sfrench/cifs-2.6.git] / include / drm / drm_dp_helper.h

diff --git a/include/drm/drm_dp_helper.h b/include/drm/drm_dp_helper.h
index 91c9bcd4196f3c032c173cdf39295a93dfc8ad9f..c01564991a9f9894b9f443e584ba00fdc9a25a97 100644 (file)
--- a/include/drm/drm_dp_helper.h
+++ b/include/drm/drm_dp_helper.h
@@ -64,6 +64,11 @@
 /* AUX CH addresses */
 /* DPCD */
 #define DP_DPCD_REV                         0x000
+# define DP_DPCD_REV_10                     0x10
+# define DP_DPCD_REV_11                     0x11
+# define DP_DPCD_REV_12                     0x12
+# define DP_DPCD_REV_13                     0x13
+# define DP_DPCD_REV_14                     0x14
 
 #define DP_MAX_LINK_RATE                    0x001
 
@@ -119,6 +124,7 @@
 # define DP_DPCD_DISPLAY_CONTROL_CAPABLE     (1 << 3) /* edp v1.2 or higher */
 
 #define DP_TRAINING_AUX_RD_INTERVAL         0x00e   /* XXX 1.2? */
+# define DP_TRAINING_AUX_RD_MASK            0x7F    /* XXX 1.2? */
 
 #define DP_ADAPTER_CAP                     0x00f   /* 1.2 */
 # define DP_FORCE_LOAD_SENSE_CAP           (1 << 0)
@@ -977,18 +983,18 @@ int drm_dp_bw_code_to_link_rate(u8 link_bw);
 #define DP_SDP_VSC_EXT_CEA             0x21 /* DP 1.4 */
 /* 0x80+ CEA-861 infoframe types */
 
-struct edp_sdp_header {
+struct dp_sdp_header {
        u8 HB0; /* Secondary Data Packet ID */
        u8 HB1; /* Secondary Data Packet Type */
-       u8 HB2; /* 7:5 reserved, 4:0 revision number */
-       u8 HB3; /* 7:5 reserved, 4:0 number of valid data bytes */
+       u8 HB2; /* Secondary Data Packet Specific header, Byte 0 */
+       u8 HB3; /* Secondary Data packet Specific header, Byte 1 */
 } __packed;
 
 #define EDP_SDP_HEADER_REVISION_MASK           0x1F
 #define EDP_SDP_HEADER_VALID_PAYLOAD_BYTES     0x1F
 
 struct edp_vsc_psr {
-       struct edp_sdp_header sdp_header;
+       struct dp_sdp_header sdp_header;
        u8 DB0; /* Stereo Interface */
        u8 DB1; /* 0 - PSR State; 1 - Update RFB; 2 - CRC Valid */
        u8 DB2; /* CRC value bits 7:0 of the R or Cr component */