<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-3-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.05000106.01030304@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 adds an encoder type for DP MST
encoders.<br><br>Signed-off-by: Dave Airlie <a class="moz-txt-link-rfc2396E" href="mailto:airlied@redhat.com"><airlied@redhat.com></a><br>---<br>
drivers/gpu/drm/drm_crtc.c | 1 +<br> include/uapi/drm/drm_mode.h | 1 +<br>
2 files changed, 2 insertions(+)<br><br>diff --git
a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c<br>index
a3fe324..f1753e6 100644<br>--- a/drivers/gpu/drm/drm_crtc.c<br>+++
b/drivers/gpu/drm/drm_crtc.c<br>@@ -227,6 +227,7 @@ static const struct
drm_prop_enum_list drm_encoder_enum_list[] =<br> {
DRM_MODE_ENCODER_TVDAC, "TV" },<br> { DRM_MODE_ENCODER_VIRTUAL,
"Virtual" },<br> { DRM_MODE_ENCODER_DSI, "DSI" },<br>+ {
DRM_MODE_ENCODER_DPMST, "DP MST" },<br> };<br> <br> static const struct
drm_prop_enum_list drm_subpixel_enum_list[] =<br>diff --git
a/include/uapi/drm/drm_mode.h b/include/uapi/drm/drm_mode.h<br>index
f104c26..719add4 100644<br>--- a/include/uapi/drm/drm_mode.h<br>+++
b/include/uapi/drm/drm_mode.h<br>@@ -181,6 +181,7 @@ struct
drm_mode_get_plane_res {<br> #define DRM_MODE_ENCODER_TVDAC 4<br>
#define DRM_MODE_ENCODER_VIRTUAL 5<br> #define DRM_MODE_ENCODER_DSI 6<br>+#define
DRM_MODE_ENCODER_DPMST 7<br> <br> struct drm_mode_get_encoder {<br>
__u32 encoder_id;<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>
<br>
<span>Reviewed-by: Todd Previte <a class="moz-txt-link-rfc2396E" href="mailto:tprevite@gmail.com"><tprevite@gmail.com></a> <br>
<br>
</span>
<blockquote style="border: 0px none;"
cite="mid:1400640904-16847-3-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.05000106.01030304@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>