<html><head>
<meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type">
</head><body text="#000000" bgcolor="#FFFFFF"><br>
<br>
<blockquote style="border: 0px none;"
cite="mid:1400640904-16847-2-git-send-email-airlied@gmail.com"
type="cite">
<div style="margin:30px 25px 10px 25px;" class="__pbConvHr"><div
style="display:table;width:100%;border-top:1px solid
#EDEEF0;padding-top:5px"> <div
style="display:table-cell;vertical-align:middle;padding-right:6px;"><img
photoaddress="airlied@gmail.com" photoname="Dave Airlie"
src="cid:part1.09030205.01090502@gmail.com" name="postbox-contact.jpg"
width="25px" height="25px"></div> <div
style="display:table-cell;white-space:nowrap;vertical-align:middle;width:100%">
<a moz-do-not-send="true" href="mailto:airlied@gmail.com"
style="color:#737F92
!important;padding-right:6px;font-weight:bold;text-decoration:none
!important;">Dave Airlie</a></div> <div
style="display:table-cell;white-space:nowrap;vertical-align:middle;">
<font color="#9FA2A5"><span style="padding-left:6px">Tuesday, May 20,
2014 7:54 PM</span></font></div></div></div>
<div style="color:#888888;margin-left:24px;margin-right:24px;"
__pbrmquotes="true" class="__pbConvBody"><div>From: Dave Airlie
<a class="moz-txt-link-rfc2396E" href="mailto:airlied@redhat.com"><airlied@redhat.com></a><br><br>This just adds the defines from the DP
1.2 spec, which we<br>will use later.<br><br>Signed-off-by: Dave Airlie
<a class="moz-txt-link-rfc2396E" href="mailto:airlied@redhat.com"><airlied@redhat.com></a><br>---<br> include/drm/drm_dp_helper.h | 78
+++++++++++++++++++++++++++++++++++++++++++++<br> 1 file changed, 78
insertions(+)<br><br>diff --git a/include/drm/drm_dp_helper.h
b/include/drm/drm_dp_helper.h<br>index cfcacec..879836d 100644<br>---
a/include/drm/drm_dp_helper.h<br>+++ b/include/drm/drm_dp_helper.h<br>@@
-37,6 +37,7 @@<br> * eDP: Embedded DisplayPort version 1<br> * DPI:
DisplayPort Interoperability Guideline v1.1a<br> * 1.2: DisplayPort 1.2<br>+
* MST: Multistream Transport - part of DP 1.2a<br> *<br> * 1.2
formally includes both eDP and DPI definitions.<br> */<br>@@ -103,9
+104,14 @@<br> #define DP_TRAINING_AUX_RD_INTERVAL 0x00e /*
XXX 1.2? */<br> <br> /* Multiple stream transport */<br>+#define
DP_FAUX_CAP 0x020 /* 1.2 */<br>+# define DP_FAUX_CAP_1 (1
<< 0)<br>+<br> #define DP_MSTM_CAP 0x021 /* 1.2 */<br> #
define DP_MST_CAP (1 << 0)<br> <br>+#define DP_GUID
0x030 /* 1.2 */<br>+<br> #define DP_PSR_SUPPORT
0x070 /* XXX 1.2? */<br> # define DP_PSR_IS_SUPPORTED 1<br>
#define DP_PSR_CAPS 0x071 /* XXX 1.2? */<br>@@
-221,6 +227,16 @@<br> # define DP_PSR_CRC_VERIFICATION (1 <<
2)<br> # define DP_PSR_FRAME_CAPTURE (1 << 3)<br> <br>+#define
DP_ADAPTER_CTRL 0x1a0<br>+# define
DP_ADAPTER_CTRL_FORCE_LOAD_SENSE (1 << 0)<br>+<br>+#define
DP_BRANCH_DEVICE_CTRL 0x1a1<br>+# define DP_BRANCH_DEVICE_IRQ_HPD
(1 << 0)<br>+<br>+#define DP_PAYLOAD_ALLOCATE_SET 0x1c0<br>+#define
DP_PAYLOAD_ALLOCATE_START_TIME_SLOT 0x1c1<br>+#define
DP_PAYLOAD_ALLOCATE_TIME_SLOT_COUNT 0x1c2<br>+<br> #define DP_SINK_COUNT
0x200<br> /* prior to 1.2 bit 7 was reserved mbz */<br> # define
DP_GET_SINK_COUNT(x) ((((x) & 0x80) >> 1) | ((x) &
0x3f))<br>@@ -230,6 +246,9 @@<br> # define
DP_REMOTE_CONTROL_COMMAND_PENDING (1 << 0)<br> # define
DP_AUTOMATED_TEST_REQUEST (1 << 1)<br> # define DP_CP_IRQ
(1 << 2)<br>+# define DP_MCCS_IRQ (1 << 3)<br>+#
define DP_DOWN_REP_MSG_RDY (1 << 4) /* DP MST */<br>+# define
DP_UP_REQ_MSG_RDY (1 << 5) /* DP MST */<br> # define
DP_SINK_SPECIFIC_IRQ (1 << 6)<br> <br> #define
DP_LANE0_1_STATUS 0x202<br>@@ -294,6 +313,13 @@<br> #define
DP_TEST_SINK 0x270<br> #define DP_TEST_SINK_START (1 <<
0)<br> <br>+#define DP_PAYLOAD_TABLE_UPDATE_STATUS 0x2c0 /* 1.2
MST */<br>+# define DP_PAYLOAD_TABLE_UPDATED (1 << 0)<br>+#
define DP_PAYLOAD_ACT_HANDLED (1 << 1)<br>+<br>+#define
DP_VC_PAYLOAD_ID_SLOT_1 0x2c1 /* 1.2 MST */<br>+/* up to
ID_SLOT_63 at 0x2ff */<br>+<br> #define DP_SOURCE_OUI 0x300<br>
#define DP_SINK_OUI 0x400<br> #define DP_BRANCH_OUI 0x500<br>@@
-303,6 +329,21 @@<br> # define DP_SET_POWER_D3 0x2<br>
# define DP_SET_POWER_MASK 0x3<br> <br>+#define
DP_SIDEBAND_MSG_DOWN_REQ_BASE 0x1000 /* 1.2 MST */<br>+#define
DP_SIDEBAND_MSG_UP_REP_BASE 0x1200 /* 1.2 MST */<br>+#define
DP_SIDEBAND_MSG_DOWN_REP_BASE 0x1400 /* 1.2 MST */<br>+#define
DP_SIDEBAND_MSG_UP_REQ_BASE 0x1600 /* 1.2 MST */<br>+<br>+#define
DP_SINK_COUNT_ESI 0x2002 /* 1.2 */<br>+/* 0-5 sink count */<br>+#
define DP_SINK_COUNT_CP_READY (1 << 6)<br>+<br>+#define
DP_DEVICE_SERVICE_IRQ_VECTOR_ESI0 0x2003 /* 1.2 */<br>+<br>+#define
DP_DEVICE_SERVICE_IRQ_VECTOR_ESI1 0x2004 /* 1.2 */<br>+<br>+#define
DP_LINK_SERVICE_IRQ_VECTOR_ESI0 0x2005 /* 1.2 */<br>+<br> #define
DP_PSR_ERROR_STATUS 0x2006 /* XXX 1.2? */<br> # define
DP_PSR_LINK_CRC_ERROR (1 << 0)<br> # define
DP_PSR_RFB_STORAGE_ERROR (1 << 1)<br>@@ -319,6 +360,43
@@<br> # define DP_PSR_SINK_INTERNAL_ERROR 7<br> # define
DP_PSR_SINK_STATE_MASK 0x07<br> <br>+/* DP 1.2 Sideband
message defines */<br>+/* peer device type - DP 1.2a Table 2-92 */<br>+#define
DP_PEER_DEVICE_NONE 0x0<br>+#define DP_PEER_DEVICE_SOURCE_OR_SST 0x1<br>+#define
DP_PEER_DEVICE_MST_BRANCHING 0x2<br>+#define DP_PEER_DEVICE_SST_SINK
0x3<br>+#define DP_PEER_DEVICE_DP_LEGACY_CONV 0x4<br>+<br>+/* DP 1.2 MST
sideband request names DP 1.2a Table 2-80 */<br>+#define
DP_LINK_ADDRESS 0x01<br>+#define DP_CONNECTION_STATUS_NOTIFY 0x02<br>+#define
DP_ENUM_PATH_RESOURCES 0x10<br>+#define DP_ALLOCATE_PAYLOAD 0x11<br>+#define
DP_QUERY_PAYLOAD 0x12<br>+#define DP_RESOURCE_STATUS_NOTIFY 0x13<br>+#define
DP_CLEAR_PAYLOAD_ID_TABLE 0x14<br>+#define DP_REMOTE_DPCD_READ 0x20<br>+#define
DP_REMOTE_DPCD_WRITE 0x21<br>+#define DP_REMOTE_I2C_READ 0x22<br>+#define
DP_REMOTE_I2C_WRITE 0x23<br>+#define DP_POWER_UP_PHY 0x24<br>+#define
DP_POWER_DOWN_PHY 0x25<br>+#define DP_SINK_EVENT_NOTIFY 0x30<br>+#define
DP_QUERY_STREAM_ENC_STATUS 0x38<br>+<br>+/* DP 1.2 MST sideband nak
reasons - table 2.84 */<br>+#define DP_NAK_WRITE_FAILURE 0x01<br>+#define
DP_NAK_INVALID_READ 0x02<br>+#define DP_NAK_CRC_FAILURE 0x03<br>+#define
DP_NAK_BAD_PARAM 0x04<br>+#define DP_NAK_DEFER 0x05<br>+#define
DP_NAK_LINK_FAILURE 0x06<br>+#define DP_NAK_NO_RESOURCES 0x07<br>+#define
DP_NAK_DPCD_FAIL 0x08<br>+#define DP_NAK_I2C_NAK 0x09<br>+#define
DP_NAK_ALLOCATE_FAIL 0x0a<br>+<br> #define MODE_I2C_START 1<br> #define
MODE_I2C_WRITE 2<br> #define MODE_I2C_READ 4<br></div></div>
<div style="margin: 30px 25px 10px;" class="__pbConvHr"><div
style="display: table; width: 100%; border-top: 1px solid rgb(237, 238,
240); padding-top: 5px;"> </div></div>
</blockquote>
Constant definitions look good.<br>
<br>
Reviewed-by: Todd Previte <a class="moz-txt-link-rfc2396E" href="mailto:tprevite@gmail.com"><tprevite@gmail.com></a><br>
<br>
<blockquote style="border: 0px none;"
cite="mid:1400640904-16847-2-git-send-email-airlied@gmail.com"
type="cite">
<div style="margin:30px 25px 10px 25px;" class="__pbConvHr">
<div style="display:table;width:100%;border-top:1px solid
#EDEEF0;padding-top:5px"><div
style="display:table-cell;vertical-align:middle;padding-right:6px;"><img
photoaddress="airlied@gmail.com" photoname="Dave Airlie"
src="cid:part1.09030205.01090502@gmail.com" name="postbox-contact.jpg"
width="25px" height="25px"></div> <div
style="display:table-cell;white-space:nowrap;vertical-align:middle;width:100%">
<a moz-do-not-send="true" href="mailto:airlied@gmail.com"
style="color:#737F92
!important;padding-right:6px;font-weight:bold;text-decoration:none
!important;">Dave Airlie</a></div> <div
style="display:table-cell;white-space:nowrap;vertical-align:middle;">
<font color="#9FA2A5"><span style="padding-left:6px">Tuesday, May 20,
2014 7:54 PM</span></font></div></div>
</div>
<div style="color:#888888;margin-left:24px;margin-right:24px;"
__pbrmquotes="true" class="__pbConvBody"><div>Hey,<br><br>So this set is
pretty close to what I think we should be merging initially,<br><br>Since
the last set, it makes fbcon and suspend/resume work a lot better,<br><br>I've
also fixed a couple of bugs in -intel that make things work a lot<br>better.<br><br>I've
bashed on this a bit using kms-flip from intel-gpu-tools, hacked<br>to
add 3 monitor support.<br><br>It still generates a fair few i915 state
checker backtraces, and some<br>of them are fairly hard to work out, it
might be we should just tone<br>down the state checker for
encoders/connectors with no actual hw backing<br>them.<br><br>Dave.<br><br>_______________________________________________<br>Intel-gfx
mailing list<br><a class="moz-txt-link-abbreviated" href="mailto:Intel-gfx@lists.freedesktop.org">Intel-gfx@lists.freedesktop.org</a><br><a class="moz-txt-link-freetext" href="http://lists.freedesktop.org/mailman/listinfo/intel-gfx">http://lists.freedesktop.org/mailman/listinfo/intel-gfx</a><br></div></div>
</blockquote>
</body></html>